From e0f967dde8ed7cb7ecd133d7a71dd95e11798eac Mon Sep 17 00:00:00 2001
From: zhangxiao871 <zhangxiao871@ZBMAC-C02DN6312.local>
Date: Mon, 9 Aug 2021 23:14:51 +0800
Subject: [PATCH 001/273] Add sparkbar aggregate function.

---
 .../AggregateFunctionSparkbar.cpp             |  72 +++++
 .../AggregateFunctionSparkbar.h               | 303 ++++++++++++++++++
 .../registerAggregateFunctions.cpp            |   2 +
 .../02003_aggregation_spark_bar.reference     |  11 +
 .../02003_aggregation_spark_bar.sql           |  17 +
 5 files changed, 405 insertions(+)
 create mode 100644 src/AggregateFunctions/AggregateFunctionSparkbar.cpp
 create mode 100644 src/AggregateFunctions/AggregateFunctionSparkbar.h
 create mode 100644 tests/queries/0_stateless/02003_aggregation_spark_bar.reference
 create mode 100644 tests/queries/0_stateless/02003_aggregation_spark_bar.sql

diff --git a/src/AggregateFunctions/AggregateFunctionSparkbar.cpp b/src/AggregateFunctions/AggregateFunctionSparkbar.cpp
new file mode 100644
index 00000000000..63bcd037f26
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionSparkbar.cpp
@@ -0,0 +1,72 @@
+#include <AggregateFunctions/AggregateFunctionSparkbar.h>
+#include <AggregateFunctions/FactoryHelpers.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+
+
+namespace DB
+{
+
+struct Settings;
+
+namespace ErrorCodes
+{
+extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+namespace
+{
+
+template <template <typename, typename> class AggregateFunctionTemplate, typename Data, typename ... TArgs>
+static IAggregateFunction * createWithUIntegerOrTimeType(const std::string & name, const IDataType & argument_type, TArgs && ... args)
+{
+    WhichDataType which(argument_type);
+    if (which.idx == TypeIndex::Date || which.idx == TypeIndex::UInt16) return new AggregateFunctionTemplate<UInt16, Data>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::DateTime || which.idx == TypeIndex::UInt32) return new AggregateFunctionTemplate<UInt32, Data>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::UInt8) return new AggregateFunctionTemplate<UInt8, Data>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::UInt64) return new AggregateFunctionTemplate<UInt64, Data>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::UInt128) return new AggregateFunctionTemplate<UInt128, Data>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::UInt256) return new AggregateFunctionTemplate<UInt256, Data>(std::forward<TArgs>(args)...);
+    throw Exception("The first argument type must be UInt or Date or DateTime for aggregate function " + name, ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+}
+
+template <typename ... TArgs>
+AggregateFunctionPtr createAggregateFunctionSparkbarImpl(const std::string & name, const IDataType & x_argument_type, const IDataType & y_argument_type, TArgs ... args)
+{
+    WhichDataType which(y_argument_type);
+#define DISPATCH(TYPE) \
+    if (which.idx == TypeIndex::TYPE) return AggregateFunctionPtr(createWithUIntegerOrTimeType<AggregateFunctionSparkbar, TYPE>(name, x_argument_type, std::forward<TArgs>(args)...));
+    FOR_NUMERIC_TYPES(DISPATCH)
+#undef DISPATCH
+
+    throw Exception("The second argument type must be numeric for aggregate function " + name, ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+}
+
+
+AggregateFunctionPtr createAggregateFunctionSparkbar(const std::string & name, const DataTypes & arguments, const Array & params, const Settings *)
+{
+    assertBinary(name, arguments);
+
+    if (params.size() != 1 && params.size() != 3)
+        throw Exception("The number of params does not match for aggregate function " + name, ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+    if (params.size() == 3)
+    {
+        if (params.at(1).getType() != arguments[0]->getDefault().getType() || params.at(2).getType() != arguments[0]->getDefault().getType())
+        {
+            throw Exception("The second and third parameters are not the same type as the first arguments for aggregate function " + name, ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+        }
+    }
+    return createAggregateFunctionSparkbarImpl(name, *arguments[0], *arguments[1], arguments, params);
+}
+
+
+}
+
+void registerAggregateFunctionSparkbar(AggregateFunctionFactory & factory)
+{
+    factory.registerFunction("sparkbar", createAggregateFunctionSparkbar);
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionSparkbar.h b/src/AggregateFunctions/AggregateFunctionSparkbar.h
new file mode 100644
index 00000000000..976ee2043c7
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionSparkbar.h
@@ -0,0 +1,303 @@
+#pragma once
+
+#include <DataTypes/DataTypeString.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <common/range.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Columns/ColumnString.h>
+#include <common/logger_useful.h>
+#include <IO/ReadBufferFromString.h>
+
+namespace DB
+{
+
+template<typename X, typename Y>
+struct AggregateFunctionSparkbarData
+{
+    using Points = std::map<X, Y>;
+
+    Points points;
+
+    Y min_y = std::numeric_limits<Y>::max();
+    Y max_y = std::numeric_limits<Y>::min();
+
+    void add(X x, Y y)
+    {
+        auto it = points.find(x);
+        if (it != points.end())
+            it->second += y;
+        else
+            points.emplace(x, y);
+        if (y < min_y)
+            min_y = y;
+        if (y > max_y)
+            max_y = y;
+    }
+
+    void merge(const AggregateFunctionSparkbarData & other)
+    {
+        if (other.points.empty())
+            return;
+
+        for (auto & point : other.points)
+        {
+            auto it = points.find(point.first);
+            if (it != points.end())
+                it->second += point.second;
+            else
+                points.emplace(point.first, point.second);
+        }
+
+        if (other.min_y < min_y)
+            min_y = other.min_y;
+
+        if (other.max_y > max_y)
+            max_y = other.max_y;
+    }
+
+    void serialize(WriteBuffer & buf) const
+    {
+        writeBinary(min_y, buf);
+        writeBinary(max_y, buf);
+        writeVarUInt(points.size(), buf);
+
+        for (const auto & elem : points)
+        {
+            writeBinary(elem.first, buf);
+            writeBinary(elem.second, buf);
+        }
+    }
+
+    void deserialize(ReadBuffer & buf)
+    {
+        readPODBinary(min_y, buf);
+        readPODBinary(max_y, buf);
+        size_t size;
+        readVarUInt(size, buf);
+
+        /// TODO Protection against huge size
+
+        points.clear();
+
+        X x;
+        Y y;
+        for (size_t i = 0; i < size; ++i)
+        {
+            readBinary(x, buf);
+            readBinary(y, buf);
+            points.emplace(x, y);
+        }
+    }
+
+};
+
+template<typename X, typename Y>
+class AggregateFunctionSparkbar final
+    : public IAggregateFunctionDataHelper<AggregateFunctionSparkbarData<X, Y>, AggregateFunctionSparkbar<X, Y>>
+{
+
+private:
+    size_t width;
+    X min_x;
+    X max_x;
+
+    String getBar(const UInt8 value) const
+    {
+        // ▁▂▃▄▅▆▇█
+        switch (value)
+        {
+            case 1: return "▁";
+            case 2: return "▂";
+            case 3: return "▃";
+            case 4: return "▄";
+            case 5: return "▅";
+            case 6: return "▆";
+            case 7: return "▇";
+            case 8: return "█";
+        }
+        return " ";
+    }
+
+    /**
+     *  The minimum value of y is rendered as the lowest height "▁",
+     *  the maximum value of y is rendered as the highest height "█", and the middle value will be rendered proportionally.
+     *  If a bucket has no y value, it will be rendered as " ".
+     *  If the actual number of buckets is greater than the specified bucket, it will be compressed by width.
+     *  For example, there are actually 11 buckets, specify 10 buckets, and divide the 11 buckets as follows (11/10):
+     *  0.0-1.1, 1.1-2.2, 2.2-3.3, 3.3-4.4, 4.4-5.5, 5.5-6.6, 6.6-7.7, 7.7-8.8, 8.8-9.9, 9.9-11.
+     *  The y value of the first bucket will be calculated as follows:
+     *  the actual y value of the first position + the actual second position y*0.1, and the remaining y*0.9 is reserved for the next bucket.
+     *  The next bucket will use the last y*0.9 + the actual third position y*0.2, and the remaining y*0.8 will be reserved for the next bucket. And so on.
+     */
+    String render(const AggregateFunctionSparkbarData<X, Y> & data) const
+    {
+        String value;
+        X local_min_x = data.points.begin()->first;
+        X local_max_x = data.points.rbegin()->first;
+        size_t diff_x = local_max_x - local_min_x;
+        if ((diff_x + 1) <= width)
+        {
+            Y min_y = data.min_y;
+            Y max_y = data.max_y;
+            Float64 diff_y = max_y - min_y;
+            for (size_t i = 0; i <= diff_x; ++i)
+            {
+                auto it = data.points.find(local_min_x + i);
+                bool found = it != data.points.end();
+                value += getBar(found ? std::round(((it->second - min_y) / diff_y) * 7) + 1 : 0);
+            }
+        }
+        else
+        {
+            // begin reshapes to width buckets
+            Float64 multiple_d = (diff_x + 1) / static_cast<Float64>(width);
+
+            // init bounds
+            std::map<size_t, Float64> bounds;
+            for (size_t i = 1; i <= width; ++i)
+            {
+                Float64 bound = i * multiple_d;
+                bounds.template emplace(std::floor(bound), bound);
+            }
+
+            std::optional<Float64> min_y;
+            std::optional<Float64> max_y;
+
+            std::optional<Float64> new_y;
+            std::map<size_t, std::optional<Float64>> newPoints;
+            for (size_t i = 0; i <= (diff_x + 1); ++i)
+            {
+                auto bound = bounds.find(i);
+                if (bound != bounds.end()) // is bound
+                {
+                    Float64 proportion = bound->second - bound->first;
+                    auto it = data.points.find(local_min_x + i);
+                    bool found = (it != data.points.end());
+                    if (found)
+                        new_y ? new_y = new_y.value() + it->second * proportion : new_y = it->second * proportion;
+
+                    // find bucket_num
+                    size_t bucket_num = 0;
+                    for (auto & b : bounds)
+                    {
+                        if (i <= b.second)
+                            break;
+                        else
+                            ++bucket_num;
+                    }
+
+                    if (new_y)
+                    {
+                        Float64 avg_y = new_y.value() / multiple_d;
+
+                        newPoints.template emplace(bucket_num, avg_y);
+                        if (!min_y || avg_y < min_y)
+                            min_y = avg_y;
+                        if (!max_y || avg_y > max_y)
+                            max_y = avg_y;
+                    }
+                    else
+                    {
+                        newPoints.template emplace(bucket_num, std::optional<Float64>());
+                    }
+
+                    // next bucket
+                    new_y = found ? ((1 - proportion) * it->second) : std::optional<Float64>();
+                }
+                else
+                {
+                    auto it = data.points.find(local_min_x + i);
+                    if (it != data.points.end())
+                        new_y ? new_y = new_y.value() + it->second : new_y = it->second;
+                }
+            }
+
+            if (!min_y || !max_y)
+                return {};
+
+            Float64 diff_y = max_y.value() - min_y.value();
+
+            auto getBars = [&] (std::pair<size_t, std::optional<Float64>> point)
+            {
+                value += getBar(point.second ? std::round(((point.second.value() - min_y.value()) / diff_y) * 7) + 1 : 0);
+            };
+            auto getBarsForConstant = [&] (std::pair<size_t, std::optional<Float64>> point)
+            {
+                value += getBar(point.second ?  1 : 0);
+            };
+
+            if (diff_y)
+                std::for_each(newPoints.begin(), newPoints.end(), getBars);
+            else
+                std::for_each(newPoints.begin(), newPoints.end(), getBarsForConstant);
+        }
+        return value;
+    }
+
+
+public:
+    AggregateFunctionSparkbar(const DataTypes & arguments, const Array & params)
+        : IAggregateFunctionDataHelper<AggregateFunctionSparkbarData<X, Y>, AggregateFunctionSparkbar>(
+        arguments, params)
+    {
+        width = params.at(0).safeGet<UInt64>();
+        if (params.size() == 3)
+        {
+            min_x = params.at(1).safeGet<X>();
+            max_x = params.at(2).safeGet<X>();
+        }
+        else
+        {
+            min_x = std::numeric_limits<X>::min();
+            max_x = std::numeric_limits<X>::max();
+        }
+    }
+
+    String getName() const override
+    {
+        return "sparkbar";
+    }
+
+    DataTypePtr getReturnType() const override
+    {
+        return std::make_shared<DataTypeString>();
+    }
+
+    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * /*arena*/) const override
+    {
+        X x = assert_cast<const ColumnVector<X> *>(columns[0])->getData()[row_num];
+        if (min_x <= x && x <= max_x)
+        {
+            Y y = assert_cast<const ColumnVector<Y> *>(columns[1])->getData()[row_num];
+            this->data(place).add(x, y);
+        }
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * /*arena*/) const override
+    {
+        this->data(place).merge(this->data(rhs));
+    }
+
+    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf) const override
+    {
+        this->data(place).serialize(buf);
+    }
+
+    void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, Arena *) const override
+    {
+        this->data(place).deserialize(buf);
+    }
+
+    bool allocatesMemoryInArena() const override { return false; }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * /*arena*/) const override
+    {
+        auto & to_column = assert_cast<ColumnString &>(to);
+        const auto & data = this->data(place);
+        const String & value = render(data);
+        to_column.insertData(value.data(), value.size());
+    }
+};
+
+}
diff --git a/src/AggregateFunctions/registerAggregateFunctions.cpp b/src/AggregateFunctions/registerAggregateFunctions.cpp
index 383f10ac24b..9bf0a694ce8 100644
--- a/src/AggregateFunctions/registerAggregateFunctions.cpp
+++ b/src/AggregateFunctions/registerAggregateFunctions.cpp
@@ -49,6 +49,7 @@ void registerAggregateFunctionMannWhitney(AggregateFunctionFactory &);
 void registerAggregateFunctionWelchTTest(AggregateFunctionFactory &);
 void registerAggregateFunctionStudentTTest(AggregateFunctionFactory &);
 void registerAggregateFunctionSequenceNextNode(AggregateFunctionFactory &);
+void registerAggregateFunctionSparkbar(AggregateFunctionFactory &);
 
 class AggregateFunctionCombinatorFactory;
 void registerAggregateFunctionCombinatorIf(AggregateFunctionCombinatorFactory &);
@@ -117,6 +118,7 @@ void registerAggregateFunctions()
         registerWindowFunctions(factory);
 
         registerAggregateFunctionIntervalLengthSum(factory);
+        registerAggregateFunctionSparkbar(factory);
     }
 
     {
diff --git a/tests/queries/0_stateless/02003_aggregation_spark_bar.reference b/tests/queries/0_stateless/02003_aggregation_spark_bar.reference
new file mode 100644
index 00000000000..f027083dd1b
--- /dev/null
+++ b/tests/queries/0_stateless/02003_aggregation_spark_bar.reference
@@ -0,0 +1,11 @@
+▁
+▁█
+▃█▁
+▄▅█▁
+▄▄█▇▁
+▃▄▅█▃▁
+▂▅▃▇█▁▂
+▂▅▃▅██ ▁
+▁▅▄▃██▅ ▁
+▁▄▄▂▅▇█▂ ▂
+▁▄▅▂▃▇▆█  ▂
diff --git a/tests/queries/0_stateless/02003_aggregation_spark_bar.sql b/tests/queries/0_stateless/02003_aggregation_spark_bar.sql
new file mode 100644
index 00000000000..5457a433fe8
--- /dev/null
+++ b/tests/queries/0_stateless/02003_aggregation_spark_bar.sql
@@ -0,0 +1,17 @@
+drop table if exists spark_bar_test;
+
+CREATE TABLE spark_bar_test (`cnt` UInt64,`event_date` Date) ENGINE = MergeTree ORDER BY event_date SETTINGS index_granularity = 8192;
+
+insert into spark_bar_test values(1,'2020-01-01'),(4,'2020-01-02'),(5,'2020-01-03'),(2,'2020-01-04'),(3,'2020-01-05'),(7,'2020-01-06'),(6,'2020-01-07'),(8,'2020-01-08'),(2,'2020-01-11');
+
+select sparkbar(1)(event_date,cnt) from spark_bar_test;
+select sparkbar(2)(event_date,cnt) from spark_bar_test;
+select sparkbar(3)(event_date,cnt) from spark_bar_test;
+select sparkbar(4)(event_date,cnt) from spark_bar_test;
+select sparkbar(5)(event_date,cnt) from spark_bar_test;
+select sparkbar(6)(event_date,cnt) from spark_bar_test;
+select sparkbar(7)(event_date,cnt) from spark_bar_test;
+select sparkbar(8)(event_date,cnt) from spark_bar_test;
+select sparkbar(9)(event_date,cnt) from spark_bar_test;
+select sparkbar(10)(event_date,cnt) from spark_bar_test;
+select sparkbar(11)(event_date,cnt) from spark_bar_test;

From deb2c4569f971212b6d6d0d2eff9a1d5bd7ca2f9 Mon Sep 17 00:00:00 2001
From: zhangxiao871 <zhangxiao871@ZBMAC-C02DN6312.local>
Date: Tue, 10 Aug 2021 16:59:36 +0800
Subject: [PATCH 002/273] Avoid division by 0 problem.

---
 .../AggregateFunctionSparkbar.h               | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/AggregateFunctions/AggregateFunctionSparkbar.h b/src/AggregateFunctions/AggregateFunctionSparkbar.h
index 976ee2043c7..344bcce3ec2 100644
--- a/src/AggregateFunctions/AggregateFunctionSparkbar.h
+++ b/src/AggregateFunctions/AggregateFunctionSparkbar.h
@@ -20,7 +20,7 @@ struct AggregateFunctionSparkbarData
     Points points;
 
     Y min_y = std::numeric_limits<Y>::max();
-    Y max_y = std::numeric_limits<Y>::min();
+    Y max_y = std::numeric_limits<Y>::lowest();
 
     void add(X x, Y y)
     {
@@ -141,11 +141,20 @@ private:
             Y min_y = data.min_y;
             Y max_y = data.max_y;
             Float64 diff_y = max_y - min_y;
-            for (size_t i = 0; i <= diff_x; ++i)
+
+            if (diff_y)
             {
-                auto it = data.points.find(local_min_x + i);
-                bool found = it != data.points.end();
-                value += getBar(found ? std::round(((it->second - min_y) / diff_y) * 7) + 1 : 0);
+                for (size_t i = 0; i <= diff_x; ++i)
+                {
+                    auto it = data.points.find(local_min_x + i);
+                    bool found = it != data.points.end();
+                    value += getBar(found ? std::round(((it->second - min_y) / diff_y) * 7) + 1 : 0);
+                }
+            }
+            else
+            {
+                for (size_t i = 0; i <= diff_x; ++i)
+                    value += getBar(data.points.count(local_min_x + i) ? 1 : 0);
             }
         }
         else

From 72ba479b26a2feea2b18e9244d586136a5a20210 Mon Sep 17 00:00:00 2001
From: zhangxiao871 <zhangxiao871@ZBMAC-C02DN6312.local>
Date: Sun, 15 Aug 2021 19:50:32 +0800
Subject: [PATCH 003/273] Add tests.

---
 .../AggregateFunctionSparkbar.h               | 16 ++++-----
 .../02003_aggregation_spark_bar.reference     |  7 ++++
 .../02003_aggregation_spark_bar.sql           | 35 ++++++++++++-------
 3 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/src/AggregateFunctions/AggregateFunctionSparkbar.h b/src/AggregateFunctions/AggregateFunctionSparkbar.h
index 344bcce3ec2..87db938dac4 100644
--- a/src/AggregateFunctions/AggregateFunctionSparkbar.h
+++ b/src/AggregateFunctions/AggregateFunctionSparkbar.h
@@ -29,10 +29,9 @@ struct AggregateFunctionSparkbarData
             it->second += y;
         else
             points.emplace(x, y);
-        if (y < min_y)
-            min_y = y;
-        if (y > max_y)
-            max_y = y;
+
+        min_y = std::min(y, min_y);
+        max_y = std::max(y, max_y);
     }
 
     void merge(const AggregateFunctionSparkbarData & other)
@@ -49,11 +48,8 @@ struct AggregateFunctionSparkbarData
                 points.emplace(point.first, point.second);
         }
 
-        if (other.min_y < min_y)
-            min_y = other.min_y;
-
-        if (other.max_y > max_y)
-            max_y = other.max_y;
+        min_y = std::min(other.min_y, min_y);
+        max_y = std::max(other.max_y, max_y);
     }
 
     void serialize(WriteBuffer & buf) const
@@ -133,6 +129,8 @@ private:
     String render(const AggregateFunctionSparkbarData<X, Y> & data) const
     {
         String value;
+        if (data.points.empty())
+            return value;
         X local_min_x = data.points.begin()->first;
         X local_max_x = data.points.rbegin()->first;
         size_t diff_x = local_max_x - local_min_x;
diff --git a/tests/queries/0_stateless/02003_aggregation_spark_bar.reference b/tests/queries/0_stateless/02003_aggregation_spark_bar.reference
index f027083dd1b..8e13e4b6f71 100644
--- a/tests/queries/0_stateless/02003_aggregation_spark_bar.reference
+++ b/tests/queries/0_stateless/02003_aggregation_spark_bar.reference
@@ -9,3 +9,10 @@
 ▁▅▄▃██▅ ▁
 ▁▄▄▂▅▇█▂ ▂
 ▁▄▅▂▃▇▆█  ▂
+
+
+
+▁
+▆█▁▃
+▅▁▂█▇
+▁▂▇▆█  ▁
diff --git a/tests/queries/0_stateless/02003_aggregation_spark_bar.sql b/tests/queries/0_stateless/02003_aggregation_spark_bar.sql
index 5457a433fe8..fb4100d8bb3 100644
--- a/tests/queries/0_stateless/02003_aggregation_spark_bar.sql
+++ b/tests/queries/0_stateless/02003_aggregation_spark_bar.sql
@@ -1,17 +1,26 @@
-drop table if exists spark_bar_test;
+DROP TABLE IF EXISTS spark_bar_test;
 
 CREATE TABLE spark_bar_test (`cnt` UInt64,`event_date` Date) ENGINE = MergeTree ORDER BY event_date SETTINGS index_granularity = 8192;
 
-insert into spark_bar_test values(1,'2020-01-01'),(4,'2020-01-02'),(5,'2020-01-03'),(2,'2020-01-04'),(3,'2020-01-05'),(7,'2020-01-06'),(6,'2020-01-07'),(8,'2020-01-08'),(2,'2020-01-11');
+INSERT INTO spark_bar_test VALUES(1,'2020-01-01'),(4,'2020-01-02'),(5,'2020-01-03'),(2,'2020-01-04'),(3,'2020-01-05'),(7,'2020-01-06'),(6,'2020-01-07'),(8,'2020-01-08'),(2,'2020-01-11');
 
-select sparkbar(1)(event_date,cnt) from spark_bar_test;
-select sparkbar(2)(event_date,cnt) from spark_bar_test;
-select sparkbar(3)(event_date,cnt) from spark_bar_test;
-select sparkbar(4)(event_date,cnt) from spark_bar_test;
-select sparkbar(5)(event_date,cnt) from spark_bar_test;
-select sparkbar(6)(event_date,cnt) from spark_bar_test;
-select sparkbar(7)(event_date,cnt) from spark_bar_test;
-select sparkbar(8)(event_date,cnt) from spark_bar_test;
-select sparkbar(9)(event_date,cnt) from spark_bar_test;
-select sparkbar(10)(event_date,cnt) from spark_bar_test;
-select sparkbar(11)(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(1)(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(2)(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(3)(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(4)(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(5)(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(6)(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(7)(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(8)(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(9)(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(10)(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(11)(event_date,cnt) from spark_bar_test;
+
+SELECT sparkbar(11,2,5)(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(11,3,7)(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(11,4,11)(event_date,cnt) from spark_bar_test;
+
+SELECT sparkbar(11,toDate('2020-01-02'),toDate('2020-01-02'))(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(11,toDate('2020-01-02'),toDate('2020-01-05'))(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(11,toDate('2020-01-03'),toDate('2020-01-07'))(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(11,toDate('2020-01-04'),toDate('2020-01-11'))(event_date,cnt) from spark_bar_test;

From babe95aeec34d9ce41a4b8eccaa737e4580face7 Mon Sep 17 00:00:00 2001
From: zhangxiao871 <zhangxiao871@ZBMAC-C02DN6312.local>
Date: Sun, 15 Aug 2021 19:59:42 +0800
Subject: [PATCH 004/273] Add tests.

---
 ..._spark_bar.reference => 02011_aggregation_spark_bar.reference} | 0
 ..._aggregation_spark_bar.sql => 02011_aggregation_spark_bar.sql} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/queries/0_stateless/{02003_aggregation_spark_bar.reference => 02011_aggregation_spark_bar.reference} (100%)
 rename tests/queries/0_stateless/{02003_aggregation_spark_bar.sql => 02011_aggregation_spark_bar.sql} (100%)

diff --git a/tests/queries/0_stateless/02003_aggregation_spark_bar.reference b/tests/queries/0_stateless/02011_aggregation_spark_bar.reference
similarity index 100%
rename from tests/queries/0_stateless/02003_aggregation_spark_bar.reference
rename to tests/queries/0_stateless/02011_aggregation_spark_bar.reference
diff --git a/tests/queries/0_stateless/02003_aggregation_spark_bar.sql b/tests/queries/0_stateless/02011_aggregation_spark_bar.sql
similarity index 100%
rename from tests/queries/0_stateless/02003_aggregation_spark_bar.sql
rename to tests/queries/0_stateless/02011_aggregation_spark_bar.sql

From 644a268963b774aa5ef1b75a63927f6b248482a9 Mon Sep 17 00:00:00 2001
From: zhangxiao871 <zhangxiao871@ZBMAC-C02DN6312.local>
Date: Tue, 17 Aug 2021 17:28:54 +0800
Subject: [PATCH 005/273] sparkbar map instead of HashMap and some optimize.

---
 .../AggregateFunctionSparkbar.cpp             |   4 +-
 .../AggregateFunctionSparkbar.h               | 109 +++++++++---------
 .../02011_aggregation_spark_bar.reference     |   6 +
 .../02011_aggregation_spark_bar.sql           |   7 ++
 4 files changed, 68 insertions(+), 58 deletions(-)

diff --git a/src/AggregateFunctions/AggregateFunctionSparkbar.cpp b/src/AggregateFunctions/AggregateFunctionSparkbar.cpp
index 63bcd037f26..7f1196173a7 100644
--- a/src/AggregateFunctions/AggregateFunctionSparkbar.cpp
+++ b/src/AggregateFunctions/AggregateFunctionSparkbar.cpp
@@ -11,8 +11,8 @@ struct Settings;
 
 namespace ErrorCodes
 {
-extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
 namespace
diff --git a/src/AggregateFunctions/AggregateFunctionSparkbar.h b/src/AggregateFunctions/AggregateFunctionSparkbar.h
index 87db938dac4..20282c1cd46 100644
--- a/src/AggregateFunctions/AggregateFunctionSparkbar.h
+++ b/src/AggregateFunctions/AggregateFunctionSparkbar.h
@@ -8,6 +8,7 @@
 #include <Columns/ColumnString.h>
 #include <common/logger_useful.h>
 #include <IO/ReadBufferFromString.h>
+#include <Common/HashTable/HashMap.h>
 
 namespace DB
 {
@@ -15,21 +16,28 @@ namespace DB
 template<typename X, typename Y>
 struct AggregateFunctionSparkbarData
 {
-    using Points = std::map<X, Y>;
 
+    using Points = HashMap<X, Y>;
     Points points;
 
+    X min_x = std::numeric_limits<X>::max();
+    X max_x = std::numeric_limits<X>::lowest();
+
     Y min_y = std::numeric_limits<Y>::max();
     Y max_y = std::numeric_limits<Y>::lowest();
 
+    void insert(const X & x, const Y & y)
+    {
+        auto result = points.insert({x, y});
+        if (!result.second)
+            result.first->getMapped() += y;
+    }
+
     void add(X x, Y y)
     {
-        auto it = points.find(x);
-        if (it != points.end())
-            it->second += y;
-        else
-            points.emplace(x, y);
-
+        insert(x, y);
+        min_x = std::min(x, min_x);
+        max_x = std::max(x, max_x);
         min_y = std::min(y, min_y);
         max_y = std::max(y, max_y);
     }
@@ -40,49 +48,46 @@ struct AggregateFunctionSparkbarData
             return;
 
         for (auto & point : other.points)
-        {
-            auto it = points.find(point.first);
-            if (it != points.end())
-                it->second += point.second;
-            else
-                points.emplace(point.first, point.second);
-        }
+            insert(point.getKey(), point.getMapped());
 
+        min_x = std::min(other.min_x, min_x);
+        max_x = std::max(other.max_x, max_x);
         min_y = std::min(other.min_y, min_y);
         max_y = std::max(other.max_y, max_y);
     }
 
     void serialize(WriteBuffer & buf) const
     {
+        writeBinary(min_x, buf);
+        writeBinary(max_x, buf);
         writeBinary(min_y, buf);
         writeBinary(max_y, buf);
         writeVarUInt(points.size(), buf);
 
         for (const auto & elem : points)
         {
-            writeBinary(elem.first, buf);
-            writeBinary(elem.second, buf);
+            writeBinary(elem.getKey(), buf);
+            writeBinary(elem.getMapped(), buf);
         }
     }
 
     void deserialize(ReadBuffer & buf)
     {
-        readPODBinary(min_y, buf);
-        readPODBinary(max_y, buf);
+        readBinary(min_x, buf);
+        readBinary(max_x, buf);
+        readBinary(min_y, buf);
+        readBinary(max_y, buf);
         size_t size;
         readVarUInt(size, buf);
 
         /// TODO Protection against huge size
-
-        points.clear();
-
         X x;
         Y y;
         for (size_t i = 0; i < size; ++i)
         {
             readBinary(x, buf);
             readBinary(y, buf);
-            points.emplace(x, y);
+            insert(x, y);
         }
     }
 
@@ -129,10 +134,10 @@ private:
     String render(const AggregateFunctionSparkbarData<X, Y> & data) const
     {
         String value;
-        if (data.points.empty())
+        if (data.points.empty() || !width)
             return value;
-        X local_min_x = data.points.begin()->first;
-        X local_max_x = data.points.rbegin()->first;
+        X local_min_x = data.min_x;
+        X local_max_x = data.max_x;
         size_t diff_x = local_max_x - local_min_x;
         if ((diff_x + 1) <= width)
         {
@@ -146,13 +151,13 @@ private:
                 {
                     auto it = data.points.find(local_min_x + i);
                     bool found = it != data.points.end();
-                    value += getBar(found ? std::round(((it->second - min_y) / diff_y) * 7) + 1 : 0);
+                    value += getBar(found ? std::round(((it->getMapped() - min_y) / diff_y) * 7) + 1 : 0);
                 }
             }
             else
             {
                 for (size_t i = 0; i <= diff_x; ++i)
-                    value += getBar(data.points.count(local_min_x + i) ? 1 : 0);
+                    value += getBar(data.points.has(local_min_x + i) ? 1 : 0);
             }
         }
         else
@@ -160,45 +165,36 @@ private:
             // begin reshapes to width buckets
             Float64 multiple_d = (diff_x + 1) / static_cast<Float64>(width);
 
-            // init bounds
-            std::map<size_t, Float64> bounds;
-            for (size_t i = 1; i <= width; ++i)
-            {
-                Float64 bound = i * multiple_d;
-                bounds.template emplace(std::floor(bound), bound);
-            }
-
             std::optional<Float64> min_y;
             std::optional<Float64> max_y;
 
             std::optional<Float64> new_y;
             std::map<size_t, std::optional<Float64>> newPoints;
+
+            std::pair<size_t, Float64> bound{0, 0.0};
+            size_t cur_bucket_num = 0;
+            // upper bound for bucket
+            auto upperBound = [&](size_t bucket_num)
+            {
+                bound.second = (bucket_num + 1) * multiple_d;
+                bound.first = std::floor(bound.second);
+            };
+            upperBound(cur_bucket_num);
             for (size_t i = 0; i <= (diff_x + 1); ++i)
             {
-                auto bound = bounds.find(i);
-                if (bound != bounds.end()) // is bound
+                if (i == bound.first) // is bound
                 {
-                    Float64 proportion = bound->second - bound->first;
+                    Float64 proportion = bound.second - bound.first;
                     auto it = data.points.find(local_min_x + i);
                     bool found = (it != data.points.end());
                     if (found)
-                        new_y ? new_y = new_y.value() + it->second * proportion : new_y = it->second * proportion;
-
-                    // find bucket_num
-                    size_t bucket_num = 0;
-                    for (auto & b : bounds)
-                    {
-                        if (i <= b.second)
-                            break;
-                        else
-                            ++bucket_num;
-                    }
+                        new_y = new_y.value_or(0) + it->getMapped() * proportion;
 
                     if (new_y)
                     {
                         Float64 avg_y = new_y.value() / multiple_d;
 
-                        newPoints.template emplace(bucket_num, avg_y);
+                        newPoints.template emplace(cur_bucket_num, avg_y);
                         if (!min_y || avg_y < min_y)
                             min_y = avg_y;
                         if (!max_y || avg_y > max_y)
@@ -206,17 +202,18 @@ private:
                     }
                     else
                     {
-                        newPoints.template emplace(bucket_num, std::optional<Float64>());
+                        newPoints.template emplace(cur_bucket_num, std::optional<Float64>());
                     }
 
                     // next bucket
-                    new_y = found ? ((1 - proportion) * it->second) : std::optional<Float64>();
+                    new_y = found ? ((1 - proportion) * it->getMapped()) : std::optional<Float64>();
+                    upperBound(++cur_bucket_num);
                 }
                 else
                 {
                     auto it = data.points.find(local_min_x + i);
                     if (it != data.points.end())
-                        new_y ? new_y = new_y.value() + it->second : new_y = it->second;
+                        new_y = new_y.value_or(0) + it->getMapped();
                 }
             }
 
@@ -225,13 +222,13 @@ private:
 
             Float64 diff_y = max_y.value() - min_y.value();
 
-            auto getBars = [&] (std::pair<size_t, std::optional<Float64>> point)
+            auto getBars = [&] (const std::pair<size_t, std::optional<Float64>> & point)
             {
                 value += getBar(point.second ? std::round(((point.second.value() - min_y.value()) / diff_y) * 7) + 1 : 0);
             };
-            auto getBarsForConstant = [&] (std::pair<size_t, std::optional<Float64>> point)
+            auto getBarsForConstant = [&] (const std::pair<size_t, std::optional<Float64>> & point)
             {
-                value += getBar(point.second ?  1 : 0);
+                value += getBar(point.second ? 1 : 0);
             };
 
             if (diff_y)
diff --git a/tests/queries/0_stateless/02011_aggregation_spark_bar.reference b/tests/queries/0_stateless/02011_aggregation_spark_bar.reference
index 8e13e4b6f71..cc6cc81037b 100644
--- a/tests/queries/0_stateless/02011_aggregation_spark_bar.reference
+++ b/tests/queries/0_stateless/02011_aggregation_spark_bar.reference
@@ -16,3 +16,9 @@
 ▆█▁▃
 ▅▁▂█▇
 ▁▂▇▆█  ▁
+▁█
+▁█
+▁▁█
+▁▁█
+▁▃▅█
+▁▄▂▇█
diff --git a/tests/queries/0_stateless/02011_aggregation_spark_bar.sql b/tests/queries/0_stateless/02011_aggregation_spark_bar.sql
index fb4100d8bb3..d9e5adc3d72 100644
--- a/tests/queries/0_stateless/02011_aggregation_spark_bar.sql
+++ b/tests/queries/0_stateless/02011_aggregation_spark_bar.sql
@@ -24,3 +24,10 @@ SELECT sparkbar(11,toDate('2020-01-02'),toDate('2020-01-02'))(event_date,cnt) fr
 SELECT sparkbar(11,toDate('2020-01-02'),toDate('2020-01-05'))(event_date,cnt) from spark_bar_test;
 SELECT sparkbar(11,toDate('2020-01-03'),toDate('2020-01-07'))(event_date,cnt) from spark_bar_test;
 SELECT sparkbar(11,toDate('2020-01-04'),toDate('2020-01-11'))(event_date,cnt) from spark_bar_test;
+
+SELECT sparkbar(2,toDate('2020-01-01'),toDate('2020-01-08'))(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(2,toDate('2020-01-02'),toDate('2020-01-09'))(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(3,toDate('2020-01-01'),toDate('2020-01-09'))(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(3,toDate('2020-01-01'),toDate('2020-01-10'))(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(4,toDate('2020-01-01'),toDate('2020-01-08'))(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(5,toDate('2020-01-01'),toDate('2020-01-10'))(event_date,cnt) from spark_bar_test;

From 78d01f4b88c708c872c486f8a773c6ae7f1b8cfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=B7=AF?= <821008736@qq.com>
Date: Tue, 17 Aug 2021 17:35:19 +0800
Subject: [PATCH 006/273] Update 02011_aggregation_spark_bar.sql

---
 .../02011_aggregation_spark_bar.sql           | 50 ++++++++++---------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/tests/queries/0_stateless/02011_aggregation_spark_bar.sql b/tests/queries/0_stateless/02011_aggregation_spark_bar.sql
index d9e5adc3d72..90403332529 100644
--- a/tests/queries/0_stateless/02011_aggregation_spark_bar.sql
+++ b/tests/queries/0_stateless/02011_aggregation_spark_bar.sql
@@ -4,30 +4,32 @@ CREATE TABLE spark_bar_test (`cnt` UInt64,`event_date` Date) ENGINE = MergeTree
 
 INSERT INTO spark_bar_test VALUES(1,'2020-01-01'),(4,'2020-01-02'),(5,'2020-01-03'),(2,'2020-01-04'),(3,'2020-01-05'),(7,'2020-01-06'),(6,'2020-01-07'),(8,'2020-01-08'),(2,'2020-01-11');
 
-SELECT sparkbar(1)(event_date,cnt) from spark_bar_test;
-SELECT sparkbar(2)(event_date,cnt) from spark_bar_test;
-SELECT sparkbar(3)(event_date,cnt) from spark_bar_test;
-SELECT sparkbar(4)(event_date,cnt) from spark_bar_test;
-SELECT sparkbar(5)(event_date,cnt) from spark_bar_test;
-SELECT sparkbar(6)(event_date,cnt) from spark_bar_test;
-SELECT sparkbar(7)(event_date,cnt) from spark_bar_test;
-SELECT sparkbar(8)(event_date,cnt) from spark_bar_test;
-SELECT sparkbar(9)(event_date,cnt) from spark_bar_test;
-SELECT sparkbar(10)(event_date,cnt) from spark_bar_test;
-SELECT sparkbar(11)(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(1)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(2)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(3)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(4)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(5)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(6)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(7)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(8)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(9)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(10)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(11)(event_date,cnt) FROM spark_bar_test;
 
-SELECT sparkbar(11,2,5)(event_date,cnt) from spark_bar_test;
-SELECT sparkbar(11,3,7)(event_date,cnt) from spark_bar_test;
-SELECT sparkbar(11,4,11)(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(11,2,5)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(11,3,7)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(11,4,11)(event_date,cnt) FROM spark_bar_test;
 
-SELECT sparkbar(11,toDate('2020-01-02'),toDate('2020-01-02'))(event_date,cnt) from spark_bar_test;
-SELECT sparkbar(11,toDate('2020-01-02'),toDate('2020-01-05'))(event_date,cnt) from spark_bar_test;
-SELECT sparkbar(11,toDate('2020-01-03'),toDate('2020-01-07'))(event_date,cnt) from spark_bar_test;
-SELECT sparkbar(11,toDate('2020-01-04'),toDate('2020-01-11'))(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(11,toDate('2020-01-02'),toDate('2020-01-02'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(11,toDate('2020-01-02'),toDate('2020-01-05'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(11,toDate('2020-01-03'),toDate('2020-01-07'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(11,toDate('2020-01-04'),toDate('2020-01-11'))(event_date,cnt) FROM spark_bar_test;
 
-SELECT sparkbar(2,toDate('2020-01-01'),toDate('2020-01-08'))(event_date,cnt) from spark_bar_test;
-SELECT sparkbar(2,toDate('2020-01-02'),toDate('2020-01-09'))(event_date,cnt) from spark_bar_test;
-SELECT sparkbar(3,toDate('2020-01-01'),toDate('2020-01-09'))(event_date,cnt) from spark_bar_test;
-SELECT sparkbar(3,toDate('2020-01-01'),toDate('2020-01-10'))(event_date,cnt) from spark_bar_test;
-SELECT sparkbar(4,toDate('2020-01-01'),toDate('2020-01-08'))(event_date,cnt) from spark_bar_test;
-SELECT sparkbar(5,toDate('2020-01-01'),toDate('2020-01-10'))(event_date,cnt) from spark_bar_test;
+SELECT sparkbar(2,toDate('2020-01-01'),toDate('2020-01-08'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(2,toDate('2020-01-02'),toDate('2020-01-09'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(3,toDate('2020-01-01'),toDate('2020-01-09'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(3,toDate('2020-01-01'),toDate('2020-01-10'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(4,toDate('2020-01-01'),toDate('2020-01-08'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(5,toDate('2020-01-01'),toDate('2020-01-10'))(event_date,cnt) FROM spark_bar_test;
+
+DROP TABLE IF EXISTS spark_bar_test;

From 9aadba98cf8412d25df274974bf20d222c18d285 Mon Sep 17 00:00:00 2001
From: zhangxiao871 <zhangxiao871@ZBMAC-C02DN6312.local>
Date: Fri, 20 Aug 2021 18:27:14 +0800
Subject: [PATCH 007/273] Better newPoints data struct and rename test.

---
 .../AggregateFunctionSparkbar.h               | 20 +++++++++----------
 ... => 02012_aggregation_spark_bar.reference} |  0
 ...ar.sql => 02012_aggregation_spark_bar.sql} |  0
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename tests/queries/0_stateless/{02011_aggregation_spark_bar.reference => 02012_aggregation_spark_bar.reference} (100%)
 rename tests/queries/0_stateless/{02011_aggregation_spark_bar.sql => 02012_aggregation_spark_bar.sql} (100%)

diff --git a/src/AggregateFunctions/AggregateFunctionSparkbar.h b/src/AggregateFunctions/AggregateFunctionSparkbar.h
index 20282c1cd46..037463c6fef 100644
--- a/src/AggregateFunctions/AggregateFunctionSparkbar.h
+++ b/src/AggregateFunctions/AggregateFunctionSparkbar.h
@@ -142,8 +142,7 @@ private:
         if ((diff_x + 1) <= width)
         {
             Y min_y = data.min_y;
-            Y max_y = data.max_y;
-            Float64 diff_y = max_y - min_y;
+            Float64 diff_y = data.max_y - min_y;
 
             if (diff_y)
             {
@@ -169,7 +168,7 @@ private:
             std::optional<Float64> max_y;
 
             std::optional<Float64> new_y;
-            std::map<size_t, std::optional<Float64>> newPoints;
+            std::vector<std::optional<Float64>> newPoints;
 
             std::pair<size_t, Float64> bound{0, 0.0};
             size_t cur_bucket_num = 0;
@@ -194,7 +193,8 @@ private:
                     {
                         Float64 avg_y = new_y.value() / multiple_d;
 
-                        newPoints.template emplace(cur_bucket_num, avg_y);
+                        newPoints.template emplace_back(avg_y);
+                        // If min_y has no value, or if the avg_y of the current bucket is less than min_y, update it.
                         if (!min_y || avg_y < min_y)
                             min_y = avg_y;
                         if (!max_y || avg_y > max_y)
@@ -202,7 +202,7 @@ private:
                     }
                     else
                     {
-                        newPoints.template emplace(cur_bucket_num, std::optional<Float64>());
+                        newPoints.template emplace_back(std::optional<Float64>());
                     }
 
                     // next bucket
@@ -217,18 +217,18 @@ private:
                 }
             }
 
-            if (!min_y || !max_y)
+            if (!min_y || !max_y) // No value is set
                 return {};
 
             Float64 diff_y = max_y.value() - min_y.value();
 
-            auto getBars = [&] (const std::pair<size_t, std::optional<Float64>> & point)
+            auto getBars = [&] (const std::optional<Float64> & point_y)
             {
-                value += getBar(point.second ? std::round(((point.second.value() - min_y.value()) / diff_y) * 7) + 1 : 0);
+                value += getBar(point_y ? std::round(((point_y.value() - min_y.value()) / diff_y) * 7) + 1 : 0);
             };
-            auto getBarsForConstant = [&] (const std::pair<size_t, std::optional<Float64>> & point)
+            auto getBarsForConstant = [&] (const std::optional<Float64> & point_y)
             {
-                value += getBar(point.second ? 1 : 0);
+                value += getBar(point_y ? 1 : 0);
             };
 
             if (diff_y)
diff --git a/tests/queries/0_stateless/02011_aggregation_spark_bar.reference b/tests/queries/0_stateless/02012_aggregation_spark_bar.reference
similarity index 100%
rename from tests/queries/0_stateless/02011_aggregation_spark_bar.reference
rename to tests/queries/0_stateless/02012_aggregation_spark_bar.reference
diff --git a/tests/queries/0_stateless/02011_aggregation_spark_bar.sql b/tests/queries/0_stateless/02012_aggregation_spark_bar.sql
similarity index 100%
rename from tests/queries/0_stateless/02011_aggregation_spark_bar.sql
rename to tests/queries/0_stateless/02012_aggregation_spark_bar.sql

From 4d59e0c8f96b76c7e3c2e28d9317c667fb7d5ef8 Mon Sep 17 00:00:00 2001
From: zhangxiao871 <zhangxiao871@ZBMAC-C02DN6312.local>
Date: Fri, 20 Aug 2021 20:48:23 +0800
Subject: [PATCH 008/273] Maybe fix AST fuzzer (UBSan) check.

---
 src/AggregateFunctions/AggregateFunctionSparkbar.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/AggregateFunctions/AggregateFunctionSparkbar.h b/src/AggregateFunctions/AggregateFunctionSparkbar.h
index 037463c6fef..22fc93986f0 100644
--- a/src/AggregateFunctions/AggregateFunctionSparkbar.h
+++ b/src/AggregateFunctions/AggregateFunctionSparkbar.h
@@ -142,7 +142,8 @@ private:
         if ((diff_x + 1) <= width)
         {
             Y min_y = data.min_y;
-            Float64 diff_y = data.max_y - min_y;
+            Y max_y = data.max_y;
+            Float64 diff_y = max_y - min_y;
 
             if (diff_y)
             {

From 8c7c928f6223af56d1a8fd96ba4adc5f6f85f25e Mon Sep 17 00:00:00 2001
From: Alexey <lehasm@gmail.com>
Date: Sat, 21 Aug 2021 12:38:19 +0000
Subject: [PATCH 009/273] Description draft

---
 .../statements/create/function.md             | 42 +++++++++++++++++++
 docs/en/sql-reference/statements/drop.md      | 21 +++++++++-
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 docs/en/sql-reference/statements/create/function.md

diff --git a/docs/en/sql-reference/statements/create/function.md b/docs/en/sql-reference/statements/create/function.md
new file mode 100644
index 00000000000..c48535c44d3
--- /dev/null
+++ b/docs/en/sql-reference/statements/create/function.md
@@ -0,0 +1,42 @@
+---
+toc_priority: 38
+toc_title: FUNCTION
+---
+
+# CREATE FUNCTION {#create-function}
+
+Creates a user defined function from a lambda expression.
+
+**Syntax**
+
+```sql
+CREATE FUNCTION {function_name} as ({parameters}) -> {function core}
+```
+
+Errors are caused by
+
+-   Creating a function with a name that already exists;
+-   Recursive function.
+-   An identifier not listed in function parameters is used inside a function.
+
+**Example**
+
+
+Query:
+
+```sql
+CREATE FUNCTION plus_one as (a) -> a + 1;
+SELECT number, plus_one(number) FROM numbers(3);
+```
+
+Result:
+
+``` text
+┌─number─┬─plus_one─┐
+│      0 │        1 │
+│      1 │        2 │
+│      2 │        3 │
+└────────┴──────────┘
+```
+
+-   [DROP](../../../sql-reference/statements/drop.md#drop-function)
diff --git a/docs/en/sql-reference/statements/drop.md b/docs/en/sql-reference/statements/drop.md
index 90a2a46c7cf..4919c00a3dc 100644
--- a/docs/en/sql-reference/statements/drop.md
+++ b/docs/en/sql-reference/statements/drop.md
@@ -97,4 +97,23 @@ Syntax:
 DROP VIEW [IF EXISTS] [db.]name [ON CLUSTER cluster]
 ```
 
-[Оriginal article](https://clickhouse.tech/docs/en/sql-reference/statements/drop/) <!--hide-->
+## DROP FUNCTION {#drop-function}
+
+Deletes a user defined function created by [CREATE FUNCTION](./create/function.md).
+System functions can not be dropped.
+
+**Syntax**
+
+``` sql
+DROP FUNCTION [IF EXISTS] function_name
+```
+
+**Example**
+
+``` sql
+CREATE FUNCTION plus_one as (a) -> a + 1;
+DROP FUNCTION plus_one;
+```
+
+
+

From 77a1a35a05fd36443447460bfb20d5bb658518b8 Mon Sep 17 00:00:00 2001
From: Alexey <lehasm@gmail.com>
Date: Sat, 21 Aug 2021 12:38:44 +0000
Subject: [PATCH 010/273] Additional links to CREATE and DROP FUNCTION

---
 docs/en/sql-reference/statements/create/index.md | 1 +
 docs/en/sql-reference/statements/grant.md        | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/docs/en/sql-reference/statements/create/index.md b/docs/en/sql-reference/statements/create/index.md
index 902a4348bac..5721130dd24 100644
--- a/docs/en/sql-reference/statements/create/index.md
+++ b/docs/en/sql-reference/statements/create/index.md
@@ -12,6 +12,7 @@ Create queries make a new entity of one of the following kinds:
 -   [TABLE](../../../sql-reference/statements/create/table.md)
 -   [VIEW](../../../sql-reference/statements/create/view.md)
 -   [DICTIONARY](../../../sql-reference/statements/create/dictionary.md)
+-   [FUNCTION](../../../sql-reference/statements/create/function.md)
 -   [USER](../../../sql-reference/statements/create/user.md)
 -   [ROLE](../../../sql-reference/statements/create/role.md)
 -   [ROW POLICY](../../../sql-reference/statements/create/row-policy.md)
diff --git a/docs/en/sql-reference/statements/grant.md b/docs/en/sql-reference/statements/grant.md
index 25dffc36954..2b3cd68fbb2 100644
--- a/docs/en/sql-reference/statements/grant.md
+++ b/docs/en/sql-reference/statements/grant.md
@@ -107,11 +107,13 @@ Hierarchy of privileges:
         -   `CREATE TEMPORARY TABLE`
     -   `CREATE VIEW`
     -   `CREATE DICTIONARY`
+    -   `CREATE FUNCTION`
 -   [DROP](#grant-drop)
     -   `DROP DATABASE`
     -   `DROP TABLE`
     -   `DROP VIEW`
     -   `DROP DICTIONARY`
+    -   `DROP FUNCTION`
 -   [TRUNCATE](#grant-truncate)
 -   [OPTIMIZE](#grant-optimize)
 -   [SHOW](#grant-show)

From 3a8199c21e1c426565b40723d18a3643172e942f Mon Sep 17 00:00:00 2001
From: zhangxiao871 <zhangxiao871@ZBMAC-C02DN6312.local>
Date: Sun, 22 Aug 2021 00:28:17 +0800
Subject: [PATCH 011/273] Try fix AST fuzzer (UBSan) check.

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

diff --git a/src/AggregateFunctions/AggregateFunctionSparkbar.h b/src/AggregateFunctions/AggregateFunctionSparkbar.h
index 22fc93986f0..dd1028d5d1f 100644
--- a/src/AggregateFunctions/AggregateFunctionSparkbar.h
+++ b/src/AggregateFunctions/AggregateFunctionSparkbar.h
@@ -151,7 +151,7 @@ private:
                 {
                     auto it = data.points.find(local_min_x + i);
                     bool found = it != data.points.end();
-                    value += getBar(found ? std::round(((it->getMapped() - min_y) / diff_y) * 7) + 1 : 0);
+                    value += getBar(found ? static_cast<UInt8>(std::round(((it->getMapped() - min_y) / diff_y) * 7) + 1) : 0);
                 }
             }
             else
@@ -225,7 +225,7 @@ private:
 
             auto getBars = [&] (const std::optional<Float64> & point_y)
             {
-                value += getBar(point_y ? std::round(((point_y.value() - min_y.value()) / diff_y) * 7) + 1 : 0);
+                value += getBar(point_y ? static_cast<UInt8>(std::round(((point_y.value() - min_y.value()) / diff_y) * 7) + 1) : 0);
             };
             auto getBarsForConstant = [&] (const std::optional<Float64> & point_y)
             {

From 1e4b90f3513d154e5d2fab3e3b3b9e4558c5e1ee Mon Sep 17 00:00:00 2001
From: Alexey <lehasm@gmail.com>
Date: Sun, 22 Aug 2021 19:57:59 +0000
Subject: [PATCH 012/273] Description improved First example changed, new
 example added

---
 .../statements/create/function.md             | 46 +++++++++++++------
 docs/en/sql-reference/statements/drop.md      |  7 +--
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/docs/en/sql-reference/statements/create/function.md b/docs/en/sql-reference/statements/create/function.md
index c48535c44d3..8de7e23cfb1 100644
--- a/docs/en/sql-reference/statements/create/function.md
+++ b/docs/en/sql-reference/statements/create/function.md
@@ -5,38 +5,54 @@ toc_title: FUNCTION
 
 # CREATE FUNCTION {#create-function}
 
-Creates a user defined function from a lambda expression.
+Creates a user defined function from a lambda expression. The expression must consist of function parameters, constants, operators or other function calls.
 
 **Syntax**
 
 ```sql
-CREATE FUNCTION {function_name} as ({parameters}) -> {function core}
+CREATE FUNCTION name AS (parameter0, ...) -> expression
 ```
+A function can have an arbitrary number of parameters.
+There are a few restrictions.
 
-Errors are caused by
+-   The name of a function must be unique among user defined and system functions.
+-   Recursive functions are not allowed.
+-   All variables used by a function must be specified in its parameter list.
 
--   Creating a function with a name that already exists;
--   Recursive function.
--   An identifier not listed in function parameters is used inside a function.
+If any restriction is violated then an exception is raised.
 
 **Example**
 
-
 Query:
 
 ```sql
-CREATE FUNCTION plus_one as (a) -> a + 1;
-SELECT number, plus_one(number) FROM numbers(3);
+CREATE FUNCTION linear_equation AS (x, k, b) -> k*x + b;
+SELECT number, linear_equation(number, 2, 1) FROM numbers(3);
 ```
 
 Result:
 
 ``` text
-┌─number─┬─plus_one─┐
-│      0 │        1 │
-│      1 │        2 │
-│      2 │        3 │
-└────────┴──────────┘
+┌─number─┬─linear_equation(number, 2, 1)─┐
+│      0 │                             1 │
+│      1 │                             3 │
+│      2 │                             5 │
+└────────┴───────────────────────────────┘
 ```
 
--   [DROP](../../../sql-reference/statements/drop.md#drop-function)
+A [conditional function](../../../sql-reference/functions/conditional-functions.md) is called in a user defined function in the following query:
+
+```sql
+CREATE FUNCTION parity AS (n) -> if(number % 2, 'odd', 'even');
+SELECT number, parity(number) FROM numbers(3);
+```
+
+Result:
+
+``` text
+┌─number─┬─parity(number)─┐
+│      0 │ even           │
+│      1 │ odd            │
+│      2 │ even           │
+└────────┴────────────────┘
+```
diff --git a/docs/en/sql-reference/statements/drop.md b/docs/en/sql-reference/statements/drop.md
index 4919c00a3dc..552a7b5f1a9 100644
--- a/docs/en/sql-reference/statements/drop.md
+++ b/docs/en/sql-reference/statements/drop.md
@@ -111,9 +111,6 @@ DROP FUNCTION [IF EXISTS] function_name
 **Example**
 
 ``` sql
-CREATE FUNCTION plus_one as (a) -> a + 1;
-DROP FUNCTION plus_one;
+CREATE FUNCTION linear_equation AS (x, k, b) -> k*x + b;
+DROP FUNCTION linear_equation;
 ```
-
-
-

From 7ba2e9df3e71dbde916a9a4f5d1e27a02a85dd06 Mon Sep 17 00:00:00 2001
From: lehasm <lehasm@gmail.com>
Date: Mon, 23 Aug 2021 22:29:18 +0300
Subject: [PATCH 013/273] Update
 docs/en/sql-reference/statements/create/function.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
---
 docs/en/sql-reference/statements/create/function.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/statements/create/function.md b/docs/en/sql-reference/statements/create/function.md
index 8de7e23cfb1..3ba52aa7bd4 100644
--- a/docs/en/sql-reference/statements/create/function.md
+++ b/docs/en/sql-reference/statements/create/function.md
@@ -13,7 +13,7 @@ Creates a user defined function from a lambda expression. The expression must co
 CREATE FUNCTION name AS (parameter0, ...) -> expression
 ```
 A function can have an arbitrary number of parameters.
-There are a few restrictions.
+There are a few restrictions:
 
 -   The name of a function must be unique among user defined and system functions.
 -   Recursive functions are not allowed.

From 79c3b35c6e547e7571392d4bd1580dbfe6af2f2f Mon Sep 17 00:00:00 2001
From: lehasm <lehasm@gmail.com>
Date: Mon, 23 Aug 2021 22:29:38 +0300
Subject: [PATCH 014/273] Update
 docs/en/sql-reference/statements/create/function.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
---
 docs/en/sql-reference/statements/create/function.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/statements/create/function.md b/docs/en/sql-reference/statements/create/function.md
index 3ba52aa7bd4..47f9a20e7de 100644
--- a/docs/en/sql-reference/statements/create/function.md
+++ b/docs/en/sql-reference/statements/create/function.md
@@ -5,7 +5,7 @@ toc_title: FUNCTION
 
 # CREATE FUNCTION {#create-function}
 
-Creates a user defined function from a lambda expression. The expression must consist of function parameters, constants, operators or other function calls.
+Creates a user defined function from a lambda expression. The expression must consist of function parameters, constants, operators, or other function calls.
 
 **Syntax**
 

From 65e006a11941022cd9706f35821121ef5811f452 Mon Sep 17 00:00:00 2001
From: Evgeniia Sudarikova <evgsudarikova@yandex-team.ru>
Date: Tue, 24 Aug 2021 11:58:59 +0300
Subject: [PATCH 015/273] edited EN

---
 docs/en/operations/clickhouse-keeper.md | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/docs/en/operations/clickhouse-keeper.md b/docs/en/operations/clickhouse-keeper.md
index 389cf2361f8..3ab94bb62f8 100644
--- a/docs/en/operations/clickhouse-keeper.md
+++ b/docs/en/operations/clickhouse-keeper.md
@@ -3,18 +3,18 @@ toc_priority: 66
 toc_title: ClickHouse Keeper
 ---
 
-# [pre-production] clickhouse-keeper
+# Clickhouse-keeper
 
 ClickHouse server use [ZooKeeper](https://zookeeper.apache.org/) coordination system for data [replication](../engines/table-engines/mergetree-family/replication.md) and [distributed DDL](../sql-reference/distributed-ddl.md) queries execution. ClickHouse Keeper is an alternative coordination system compatible with ZooKeeper.
 
 !!! warning "Warning"
-    This feature currently in pre-production stage. We test it in our CI and on small internal installations.
+    This feature is currently in the pre-production stage. We test it in our CI and on small internal installations.
 
 ## Implementation details
 
 ZooKeeper is one of the first well-known open-source coordination systems. It's implemented in Java, has quite a simple and powerful data model. ZooKeeper's coordination algorithm called ZAB (ZooKeeper Atomic Broadcast) doesn't provide linearizability guarantees for reads, because each ZooKeeper node serves reads locally. Unlike ZooKeeper `clickhouse-keeper` written in C++ and use [RAFT algorithm](https://raft.github.io/) [implementation](https://github.com/eBay/NuRaft). This algorithm allows to have linearizability for reads and writes, has several open-source implementations in different languages.
 
-By default, `clickhouse-keeper` provides the same guarantees as ZooKeeper (linearizable writes, non-linearizable reads). It has a compatible client-server protocol, so any standard ZooKeeper client can be used to interact with `clickhouse-keeper`. Snapshots and logs have an incompatible format with ZooKeeper, but `clickhouse-keeper-converter` tool allows to convert ZooKeeper data to `clickhouse-keeper` snapshot. Interserver protocol in `clickhouse-keeper` also incompatible with ZooKeeper so mixed ZooKeeper/clickhouse-keeper cluster is impossible.
+By default, `clickhouse-keeper` provides the same guarantees as ZooKeeper (linearizable writes, non-linearizable reads). It has a compatible client-server protocol, so any standard ZooKeeper client can be used to interact with `clickhouse-keeper`. Snapshots and logs have an incompatible format with ZooKeeper, but `clickhouse-keeper-converter` tool allows to convert ZooKeeper data to `clickhouse-keeper` snapshot. Interserver protocol in `clickhouse-keeper`is also incompatible with ZooKeeper so mixed ZooKeeper/clickhouse-keeper cluster is impossible.
 
 ## Configuration
 
@@ -26,7 +26,7 @@ By default, `clickhouse-keeper` provides the same guarantees as ZooKeeper (linea
 -    `log_storage_path` — path to coordination logs, better to store logs on the non-busy device (same for ZooKeeper)
 -    `snapshot_storage_path` — path to coordination snapshots
 
-Other common parameters are inherited from clickhouse-server config (`listen_host`, `logger` and so on).
+Other common parameters are inherited from clickhouse-server config (`listen_host`, `logger`, and so on).
 
 Internal coordination settings are located in `<keeper_server>.<coordination_settings>` section:
 
@@ -54,7 +54,7 @@ Quorum configuration is located in `<keeper_server>.<raft_configuration>` sectio
 
 -    `id` — server_id in quorum
 -    `hostname` — hostname where this server placed
--    `port` — port where this server listen for connections
+-    `port` — port where this server listens for connections
 
 
 Examples of configuration for quorum with three nodes can be found in [integration tests](https://github.com/ClickHouse/ClickHouse/tree/master/tests/integration) with `test_keeper_` prefix. Example configuration for server #1:
@@ -106,13 +106,14 @@ Seamlessly migration from ZooKeeper to `clickhouse-keeper` is impossible you hav
 
 1. Stop all ZooKeeper nodes.
 
-2. [optional, but recommended] Found ZooKeeper leader node, start and stop it again. It will force ZooKeeper to create consistent snapshot.
+2. [optional, but recommended] Found ZooKeeper leader node, start and stop it again. It will force ZooKeeper to create a consistent snapshot.
 
-3. Run `clickhouse-keeper-converter` on leader, example
+3. Run `clickhouse-keeper-converter` on a leader, for example:
 
 ```bash
 clickhouse-keeper-converter --zookeeper-logs-dir /var/lib/zookeeper/version-2 --zookeeper-snapshots-dir /var/lib/zookeeper/version-2 --output-dir /path/to/clickhouse/keeper/snapshots
 ```
 
-4. Copy snapshot to `clickhouse-server` nodes with configured `keeper` or start `clickhouse-keeper` instead of ZooKeeper. Snapshot must persist on all nodes, otherwise empty nodes can be faster and one of them can becamse leader.
+4. Copy snapshot to `clickhouse-server` nodes with configured `keeper` or start `clickhouse-keeper` instead of ZooKeeper. The snapshot must persist on all nodes, otherwise, empty nodes can be faster and one of them can become leader.
 
+[Original article](https://clickhouse.tech/docs/en/operations/clickhouse-keeper/) <!--hide-->
\ No newline at end of file

From f85e2e027c0a62223bd132c45ed5d76e60a55c5e Mon Sep 17 00:00:00 2001
From: Mike Kot <to@myrrc.dev>
Date: Tue, 24 Aug 2021 14:57:49 +0200
Subject: [PATCH 016/273] Optional semantics for [Detached]MergeTreePartInfo

---
 src/IO/ReadBufferFromString.h                |   7 +-
 src/Storages/MergeTree/MergeTreeData.cpp     |  70 +++++----
 src/Storages/MergeTree/MergeTreePartInfo.cpp | 146 +++++++++++--------
 src/Storages/MergeTree/MergeTreePartInfo.h   |  23 ++-
 src/Storages/StorageReplicatedMergeTree.cpp  |  28 ++--
 5 files changed, 165 insertions(+), 109 deletions(-)

diff --git a/src/IO/ReadBufferFromString.h b/src/IO/ReadBufferFromString.h
index fac1b230a2c..1f8319d9a33 100644
--- a/src/IO/ReadBufferFromString.h
+++ b/src/IO/ReadBufferFromString.h
@@ -2,18 +2,17 @@
 
 #include <IO/ReadBufferFromMemory.h>
 
-
 namespace DB
 {
 
-/** Allows to read from std::string-like object.
-  */
+/// Allows to read from std::string-like object.
 class ReadBufferFromString : public ReadBufferFromMemory
 {
 public:
     /// std::string or something similar
     template <typename S>
     ReadBufferFromString(const S & s) : ReadBufferFromMemory(s.data(), s.size()) {}
-};
 
+    explicit ReadBufferFromString(std::string_view s) : ReadBufferFromMemory(s.data(), s.size()) {}
+};
 }
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index 764f5d7adf7..d461d55d161 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -884,6 +884,7 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
     {
         /// Check extra parts at different disks, in order to not allow to miss data parts at undefined disks.
         std::unordered_set<String> defined_disk_names;
+
         for (const auto & disk_ptr : disks)
             defined_disk_names.insert(disk_ptr->getName());
 
@@ -893,9 +894,10 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
             {
                 for (const auto it = disk->iterateDirectory(relative_data_path); it->isValid(); it->next())
                 {
-                    MergeTreePartInfo part_info;
-                    if (MergeTreePartInfo::tryParsePartName(it->name(), &part_info, format_version))
-                        throw Exception("Part " + backQuote(it->name()) + " was found on disk " + backQuote(disk_name) + " which is not defined in the storage policy", ErrorCodes::UNKNOWN_DISK);
+                    if (MergeTreePartInfo::tryParsePartName(it->name(), format_version))
+                        throw Exception(ErrorCodes::UNKNOWN_DISK, 
+                            "Part {} was found on disk {} which is not defined in the storage policy",
+                            backQuote(it->name()), backQuote(disk_name));
                 }
             }
         }
@@ -906,10 +908,13 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
     for (auto disk_it = disks.rbegin(); disk_it != disks.rend(); ++disk_it)
     {
         auto disk_ptr = *disk_it;
+
         for (auto it = disk_ptr->iterateDirectory(relative_data_path); it->isValid(); it->next())
         {
             /// Skip temporary directories, file 'format_version.txt' and directory 'detached'.
-            if (startsWith(it->name(), "tmp") || it->name() == MergeTreeData::FORMAT_VERSION_FILE_NAME || it->name() == MergeTreeData::DETACHED_DIR_NAME)
+            if (startsWith(it->name(), "tmp")
+                || it->name() == MergeTreeData::FORMAT_VERSION_FILE_NAME
+                || it->name() == MergeTreeData::DETACHED_DIR_NAME)
                 continue;
 
             if (!startsWith(it->name(), MergeTreeWriteAheadLog::WAL_FILE_NAME))
@@ -956,25 +961,34 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
     {
         pool.scheduleOrThrowOnError([&]
         {
-            const auto & part_name = part_names_with_disk.first;
-            const auto part_disk_ptr = part_names_with_disk.second;
+            const auto & [part_name, part_disk_ptr] = part_names_with_disk;
 
-            MergeTreePartInfo part_info;
-            if (!MergeTreePartInfo::tryParsePartName(part_name, &part_info, format_version))
+            auto part_opt = MergeTreePartInfo::tryParsePartName(part_name, format_version);
+
+            if (!part_opt)
                 return;
 
             auto single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + part_name, part_disk_ptr, 0);
-            auto part = createPart(part_name, part_info, single_disk_volume, part_name);
+            auto part = createPart(part_name, *part_opt, single_disk_volume, part_name);
             bool broken = false;
 
             String part_path = fs::path(relative_data_path) / part_name;
             String marker_path = fs::path(part_path) / IMergeTreeDataPart::DELETE_ON_DESTROY_MARKER_FILE_NAME;
+
             if (part_disk_ptr->exists(marker_path))
             {
-                LOG_WARNING(log, "Detaching stale part {}{}, which should have been deleted after a move. That can only happen after unclean restart of ClickHouse after move of a part having an operation blocking that stale copy of part.", getFullPathOnDisk(part_disk_ptr), part_name);
+                LOG_WARNING(log,
+                    "Detaching stale part {}{}, which should have been deleted after a move. That can only happen "
+                    "after unclean restart of ClickHouse after move of a part having an operation blocking that "
+                    "stale copy of part.",
+                    getFullPathOnDisk(part_disk_ptr), part_name);
+
                 std::lock_guard loading_lock(mutex);
+
                 broken_parts_to_detach.push_back(part);
+
                 ++suspicious_broken_parts;
+
                 return;
             }
 
@@ -1002,25 +1016,34 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
             /// Ignore broken parts that can appear as a result of hard server restart.
             if (broken)
             {
-                LOG_ERROR(log, "Detaching broken part {}{}. If it happened after update, it is likely because of backward incompability. You need to resolve this manually", getFullPathOnDisk(part_disk_ptr), part_name);
+                LOG_ERROR(log,
+                    "Detaching broken part {}{}. If it happened after update, it is likely because of backward "
+                    "incompatibility. You need to resolve this manually",
+                    getFullPathOnDisk(part_disk_ptr), part_name);
+
                 std::lock_guard loading_lock(mutex);
+
                 broken_parts_to_detach.push_back(part);
+
                 ++suspicious_broken_parts;
 
                 return;
             }
+
             if (!part->index_granularity_info.is_adaptive)
                 has_non_adaptive_parts.store(true, std::memory_order_relaxed);
             else
                 has_adaptive_parts.store(true, std::memory_order_relaxed);
 
             part->modification_time = part_disk_ptr->getLastModified(fs::path(relative_data_path) / part_name).epochTime();
+
             /// Assume that all parts are Committed, covered parts will be detected and marked as Outdated later
             part->setState(DataPartState::Committed);
 
             std::lock_guard loading_lock(mutex);
+
             if (!data_parts_indexes.insert(part).second)
-                throw Exception("Part " + part->name + " already exists", ErrorCodes::DUPLICATE_DATA_PART);
+                throw Exception(ErrorCodes::DUPLICATE_DATA_PART, "Part {} already exists", part->name);
 
             addPartContributionToDataVolume(part);
         });
@@ -3292,11 +3315,12 @@ RestoreDataTasks MergeTreeData::restoreDataPartsFromBackup(const BackupPtr & bac
     Strings part_names = backup->list(data_path_in_backup);
     for (const String & part_name : part_names)
     {
-        MergeTreePartInfo part_info;
-        if (!MergeTreePartInfo::tryParsePartName(part_name, &part_info, format_version))
+        const auto part_info = MergeTreePartInfo::tryParsePartName(part_name, format_version);
+
+        if (!part_info)
             continue;
 
-        if (!partition_ids.empty() && !partition_ids.contains(part_info.partition_id))
+        if (!partition_ids.empty() && !partition_ids.contains(part_info->partition_id))
             continue;
 
         UInt64 total_size_of_part = 0;
@@ -3333,7 +3357,7 @@ RestoreDataTasks MergeTreeData::restoreDataPartsFromBackup(const BackupPtr & bac
             }
 
             auto single_disk_volume = std::make_shared<SingleDiskVolume>(disk->getName(), disk, 0);
-            auto part = createPart(part_name, part_info, single_disk_volume, relative_temp_part_dir);
+            auto part = createPart(part_name, *part_info, single_disk_volume, relative_temp_part_dir);
             part->loadColumnsChecksumsIndexes(false, true);
             renameTempPartAndAdd(part, increment);
         };
@@ -3545,11 +3569,8 @@ std::vector<DetachedPartInfo> MergeTreeData::getDetachedParts() const
         {
             for (auto it = disk->iterateDirectory(detached_path); it->isValid(); it->next())
             {
-                res.emplace_back();
-                auto & part = res.back();
-
-                DetachedPartInfo::tryParseDetachedPartName(it->name(), part, format_version);
-                part.disk = disk->getName();
+                auto res_it = res.emplace_back(DetachedPartInfo::parseDetachedPartName(it->name(), format_version));
+                res_it.disk = disk->getName();
             }
         }
     }
@@ -3620,7 +3641,7 @@ MergeTreeData::MutableDataPartsVector MergeTreeData::tryLoadPartsToAttach(const
         validateDetachedPartName(part_id);
         renamed_parts.addPart(part_id, "attaching_" + part_id);
 
-        if (MergeTreePartInfo::tryParsePartName(part_id, nullptr, format_version))
+        if (MergeTreePartInfo::tryParsePartName(part_id, format_version))
             name_to_disk[part_id] = getDiskForPart(part_id, source_dir);
     }
     else
@@ -3636,12 +3657,11 @@ MergeTreeData::MutableDataPartsVector MergeTreeData::tryLoadPartsToAttach(const
             for (auto it = disk->iterateDirectory(relative_data_path + source_dir); it->isValid(); it->next())
             {
                 const String & name = it->name();
-                MergeTreePartInfo part_info;
 
                 // TODO what if name contains "_tryN" suffix?
                 /// Parts with prefix in name (e.g. attaching_1_3_3_0, deleting_1_3_3_0) will be ignored
-                if (!MergeTreePartInfo::tryParsePartName(name, &part_info, format_version)
-                    || part_info.partition_id != partition_id)
+                if (auto part_opt = MergeTreePartInfo::tryParsePartName(name, format_version);
+                    !part_opt || part_opt->partition_id != partition_id)
                 {
                     continue;
                 }
diff --git a/src/Storages/MergeTree/MergeTreePartInfo.cpp b/src/Storages/MergeTree/MergeTreePartInfo.cpp
index 6a98e666c34..39337fbd4c3 100644
--- a/src/Storages/MergeTree/MergeTreePartInfo.cpp
+++ b/src/Storages/MergeTree/MergeTreePartInfo.cpp
@@ -15,13 +15,12 @@ namespace ErrorCodes
 
 MergeTreePartInfo MergeTreePartInfo::fromPartName(const String & part_name, MergeTreeDataFormatVersion format_version)
 {
-    MergeTreePartInfo part_info;
-    if (!tryParsePartName(part_name, &part_info, format_version))
-        throw Exception("Unexpected part name: " + part_name, ErrorCodes::BAD_DATA_PART_NAME);
-    return part_info;
+    if (auto part_opt = tryParsePartName(part_name, format_version); !part_opt)
+        throw Exception(ErrorCodes::BAD_DATA_PART_NAME, "Unexpected part name: {}", part_name);
+    else
+        return *part_opt;
 }
 
-
 void MergeTreePartInfo::validatePartitionID(const String & partition_id, MergeTreeDataFormatVersion format_version)
 {
     if (partition_id.empty())
@@ -43,22 +42,26 @@ void MergeTreePartInfo::validatePartitionID(const String & partition_id, MergeTr
 
 }
 
-bool MergeTreePartInfo::tryParsePartName(const String & part_name, MergeTreePartInfo * part_info, MergeTreeDataFormatVersion format_version)
+std::optional<MergeTreePartInfo> MergeTreePartInfo::tryParsePartName(
+    std::string_view part_name, MergeTreeDataFormatVersion format_version)
 {
     ReadBufferFromString in(part_name);
 
     String partition_id;
+
     if (format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
     {
         UInt32 min_yyyymmdd = 0;
         UInt32 max_yyyymmdd = 0;
+
         if (!tryReadIntText(min_yyyymmdd, in)
             || !checkChar('_', in)
             || !tryReadIntText(max_yyyymmdd, in)
             || !checkChar('_', in))
         {
-            return false;
+            return std::nullopt;
         }
+
         partition_id = toString(min_yyyymmdd / 100);
     }
     else
@@ -76,9 +79,7 @@ bool MergeTreePartInfo::tryParsePartName(const String & part_name, MergeTreePart
 
     /// Sanity check
     if (partition_id.empty())
-    {
-        return false;
-    }
+        return std::nullopt;
 
     Int64 min_block_num = 0;
     Int64 max_block_num = 0;
@@ -91,14 +92,12 @@ bool MergeTreePartInfo::tryParsePartName(const String & part_name, MergeTreePart
         || !checkChar('_', in)
         || !tryReadIntText(level, in))
     {
-        return false;
+        return std::nullopt;
     }
 
     /// Sanity check
     if (min_block_num > max_block_num)
-    {
-        return false;
-    }
+        return std::nullopt;
 
     if (!in.eof())
     {
@@ -106,29 +105,30 @@ bool MergeTreePartInfo::tryParsePartName(const String & part_name, MergeTreePart
             || !tryReadIntText(mutation, in)
             || !in.eof())
         {
-            return false;
+            return std::nullopt;
         }
     }
 
-    if (part_info)
+    MergeTreePartInfo part_info;
+
+    part_info.partition_id = std::move(partition_id);
+    part_info.min_block = min_block_num;
+    part_info.max_block = max_block_num;
+
+    if (level == LEGACY_MAX_LEVEL)
     {
-        part_info->partition_id = std::move(partition_id);
-        part_info->min_block = min_block_num;
-        part_info->max_block = max_block_num;
-        if (level == LEGACY_MAX_LEVEL)
-        {
-            /// We (accidentally) had two different max levels until 21.6 and it might cause logical errors like
-            /// "Part 20170601_20170630_0_2_999999999 intersects 201706_0_1_4294967295".
-            /// So we replace unexpected max level to make contains(...) method and comparison operators work
-            /// correctly with such virtual parts. On part name serialization we will use legacy max level to keep the name unchanged.
-            part_info->use_leagcy_max_level = true;
-            level = MAX_LEVEL;
-        }
-        part_info->level = level;
-        part_info->mutation = mutation;
+        /// We (accidentally) had two different max levels until 21.6 and it might cause logical errors like
+        /// "Part 20170601_20170630_0_2_999999999 intersects 201706_0_1_4294967295".
+        /// So we replace unexpected max level to make contains(...) method and comparison operators work
+        /// correctly with such virtual parts. On part name serialization we will use legacy max level to keep the name unchanged.
+        part_info.use_leagcy_max_level = true;
+        level = MAX_LEVEL;
     }
 
-    return true;
+    part_info.level = level;
+    part_info.mutation = mutation;
+
+    return part_info;
 }
 
 
@@ -235,55 +235,75 @@ String MergeTreePartInfo::getPartNameV0(DayNum left_date, DayNum right_date) con
     return wb.str();
 }
 
-
-const std::vector<String> DetachedPartInfo::DETACH_REASONS =
-    {
-        "broken",
-        "unexpected",
-        "noquorum",
-        "ignored",
-        "broken-on-start",
-        "clone",
-        "attaching",
-        "deleting",
-        "tmp-fetch",
-    };
-
-bool DetachedPartInfo::tryParseDetachedPartName(const String & dir_name, DetachedPartInfo & part_info,
-                                                MergeTreeDataFormatVersion format_version)
+DetachedPartInfo DetachedPartInfo::parseDetachedPartName(
+    std::string_view dir_name, MergeTreeDataFormatVersion format_version)
 {
+    DetachedPartInfo part_info;
+
     part_info.dir_name = dir_name;
 
-    /// First, try to find known prefix and parse dir_name as <prefix>_<partname>.
+    /// First, try to find known prefix and parse dir_name as <prefix>_<part_name>.
     /// Arbitrary strings are not allowed for partition_id, so known_prefix cannot be confused with partition_id.
-    for (const auto & known_prefix : DETACH_REASONS)
+    for (std::string_view known_prefix : DETACH_REASONS)
     {
-        if (dir_name.starts_with(known_prefix) && known_prefix.size() < dir_name.size() && dir_name[known_prefix.size()] == '_')
+        if (dir_name.starts_with(known_prefix)
+            && known_prefix.size() < dir_name.size()
+            && dir_name[known_prefix.size()] == '_')
         {
             part_info.prefix = known_prefix;
-            String part_name = dir_name.substr(known_prefix.size() + 1);
-            bool parsed = MergeTreePartInfo::tryParsePartName(part_name, &part_info, format_version);
-            return part_info.valid_name = parsed;
+
+            const std::string_view part_name = dir_name.substr(known_prefix.size() + 1);
+
+            if (auto part_opt = MergeTreePartInfo::tryParsePartName(part_name, format_version))
+            {
+                part_info.valid_name = true;
+                part_info.addParsedPartInfo(*part_opt);
+            }
+            else
+                part_info.valid_name = false;
+
+            return part_info;
         }
     }
 
     /// Next, try to parse dir_name as <part_name>.
-    if (MergeTreePartInfo::tryParsePartName(dir_name, &part_info, format_version))
-        return part_info.valid_name = true;
+    if (auto part_opt = MergeTreePartInfo::tryParsePartName(dir_name, format_version))
+    {
+        part_info.valid_name = true;
+        part_info.addParsedPartInfo(*part_opt);
+        return part_info;
+    }
 
     /// Next, as <prefix>_<partname>. Use entire name as prefix if it fails.
     part_info.prefix = dir_name;
-    const auto first_separator = dir_name.find_first_of('_');
+
+    const size_t first_separator = dir_name.find_first_of('_');
+
     if (first_separator == String::npos)
-        return part_info.valid_name = false;
+    {
+        part_info.valid_name = false;
+        return part_info;
+    }
 
-    const auto part_name = dir_name.substr(first_separator + 1,
-                                           dir_name.size() - first_separator - 1);
-    if (!MergeTreePartInfo::tryParsePartName(part_name, &part_info, format_version))
-        return part_info.valid_name = false;
+    const std::string_view part_name = dir_name.substr(
+        first_separator + 1,
+        dir_name.size() - first_separator - 1);
 
-    part_info.prefix = dir_name.substr(0, first_separator);
-    return part_info.valid_name = true;
+    if (auto part_opt = MergeTreePartInfo::tryParsePartName(part_name, format_version))
+    {
+        part_info.valid_name = true;
+        part_info.prefix = dir_name.substr(0, first_separator);
+        part_info.addParsedPartInfo(*part_opt);
+    }
+    else
+        part_info.valid_name = false;
+
+    return part_info;
 }
 
+void DetachedPartInfo::addParsedPartInfo(const MergeTreePartInfo& part)
+{
+    // Both class are aggregates so it's ok.
+    static_cast<MergeTreePartInfo &>(*this) = part;
+}
 }
diff --git a/src/Storages/MergeTree/MergeTreePartInfo.h b/src/Storages/MergeTree/MergeTreePartInfo.h
index 181fef7990c..58707b4dca3 100644
--- a/src/Storages/MergeTree/MergeTreePartInfo.h
+++ b/src/Storages/MergeTree/MergeTreePartInfo.h
@@ -1,8 +1,10 @@
 #pragma once
 
 #include <limits>
+#include <optional>
 #include <tuple>
 #include <vector>
+#include <array>
 #include <common/types.h>
 #include <common/DayNum.h>
 #include <Storages/MergeTree/MergeTreeDataFormatVersion.h>
@@ -98,7 +100,8 @@ struct MergeTreePartInfo
 
     static MergeTreePartInfo fromPartName(const String & part_name, MergeTreeDataFormatVersion format_version);  // -V1071
 
-    static bool tryParsePartName(const String & part_name, MergeTreePartInfo * part_info, MergeTreeDataFormatVersion format_version);
+    static std::optional<MergeTreePartInfo> tryParsePartName(
+        std::string_view part_name, MergeTreeDataFormatVersion format_version);
 
     static void parseMinMaxDatesFromPartName(const String & part_name, DayNum & min_date, DayNum & max_date);
 
@@ -122,11 +125,23 @@ struct DetachedPartInfo : public MergeTreePartInfo
     /// If false, MergeTreePartInfo is in invalid state (directory name was not successfully parsed).
     bool valid_name;
 
-    static const std::vector<String> DETACH_REASONS;
+    static constexpr auto DETACH_REASONS = std::to_array<std::string_view>({  
+        "broken", "unexpected", "noquorum",
+        "ignored", "broken-on-start", "clone",
+        "attaching", "deleting", "tmp-fetch"
+    });
 
     /// NOTE: It may parse part info incorrectly.
-    /// For example, if prefix contain '_' or if DETACH_REASONS doesn't contain prefix.
-    static bool tryParseDetachedPartName(const String & dir_name, DetachedPartInfo & part_info, MergeTreeDataFormatVersion format_version);
+    /// For example, if prefix contains '_' or if DETACH_REASONS doesn't contain prefix.
+    // This method has different semantics with MergeTreePartInfo::tryParsePartName as
+    // the former is used for (1) verifying that a part can be parsed without using the result and (2) parsing part
+    // for later usage.
+    // Detached parts are always parsed regardless of their validity (valid_name is used to check that), so we do not
+    // need an std::optional
+    static DetachedPartInfo parseDetachedPartName(std::string_view dir_name, MergeTreeDataFormatVersion format_version);
+
+private:
+    void addParsedPartInfo(const MergeTreePartInfo& part);
 };
 
 using DetachedPartsInfo = std::vector<DetachedPartInfo>;
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index 3bdba5d1b35..27abc894354 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -1163,10 +1163,8 @@ void StorageReplicatedMergeTree::checkParts(bool skip_sanity_checks)
     const UInt64 parts_to_fetch_blocks = std::accumulate(parts_to_fetch.cbegin(), parts_to_fetch.cend(), 0,
         [&](UInt64 acc, const String& part_name)
         {
-            MergeTreePartInfo part_info;
-
-            if (MergeTreePartInfo::tryParsePartName(part_name, &part_info, format_version))
-                return acc + part_info.getBlocksCount();
+            if (const auto part_info = MergeTreePartInfo::tryParsePartName(part_name, format_version))
+                return acc + part_info->getBlocksCount();
 
             LOG_ERROR(log, "Unexpected part name: {}", part_name);
             return acc;
@@ -1456,13 +1454,12 @@ MergeTreeData::MutableDataPartPtr StorageReplicatedMergeTree::attachPartHelperFo
     for (const DiskPtr & disk : getStoragePolicy()->getDisks())
         for (const auto it = disk->iterateDirectory(fs::path(relative_data_path) / "detached/"); it->isValid(); it->next())
         {
-            MergeTreePartInfo part_info;
+            const auto part_info = MergeTreePartInfo::tryParsePartName(it->name(), format_version);
 
-            if (!MergeTreePartInfo::tryParsePartName(it->name(), &part_info, format_version) ||
-                part_info.partition_id != actual_part_info.partition_id)
+            if (!part_info || part_info->partition_id != actual_part_info.partition_id)
                 continue;
 
-            const String part_old_name = part_info.getPartName();
+            const String part_old_name = part_info->getPartName();
             const String part_path = fs::path("detached") / part_old_name;
 
             const VolumePtr volume = std::make_shared<SingleDiskVolume>("volume_" + part_old_name, disk);
@@ -6328,6 +6325,7 @@ void StorageReplicatedMergeTree::getClearBlocksInPartitionOps(
 
     String partition_prefix = partition_id + "_";
     zkutil::AsyncResponses<Coordination::GetResponse> get_futures;
+
     for (const String & block_id : blocks)
     {
         if (startsWith(block_id, partition_prefix))
@@ -6346,9 +6344,10 @@ void StorageReplicatedMergeTree::getClearBlocksInPartitionOps(
             continue;
 
         ReadBufferFromString buf(result.data);
-        MergeTreePartInfo part_info;
-        bool parsed = MergeTreePartInfo::tryParsePartName(result.data, &part_info, format_version);
-        if (!parsed || (min_block_num <= part_info.min_block && part_info.max_block <= max_block_num))
+
+        const auto part_info = MergeTreePartInfo::tryParsePartName(result.data, format_version);
+
+        if (!part_info || (min_block_num <= part_info->min_block && part_info->max_block <= max_block_num))
             ops.emplace_back(zkutil::makeRemoveRequest(path, -1));
     }
 }
@@ -7441,12 +7440,15 @@ bool StorageReplicatedMergeTree::checkIfDetachedPartExists(const String & part_n
 bool StorageReplicatedMergeTree::checkIfDetachedPartitionExists(const String & partition_name)
 {
     fs::directory_iterator dir_end;
+
     for (const std::string & path : getDataPaths())
     {
         for (fs::directory_iterator dir_it{fs::path(path) / "detached/"}; dir_it != dir_end; ++dir_it)
         {
-            MergeTreePartInfo part_info;
-            if (MergeTreePartInfo::tryParsePartName(dir_it->path().filename(), &part_info, format_version) && part_info.partition_id == partition_name)
+            const String file_name = dir_it->path().filename().string();
+            auto part_info = MergeTreePartInfo::tryParsePartName(file_name, format_version);
+
+            if (part_info && part_info->partition_id == partition_name)
                 return true;
         }
     }

From 0f43c91d756450aafa0c87df58f3e54bb1644c95 Mon Sep 17 00:00:00 2001
From: Evgeniia Sudarikova <evgsudarikova@yandex-team.ru>
Date: Wed, 25 Aug 2021 10:15:10 +0300
Subject: [PATCH 017/273] add RU, edit EN a bit

---
 docs/en/operations/clickhouse-keeper.md |   8 +-
 docs/ru/operations/clickhouse-keeper.md | 119 ++++++++++++++++++++++++
 2 files changed, 123 insertions(+), 4 deletions(-)
 create mode 100644 docs/ru/operations/clickhouse-keeper.md

diff --git a/docs/en/operations/clickhouse-keeper.md b/docs/en/operations/clickhouse-keeper.md
index 3ab94bb62f8..65ad04a93d5 100644
--- a/docs/en/operations/clickhouse-keeper.md
+++ b/docs/en/operations/clickhouse-keeper.md
@@ -18,7 +18,7 @@ By default, `clickhouse-keeper` provides the same guarantees as ZooKeeper (linea
 
 ## Configuration
 
-`clickhouse-keeper` can be used as a standalone replacement for ZooKeeper or as an internal part of the `clickhouse-server`, but in both cases configuration is almost the same `.xml` file. The main `clickhouse-keeper` configuration tag is `<keeper_server>`. Keeper configuration has the following parameters:
+`clickhouse-keeper` can be used as a standalone replacement for ZooKeeper or as an internal part of the ClickHouse Server, but in both cases configuration is almost the same `.xml` file. The main `clickhouse-keeper` configuration tag is `<keeper_server>`. Keeper configuration has the following parameters:
 
 -    `tcp_port` — the port for a client to connect (default for ZooKeeper is `2181`)
 -    `tcp_port_secure` — the secure port for a client to connect
@@ -94,7 +94,7 @@ Examples of configuration for quorum with three nodes can be found in [integrati
 
 ## How to run
 
-`clickhouse-keeper` is bundled into `clickhouse-server` package, just add configuration of `<keeper_server>` and start clickhouse-server as always. If you want to run standalone `clickhouse-keeper` you can start it in a similar way with:
+`clickhouse-keeper` is bundled into `clickhouse-server` package, just add configuration of `<keeper_server>` and start ClickHouse Server as always. If you want to run standalone `clickhouse-keeper` you can start it in a similar way with:
 
 ```bash
 clickhouse-keeper --config /etc/your_path_to_config/config.xml --daemon
@@ -106,7 +106,7 @@ Seamlessly migration from ZooKeeper to `clickhouse-keeper` is impossible you hav
 
 1. Stop all ZooKeeper nodes.
 
-2. [optional, but recommended] Found ZooKeeper leader node, start and stop it again. It will force ZooKeeper to create a consistent snapshot.
+2. Optional, but recommended: find ZooKeeper leader node, start and stop it again. It will force ZooKeeper to create a consistent snapshot.
 
 3. Run `clickhouse-keeper-converter` on a leader, for example:
 
@@ -114,6 +114,6 @@ Seamlessly migration from ZooKeeper to `clickhouse-keeper` is impossible you hav
 clickhouse-keeper-converter --zookeeper-logs-dir /var/lib/zookeeper/version-2 --zookeeper-snapshots-dir /var/lib/zookeeper/version-2 --output-dir /path/to/clickhouse/keeper/snapshots
 ```
 
-4. Copy snapshot to `clickhouse-server` nodes with configured `keeper` or start `clickhouse-keeper` instead of ZooKeeper. The snapshot must persist on all nodes, otherwise, empty nodes can be faster and one of them can become leader.
+4. Copy snapshot to ClickHouse server nodes with configured `keeper` or start `clickhouse-keeper` instead of ZooKeeper. The snapshot must persist on all nodes, otherwise, empty nodes can be faster and one of them can become leader.
 
 [Original article](https://clickhouse.tech/docs/en/operations/clickhouse-keeper/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
new file mode 100644
index 00000000000..9a3621efda0
--- /dev/null
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -0,0 +1,119 @@
+---
+toc_priority: 66
+toc_title: ClickHouse Keeper
+---
+
+# Clickhouse-keeper
+
+Сервер ClickHouse использует сервис координации [ZooKeeper](https://zookeeper.apache.org/) для [репликации](../engines/table-engines/mergetree-family/replication.md) данных и выполнения [распределенных DDL запросов](../sql-reference/distributed-ddl.md). ClickHouse Keeper — это альтернативный сервис координации, совместимый с ZooKeeper.
+
+!!! warning "Внимание"
+    Эта функция сейчас в стадии препродакшн, тестируется в непрерывной интеграции (CI) на нескольких внутренних установках.
+
+## Детали реализации
+
+ZooKeeper — один из первых широко известных сервисов координации с открытым исходным кодом: реализован на Java, имеет достаточно простую и мощную модель данных. Алгоритм координации Zookeeper называется ZAB (ZooKeeper Atomic Broadcast). Он не гарантирует линеаризуемость операций чтения, поскольку каждый узел ZooKeeper обслуживает чтения локально. В отличие от ZooKeeper, `clickhouse-keeper` реализован на C++ и использует алгоритм [RAFT](https://raft.github.io/), [реализация](https://github.com/eBay/NuRaft). Этот алгоритм обеспечивает линеаризуемость чтения и записи, имеет несколько реализаций с открытым исходным кодом на разных языках.
+
+По умолчанию `clickhouse-keeper` предоставляет те же гарантии, что и ZooKeeper (линеаризуемость записи, нелинеаризуемость чтения). У него есть совместимый протокол клиент-сервер, поэтому любой стандартный клиент ZooKeeper может использоваться для взаимодействия с `clickhouse-keeper`. Снэпшоты и журналы имеют несовместимый с ZooKeeper формат, однако можно конвертировать данные Zookeeper в снэпшот `clickhouse-keeper` с помощью `clickhouse-keeper-converter`. Межсерверный протокол `clickhouse-keeper` также несовместим с ZooKeeper, поэтому смешанный кластер ZooKeeper / clickhouse-keeper невозможен.
+
+## Конфигурация
+
+`clickhouse-keeper` может использоваться как равноценная замена ZooKeeper или как внутренняя часть сервера ClickHouse, но в обоих случаях конфигурация представлена файлом `.xml`. Главный тег конфигурации `clickhouse-keeper` — это `<keeper_server>`. Параметры конфигурации:
+
+-    `tcp_port` — порт для подключения клиента (по умолчанию для ZooKeeper: `2181`)
+-    `tcp_port_secure` — зашифрованный порт для подключения клиента
+-    `server_id` — уникальный идентификатор сервера, каждый участник кластера должен иметь уникальный номер (1, 2, 3 и т.д.)
+-    `log_storage_path` — путь к журналам координации, лучше хранить их на незанятом устройстве (актуально и для ZooKeeper)
+-    `snapshot_storage_path` — путь к снэпшотам координации
+
+Другие общие параметры наследуются из конфигурации `clickhouse server` (`listen_host`, `logger`, и т.д.)
+
+Настройки внутренней координации находятся в `<keeper_server>.<coordination_settings>`:
+
+-    `operation_timeout_ms` — интервал одной клиентской операции (по умолчанию: 10000)
+-    `session_timeout_ms` — интервал одной клиентской сессии (по умолчанию: 30000)
+-    `dead_session_check_period_ms` — как часто `clickhouse-keeper` проверяет мертвые сессии и удаляет их (по умолчанию: 500)
+-    `heart_beat_interval_ms` — как часто узел-лидер `clickhouse-keeper` отправляет сердцебиение узлам-последователям (по умолчанию: 500)
+-    `election_timeout_lower_bound_ms` — если последователь не получил сердцебиения от лидера в этом интервале, он может инициировать выборы лидера (по умолчанию: 1000)
+-    `election_timeout_upper_bound_ms` — если последователь не получил сердцебиения от лидера в этом интервале, он должен инициировать выборы лидера (по умолчанию: 2000)
+-    `rotate_log_storage_interval` — сколько записей журнала хранить в одном файле (по умолчанию: 100000)
+-    `reserved_log_items` — сколько записей журнала координации хранить перед сжатием (по умолчанию: 100000)
+-    `snapshot_distance` — как часто `clickhouse-keeper` делает новые снэпшоты (по количеству записей в журналах) (по умолчанию: 100000)
+-    `snapshots_to_keep` — сколько снэпшотов хранить (по умолчанию: 3)
+-    `stale_log_gap` — порог, после которого лидер считает последователя устаревшим и отправляет ему снэпшот вместо журналов (по умолчанию: 10000)
+-    `fresh_log_gap` - когда узел обновляется (по умолчанию: 200)
+-    `max_requests_batch_size` - максимальный размер пакета в серии запросов, прежде чем он будет отправлен в RAFT (по умолчанию: 100)
+-    `force_sync` — вызывать `fsync` при каждой записи в журнал координации (по умолчанию: true)
+-    `quorum_reads` - выполнять запросы чтения аналогично запросам записи через весь консенсус RAFT с одинаковой скоростью (по умолчанию: false)
+-    `raft_logs_level` — уровень, на котором ведется текстовый журнал координации (трассировка, отладка и т. д.) (по умолчанию: значение системы по умолчанию)
+-    `auto_forwarding` - разрешить пересылку запросов на запись от последователей лидеру (по умолчанию: true)
+-    `shutdown_timeout` — ждать завершения внутренних подключений и выключения (мс) (по умолчанию: 5000)
+-    `startup_timeout` — если сервер не подключается к другим участникам кворума в течение указанного интервала, он будет отключен (мс) (по умолчанию: 30000)
+
+Конфигурация кворума находится в `<keeper_server>.<raft_configuration>` и содержит описание серверов. Единственный параметр для всего кворума — `secure`, который разрешает зашифрованное соединение для связи между участниками кворума. Параметры для каждого `<server>`:
+
+-    `id` — идентификатор сервера в кворуме
+-    `hostname` — имя хоста, на котором размещен сервер
+-    `port` — порт, на котором серверу доступны соединения
+
+
+Примеры конфигурации кворума с тремя узлами можно найти в [интеграционных тестах](https://github.com/ClickHouse/ClickHouse/tree/master/tests/integration) с префиксом `test_keeper_`. Пример конфигурации для сервера №1:
+
+```xml
+<keeper_server>
+    <tcp_port>2181</tcp_port>
+    <server_id>1</server_id>
+    <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+    <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+    <coordination_settings>
+        <operation_timeout_ms>10000</operation_timeout_ms>
+        <session_timeout_ms>30000</session_timeout_ms>
+        <raft_logs_level>trace</raft_logs_level>
+    </coordination_settings>
+
+    <raft_configuration>
+        <server>
+            <id>1</id>
+            <hostname>zoo1</hostname>
+            <port>9444</port>
+        </server>
+        <server>
+            <id>2</id>
+            <hostname>zoo2</hostname>
+            <port>9444</port>
+        </server>
+        <server>
+            <id>3</id>
+            <hostname>zoo3</hostname>
+            <port>9444</port>
+        </server>
+    </raft_configuration>
+</keeper_server>
+```
+
+## Как запустить
+
+`clickhouse-keeper` входит в пакет сервера ClickHouse, просто добавьте кофигурацию `<keeper_server>` и запустите сервер ClickHouse как обычно. Если вы хотите запустить `clickhouse-keeper` автономно, сделайте это аналогичным способом:
+
+```bash
+clickhouse-keeper --config /etc/your_path_to_config/config.xml --daemon
+```
+
+## [экспериментально] Переход с ZooKeeper
+
+Плавный переход с ZooKeeper на `clickhouse-keeper` невозможен, необходимо остановить кластер ZooKeeper, преобразовать данные и запустить` clickhouse-keeper`. `clickhouse-keeper-converter` конвертирует журналы и снэпшоты ZooKeeper в снэпшот `clickhouse-keeper`. Это работает только для версии ZooKeeper выше 3.4. Шаги перехода:
+
+1. Остановите все узлы ZooKeeper.
+
+2. Необязательно, но рекомендуется: найдите лидер, запустите и снова остановите его. Это заставит ZooKeeper создать согласованный снэпшот.
+
+3. Запустите `clickhouse-keeper-converter` на лидере, например:
+
+```bash
+clickhouse-keeper-converter --zookeeper-logs-dir /var/lib/zookeeper/version-2 --zookeeper-snapshots-dir /var/lib/zookeeper/version-2 --output-dir /path/to/clickhouse/keeper/snapshots
+```
+
+4. Скопируйте снэпшот на узлы сервера ClickHouse с настроенным` keeper` или запустите `clickhouse-keeper` вместо ZooKeeper. Снэпшот должен сохраняться на всех узлах: в противном случае пустые узлы будут быстрее, и один из них может стать лидером.
+
+[Original article](https://clickhouse.tech/docs/en/operations/clickhouse-keeper/) <!--hide-->
\ No newline at end of file

From 61e2cb931184001e96847bf43d1c050cc5daebce Mon Sep 17 00:00:00 2001
From: Evgeniia Sudarikova <evgsudarikova@yandex-team.ru>
Date: Wed, 25 Aug 2021 10:56:09 +0300
Subject: [PATCH 018/273] minor changes

---
 docs/ru/operations/clickhouse-keeper.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index 9a3621efda0..a941154f292 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -3,7 +3,7 @@ toc_priority: 66
 toc_title: ClickHouse Keeper
 ---
 
-# Clickhouse-keeper
+# [препродакшн] Clickhouse-keeper
 
 Сервер ClickHouse использует сервис координации [ZooKeeper](https://zookeeper.apache.org/) для [репликации](../engines/table-engines/mergetree-family/replication.md) данных и выполнения [распределенных DDL запросов](../sql-reference/distributed-ddl.md). ClickHouse Keeper — это альтернативный сервис координации, совместимый с ZooKeeper.
 
@@ -22,11 +22,11 @@ ZooKeeper — один из первых широко известных сер
 
 -    `tcp_port` — порт для подключения клиента (по умолчанию для ZooKeeper: `2181`)
 -    `tcp_port_secure` — зашифрованный порт для подключения клиента
--    `server_id` — уникальный идентификатор сервера, каждый участник кластера должен иметь уникальный номер (1, 2, 3 и т.д.)
+-    `server_id` — уникальный идентификатор сервера, каждый участник кластера должен иметь уникальный номер (1, 2, 3 и т. д.)
 -    `log_storage_path` — путь к журналам координации, лучше хранить их на незанятом устройстве (актуально и для ZooKeeper)
 -    `snapshot_storage_path` — путь к снэпшотам координации
 
-Другие общие параметры наследуются из конфигурации `clickhouse server` (`listen_host`, `logger`, и т.д.)
+Другие общие параметры наследуются из конфигурации `clickhouse server` (`listen_host`, `logger`, и т. д.)
 
 Настройки внутренней координации находятся в `<keeper_server>.<coordination_settings>`:
 
@@ -102,7 +102,7 @@ clickhouse-keeper --config /etc/your_path_to_config/config.xml --daemon
 
 ## [экспериментально] Переход с ZooKeeper
 
-Плавный переход с ZooKeeper на `clickhouse-keeper` невозможен, необходимо остановить кластер ZooKeeper, преобразовать данные и запустить` clickhouse-keeper`. `clickhouse-keeper-converter` конвертирует журналы и снэпшоты ZooKeeper в снэпшот `clickhouse-keeper`. Это работает только для версии ZooKeeper выше 3.4. Шаги перехода:
+Плавный переход с ZooKeeper на `clickhouse-keeper` невозможен, необходимо остановить кластер ZooKeeper, преобразовать данные и запустить `clickhouse-keeper`. `clickhouse-keeper-converter` конвертирует журналы и снэпшоты ZooKeeper в снэпшот `clickhouse-keeper`. Это работает только для версии ZooKeeper выше 3.4. Шаги перехода:
 
 1. Остановите все узлы ZooKeeper.
 
@@ -114,6 +114,6 @@ clickhouse-keeper --config /etc/your_path_to_config/config.xml --daemon
 clickhouse-keeper-converter --zookeeper-logs-dir /var/lib/zookeeper/version-2 --zookeeper-snapshots-dir /var/lib/zookeeper/version-2 --output-dir /path/to/clickhouse/keeper/snapshots
 ```
 
-4. Скопируйте снэпшот на узлы сервера ClickHouse с настроенным` keeper` или запустите `clickhouse-keeper` вместо ZooKeeper. Снэпшот должен сохраняться на всех узлах: в противном случае пустые узлы будут быстрее, и один из них может стать лидером.
+4. Скопируйте снэпшот на узлы сервера ClickHouse с настроенным `keeper` или запустите `clickhouse-keeper` вместо ZooKeeper. Снэпшот должен сохраняться на всех узлах: в противном случае пустые узлы будут быстрее, и один из них может стать лидером.
 
 [Original article](https://clickhouse.tech/docs/en/operations/clickhouse-keeper/) <!--hide-->
\ No newline at end of file

From e6a1124ebe803509bca962be2388498973f7a1b7 Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Wed, 25 Aug 2021 21:05:48 +0800
Subject: [PATCH 019/273] Reload stacktrace cache.

---
 src/Common/StackTrace.cpp  | 23 ++++++++++++++++-------
 src/Common/StackTrace.h    |  1 +
 src/Common/SymbolIndex.cpp |  4 ++++
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/Common/StackTrace.cpp b/src/Common/StackTrace.cpp
index 812f888b284..3fae1df0bfa 100644
--- a/src/Common/StackTrace.cpp
+++ b/src/Common/StackTrace.cpp
@@ -417,11 +417,7 @@ void StackTrace::toStringEveryLine(std::function<void(const std::string &)> call
 
 std::string StackTrace::toString() const
 {
-    /// Calculation of stack trace text is extremely slow.
-    /// We use simple cache because otherwise the server could be overloaded by trash queries.
-
-    static SimpleCache<decltype(toStringImpl), &toStringImpl> func_cached;
-    return func_cached(frame_pointers, offset, size);
+    return toStringStatic(frame_pointers, offset, size);
 }
 
 std::string StackTrace::toString(void ** frame_pointers_, size_t offset, size_t size)
@@ -432,6 +428,19 @@ std::string StackTrace::toString(void ** frame_pointers_, size_t offset, size_t
     for (size_t i = 0; i < size; ++i)
         frame_pointers_copy[i] = frame_pointers_[i];
 
-    static SimpleCache<decltype(toStringImpl), &toStringImpl> func_cached;
-    return func_cached(frame_pointers_copy, offset, size);
+    return toStringStatic(frame_pointers_copy, offset, size);
+}
+
+std::string StackTrace::toStringStatic(const StackTrace::FramePointers & frame_pointers, size_t offset, size_t size, bool reload)
+{
+    /// Calculation of stack trace text is extremely slow.
+    /// We use simple cache because otherwise the server could be overloaded by trash queries.
+    static SimpleCache<decltype(toStringImpl), &toStringImpl> func_cached;
+    /// Reload cached stacktrace instead.
+    if (reload)
+    {
+        func_cached.drop();
+        return "";
+    }
+    return func_cached(frame_pointers, offset, size);
 }
diff --git a/src/Common/StackTrace.h b/src/Common/StackTrace.h
index 8f8c88c29fe..7e6edabaf0d 100644
--- a/src/Common/StackTrace.h
+++ b/src/Common/StackTrace.h
@@ -61,6 +61,7 @@ public:
     std::string toString() const;
 
     static std::string toString(void ** frame_pointers, size_t offset, size_t size);
+    static std::string toStringStatic(const FramePointers & frame_pointers, size_t offset, size_t size, bool reload = false);
     static void symbolize(const FramePointers & frame_pointers, size_t offset, size_t size, StackTrace::Frames & frames);
 
     void toStringEveryLine(std::function<void(const std::string &)> callback) const;
diff --git a/src/Common/SymbolIndex.cpp b/src/Common/SymbolIndex.cpp
index a23184c9c0a..72ce51cccd0 100644
--- a/src/Common/SymbolIndex.cpp
+++ b/src/Common/SymbolIndex.cpp
@@ -466,7 +466,11 @@ MultiVersion<SymbolIndex>::Version SymbolIndex::instance(bool reload)
 {
     static MultiVersion<SymbolIndex> instance(std::unique_ptr<SymbolIndex>(new SymbolIndex));
     if (reload)
+    {
         instance.set(std::unique_ptr<SymbolIndex>(new SymbolIndex));
+        /// Also reload stacktrace cache.
+        StackTrace::toStringStatic({}, 0, 0, true);
+    }
     return instance.get();
 }
 

From 35fd0b80f481a50936815ae44ec2a84c925c9e18 Mon Sep 17 00:00:00 2001
From: Roman Zhukov <romanzhukov@yandex-team.ru>
Date: Thu, 26 Aug 2021 11:16:05 +0000
Subject: [PATCH 020/273] Update bin/unbin fucntions

---
 .../functions/encoding-functions.md           | 70 +++++++++----------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/docs/en/sql-reference/functions/encoding-functions.md b/docs/en/sql-reference/functions/encoding-functions.md
index c22f041e0c3..6fd98510b3a 100644
--- a/docs/en/sql-reference/functions/encoding-functions.md
+++ b/docs/en/sql-reference/functions/encoding-functions.md
@@ -210,52 +210,52 @@ Result:
 
 Returns a string containing the argument’s binary representation.
 
-Alias: `BIN`.
-
 **Syntax**
 
 ``` sql
 bin(arg)
 ```
 
+Alias: `BIN`.
+
 For integer arguments, it prints bin digits from the most significant to least significant (big-endian or “human-readable” order). It starts with the most significant non-zero byte (leading zero bytes are omitted) but always prints eight digits of every byte if the leading digit is zero.
 
-**Example**
-
-Query:
-
-``` sql
-SELECT bin(1);
-```
-
-Result:
-
-``` text
-00000001
-```
-
 Values of type `Date` and `DateTime` are formatted as corresponding integers (the number of days since Epoch for Date and the value of Unix Timestamp for DateTime).
 
 For `String` and `FixedString`, all bytes are simply encoded as eight binary numbers. Zero bytes are not omitted.
 
-Values of floating-point and Decimal types are encoded as their representation in memory. As we support little-endian architecture, they are encoded in little-endian. Zero leading/trailing bytes are not omitted.
+Values of `floating-point` and `Decimal` types are encoded as their representation in memory. As we support little-endian architecture, they are encoded in little-endian. Zero leading/trailing bytes are not omitted.
 
 **Arguments**
 
--   `arg` — A value to convert to binary. Types: [String](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+-   `arg` — A value to convert to binary. [String](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md), or [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Returned value**
 
 -   A string with the binary representation of the argument.
 
-Type: `String`.
+Type: [String](../../sql-reference/data-types/string.md).
 
-**Example**
+**Examples**
 
 Query:
 
 ``` sql
-SELECT bin(toFloat32(number)) as bin_presentation FROM numbers(15, 2);
+SELECT bin(14);
+```
+
+Result:
+
+``` text
+┌─bin(14)──┐
+│ 00001110 │
+└──────────┘
+```
+
+Query:
+
+``` sql
+SELECT bin(toFloat32(number)) AS bin_presentation FROM numbers(15, 2);
 ```
 
 Result:
@@ -270,7 +270,7 @@ Result:
 Query:
 
 ``` sql
-SELECT bin(toFloat64(number)) as bin_presentation FROM numbers(15, 2);
+SELECT bin(toFloat64(number)) AS bin_presentation FROM numbers(15, 2);
 ```
 
 Result:
@@ -284,14 +284,7 @@ Result:
 
 ## unbin {#unbinstr}
 
-Performs the opposite operation of [bin](#bin). It interprets each pair of binary digits (in the argument) as a number and converts it to the byte represented by the number. The return value is a binary string (BLOB).
-
-If you want to convert the result to a number, you can use the [reverse](../../sql-reference/functions/string-functions.md#reverse) and [reinterpretAs<Type>](../../sql-reference/functions/type-conversion-functions.md#type-conversion-functions) functions.
-
-!!! note "Note"
-    If `unbin` is invoked from within the `clickhouse-client`, binary strings display using UTF-8.
-
-Alias: `UNBIN`.
+Interprets each pair of binary digits (in the argument) as a number and converts it to the byte represented by the number. The return value is a binary string (BLOB). The functions performs the opposite operation of [bin](#bin).
 
 **Syntax**
 
@@ -299,19 +292,26 @@ Alias: `UNBIN`.
 unbin(arg)
 ```
 
-**Arguments**
+Alias: `UNBIN`.
 
--   `arg` — A string containing any number of binary digits. Type: [String](../../sql-reference/data-types/string.md).
+If you want to convert the result to a number, you can use the [reverse](../../sql-reference/functions/string-functions.md#reverse) and [reinterpretAs<Type>](../../sql-reference/functions/type-conversion-functions.md#type-conversion-functions) functions.
+
+!!! note "Note"
+    If `unbin` is invoked from within the `clickhouse-client`, binary strings display using UTF-8.
 
 Supports binary digits `0-1`. The number of binary digits does not have to be multiples of eight. If the argument string contains anything other than binary digits, some implementation-defined result is returned (an exception isn’t thrown). For a numeric argument the inverse of bin(N) is not performed by unbin().
 
+**Arguments**
+
+-   `arg` — A string containing any number of binary digits. [String](../../sql-reference/data-types/string.md).
+
 **Returned value**
 
 -   A binary string (BLOB).
 
 Type: [String](../../sql-reference/data-types/string.md).
 
-**Example**
+**Examples**
 
 Query:
 
@@ -330,14 +330,14 @@ Result:
 Query:
 
 ``` sql
-SELECT reinterpretAsUInt64(reverse(unbin('1010'))) AS num;
+SELECT reinterpretAsUInt64(reverse(unbin('1110'))) AS num;
 ```
 
 Result:
 
 ``` text
 ┌─num─┐
-│  10 │
+│  14 │
 └─────┘
 ```
 

From c3d9ba7fa2d8f15fffc6b9fa4280edf344ca36bf Mon Sep 17 00:00:00 2001
From: Roman Zhukov <romanzhukov@yandex-team.ru>
Date: Thu, 26 Aug 2021 11:24:22 +0000
Subject: [PATCH 021/273] Update bin/unbin functions RU - draft

---
 .../functions/encoding-functions.md           | 122 ++++++++++++++++++
 1 file changed, 122 insertions(+)

diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index 161c1304b7c..95fb8a3e25f 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -208,6 +208,128 @@ SELECT reinterpretAsUInt64(reverse(unhex('FFF'))) AS num;
 └──────┘
 ```
 
+## bin {#bin}
+
+**Синтаксис**
+
+``` sql
+bin(arg)
+```
+
+Алиас: `BIN`.
+
+
+**Аргументы**
+
+-   `arg` — 
+
+**Возвращаемое значение**
+
+-   Бинарная строка (BLOB).
+
+Тип: [String](../../sql-reference/data-types/string.md).
+
+**Примеры**
+
+Запрос:
+
+``` sql
+SELECT bin(14);
+```
+
+Результат:
+
+``` text
+┌─bin(14)──┐
+│ 00001110 │
+└──────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT bin(toFloat32(number)) AS bin_presentation FROM numbers(15, 2);
+```
+
+Результат:
+
+``` text
+┌─bin_presentation─────────────────┐
+│ 00000000000000000111000001000001 │
+│ 00000000000000001000000001000001 │
+└──────────────────────────────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT bin(toFloat64(number)) AS bin_presentation FROM numbers(15, 2);
+```
+
+Результат:
+
+``` text
+┌─bin_presentation─────────────────────────────────────────────────┐
+│ 0000000000000000000000000000000000000000000000000010111001000000 │
+│ 0000000000000000000000000000000000000000000000000011000001000000 │
+└──────────────────────────────────────────────────────────────────┘
+```
+
+## unbin {#unbinstr}
+
+
+**Синтаксис**
+
+``` sql
+unbin(arg)
+```
+
+Алиас: `UNBIN`.
+
+**Аргументы**
+
+-   `arg` — 
+
+**Возвращаемое значение**
+
+-   Бинарная строка (BLOB).
+
+Тип: [String](../../sql-reference/data-types/string.md).
+
+
+**Примеры**
+
+Запрос:
+
+``` sql
+SELECT UNBIN('001100000011000100110010'), UNBIN('0100110101111001010100110101000101001100');
+```
+
+Результат:
+
+``` text
+┌─unbin('001100000011000100110010')─┬─unbin('0100110101111001010100110101000101001100')─┐
+│ 012                               │ MySQL                                             │
+└───────────────────────────────────┴───────────────────────────────────────────────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT reinterpretAsUInt64(reverse(unbin('1110'))) AS num;
+```
+
+Результат:
+
+``` text
+┌─num─┐
+│  14 │
+└─────┘
+```
+
+
+
+
 ## UUIDStringToNum(str) {#uuidstringtonumstr}
 
 Принимает строку, содержащую 36 символов в формате `123e4567-e89b-12d3-a456-426655440000`, и возвращает в виде набора байт в FixedString(16).

From 3a0baf0c81872f0eb1410df3229ee1e893901849 Mon Sep 17 00:00:00 2001
From: Roman Zhukov <romanzhukov@yandex-team.ru>
Date: Thu, 26 Aug 2021 12:19:47 +0000
Subject: [PATCH 022/273] Update Unit tests RU.

---
 docs/en/development/tests.md | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/docs/en/development/tests.md b/docs/en/development/tests.md
index c7c0ec88be4..776843e53a6 100644
--- a/docs/en/development/tests.md
+++ b/docs/en/development/tests.md
@@ -66,13 +66,21 @@ See `tests/integration/README.md` on how to run these tests.
 
 Note that integration of ClickHouse with third-party drivers is not tested. Also, we currently do not have integration tests with our JDBC and ODBC drivers.
 
-## Unit Tests {#unit-tests}
+## Модульные тесты {#unit-tests}
 
-Unit tests are useful when you want to test not the ClickHouse as a whole, but a single isolated library or class. You can enable or disable build of tests with `ENABLE_TESTS` CMake option. Unit tests (and other test programs) are located in `tests` subdirectories across the code. To run unit tests, type `ninja test`. Some tests use `gtest`, but some are just programs that return non-zero exit code on test failure.
+Модульные тесты полезны, когда вы хотите протестировать не ClickHouse в целом, а отдельную изолированную библиотеку или класс. Вы можете включить или отключить выполнение тестов при сборке с помощью опции CMake `ENABLE_TESTS`. Модульные тесты (как и другие тестовые программы) расположены в подкаталогах `tests` по всему репозиторию.
 
-It’s not necessary to have unit tests if the code is already covered by functional tests (and functional tests are usually much more simple to use).
+Чтобы запустить модульные тесты введите:
 
-You can run individual gtest checks by calling the executable directly, for example:
+```bash
+ninja test
+```
+
+Некоторые тесты используют `gtest`, но некоторые из них — это просто программы, которые возвращают ненулевой код выхода при сбое теста.
+
+Нет необходимости в модульных тестах, если код уже охвачен функциональными тестами (ведь функциональные тесты обычно намного проще в использовании).
+
+Вы можете запускать отдельные проверки `gtest`, вызвав исполняемый файл напрямую, например:
 
 ```bash
 $ ./src/unit_tests_dbms --gtest_filter=LocalAddress*

From 1f3701d4851fd19c5fee2c61f155ec23d461bf7b Mon Sep 17 00:00:00 2001
From: Mike Kot <to@myrrc.dev>
Date: Wed, 25 Aug 2021 21:18:12 +0200
Subject: [PATCH 023/273] Disk empty name fix

---
 src/Storages/MergeTree/MergeTreeData.cpp   | 8 +++++---
 src/Storages/MergeTree/MergeTreePartInfo.h | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index d461d55d161..6cfa6ab70d7 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -895,7 +895,7 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
                 for (const auto it = disk->iterateDirectory(relative_data_path); it->isValid(); it->next())
                 {
                     if (MergeTreePartInfo::tryParsePartName(it->name(), format_version))
-                        throw Exception(ErrorCodes::UNKNOWN_DISK, 
+                        throw Exception(ErrorCodes::UNKNOWN_DISK,
                             "Part {} was found on disk {} which is not defined in the storage policy",
                             backQuote(it->name()), backQuote(disk_name));
                 }
@@ -3569,8 +3569,10 @@ std::vector<DetachedPartInfo> MergeTreeData::getDetachedParts() const
         {
             for (auto it = disk->iterateDirectory(detached_path); it->isValid(); it->next())
             {
-                auto res_it = res.emplace_back(DetachedPartInfo::parseDetachedPartName(it->name(), format_version));
-                res_it.disk = disk->getName();
+                auto part = DetachedPartInfo::parseDetachedPartName(it->name(), format_version);
+                part.disk = disk->getName();
+
+                res.push_back(std::move(part));
             }
         }
     }
diff --git a/src/Storages/MergeTree/MergeTreePartInfo.h b/src/Storages/MergeTree/MergeTreePartInfo.h
index 58707b4dca3..bda7c24bab8 100644
--- a/src/Storages/MergeTree/MergeTreePartInfo.h
+++ b/src/Storages/MergeTree/MergeTreePartInfo.h
@@ -125,7 +125,7 @@ struct DetachedPartInfo : public MergeTreePartInfo
     /// If false, MergeTreePartInfo is in invalid state (directory name was not successfully parsed).
     bool valid_name;
 
-    static constexpr auto DETACH_REASONS = std::to_array<std::string_view>({  
+    static constexpr auto DETACH_REASONS = std::to_array<std::string_view>({
         "broken", "unexpected", "noquorum",
         "ignored", "broken-on-start", "clone",
         "attaching", "deleting", "tmp-fetch"

From 3b39b82fb7e01b048714b52a5bc5b15490e6ab9e Mon Sep 17 00:00:00 2001
From: zhangxiao871 <zhangxiao871@ZBMAC-C02DN6312.local>
Date: Mon, 30 Aug 2021 14:37:23 +0800
Subject: [PATCH 024/273] Bit shift operations for FixedString and String data
 types.

---
 src/Functions/DivisionUtils.h            |   2 +
 src/Functions/FunctionBinaryArithmetic.h | 229 +++++++++++++++++++++--
 src/Functions/GCDLCMImpl.h               |   1 +
 src/Functions/abs.cpp                    |   1 +
 src/Functions/bitAnd.cpp                 |   1 +
 src/Functions/bitBoolMaskAnd.cpp         |   1 +
 src/Functions/bitBoolMaskOr.cpp          |   1 +
 src/Functions/bitCount.cpp               |   1 +
 src/Functions/bitNot.cpp                 |   1 +
 src/Functions/bitOr.cpp                  |   1 +
 src/Functions/bitRotateLeft.cpp          |   1 +
 src/Functions/bitRotateRight.cpp         |   1 +
 src/Functions/bitShiftLeft.cpp           |   1 +
 src/Functions/bitShiftRight.cpp          |  48 +++++
 src/Functions/bitSwapLastTwo.cpp         |   1 +
 src/Functions/bitTest.cpp                |   1 +
 src/Functions/bitWrapperFunc.cpp         |   1 +
 src/Functions/bitXor.cpp                 |   1 +
 src/Functions/divide.cpp                 |   1 +
 src/Functions/greatest.cpp               |   2 +
 src/Functions/intDiv.cpp                 |   1 +
 src/Functions/intDivOrZero.cpp           |   1 +
 src/Functions/intExp10.cpp               |   1 +
 src/Functions/intExp2.cpp                |   1 +
 src/Functions/least.cpp                  |   2 +
 src/Functions/minus.cpp                  |   1 +
 src/Functions/modulo.cpp                 |   1 +
 src/Functions/moduloOrZero.cpp           |   1 +
 src/Functions/multiply.cpp               |   1 +
 src/Functions/negate.cpp                 |   1 +
 src/Functions/plus.cpp                   |   1 +
 src/Functions/roundAge.cpp               |   1 +
 src/Functions/roundDuration.cpp          |   1 +
 src/Functions/roundToExp2.cpp            |   1 +
 src/Functions/sign.cpp                   |   1 +
 35 files changed, 298 insertions(+), 15 deletions(-)

diff --git a/src/Functions/DivisionUtils.h b/src/Functions/DivisionUtils.h
index f10e15c1574..2c9babc9f44 100644
--- a/src/Functions/DivisionUtils.h
+++ b/src/Functions/DivisionUtils.h
@@ -72,6 +72,7 @@ struct DivideIntegralImpl
 {
     using ResultType = typename NumberTraits::ResultOfIntegerDivision<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
@@ -126,6 +127,7 @@ struct ModuloImpl
     using IntegerBType = typename NumberTraits::ToInteger<B>::Type;
 
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index 4907bf6abda..06911557a96 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -15,11 +15,13 @@
 #include <DataTypes/DataTypeInterval.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
 #include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeString.h>
 #include <DataTypes/Native.h>
 #include <DataTypes/NumberTraits.h>
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnDecimal.h>
 #include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnString.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnAggregateFunction.h>
 #include "Core/DecimalFunctions.h"
@@ -197,6 +199,7 @@ struct BinaryOperation
 {
     using ResultType = OpResultType;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <OpCase op_case>
     static void NO_INLINE process(const A * __restrict a, const B * __restrict b, ResultType * __restrict c, size_t size)
@@ -213,6 +216,80 @@ struct BinaryOperation
     static ResultType process(A a, B b) { return Op::template apply<ResultType>(a, b); }
 };
 
+template <typename B, typename Op>
+struct StringIntegerOperationImpl
+{
+    static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = true;
+
+    template <OpCase op_case, bool is_fixed_string>
+    static void NO_INLINE process(const UInt8 * __restrict in_vec, const UInt64 * __restrict n_or_in_offsets, const B * __restrict b, ColumnString::Chars & out_vec, ColumnString::Offsets & out_offsets, size_t size)
+    {
+        if constexpr (is_fixed_string)
+            processFixedString<op_case>(in_vec, *n_or_in_offsets, b, out_vec, out_offsets, size);
+        else
+            processString<op_case>(in_vec, n_or_in_offsets, b, out_vec, out_offsets, size);
+    }
+
+    template <OpCase op_case>
+    static void NO_INLINE processFixedString(const UInt8 * __restrict in_vec, const UInt64 n, const B * __restrict b, ColumnString::Chars & out_vec, ColumnString::Offsets & out_offsets, size_t size)
+    {
+        size_t prev_offset = 0;
+
+        for (size_t i = 0; i < size; ++i)
+        {
+            if constexpr (op_case == OpCase::LeftConstant)
+            {
+                Op::apply(&in_vec[0], &in_vec[n], b[i], out_vec, out_offsets);
+            }
+            else
+            {
+                size_t new_offset = prev_offset + n;
+
+                if constexpr (op_case == OpCase::Vector)
+                {
+                    Op::apply(&in_vec[prev_offset], &in_vec[new_offset], b[i], out_vec, out_offsets);
+                }
+                else
+                {
+                    Op::apply(&in_vec[prev_offset], &in_vec[new_offset], b[0], out_vec, out_offsets);
+                }
+                prev_offset = new_offset;
+            }
+        }
+    }
+
+    /// if is_fixed_string n_or_in_offsets is n, otherwise n_or_in_offsets is in_offsets
+    template <OpCase op_case>
+    static void NO_INLINE processString(const UInt8 * __restrict in_vec, const UInt64 * __restrict in_offsets, const B * __restrict b, ColumnString::Chars & out_vec, ColumnString::Offsets & out_offsets, size_t size)
+    {
+        size_t prev_offset = 0;
+
+        for (size_t i = 0; i < size; ++i)
+        {
+            if constexpr (op_case == OpCase::LeftConstant)
+            {
+                Op::apply(&in_vec[0], &in_vec[in_offsets[0] - 1], b[i], out_vec, out_offsets);
+            }
+            else
+            {
+                size_t new_offset = in_offsets[i];
+
+                if constexpr (op_case == OpCase::Vector)
+                {
+                    Op::apply(&in_vec[prev_offset], &in_vec[new_offset - 1], b[i], out_vec, out_offsets);
+                }
+                else
+                {
+                    Op::apply(&in_vec[prev_offset], &in_vec[new_offset - 1], b[0], out_vec, out_offsets);
+                }
+
+                prev_offset = new_offset;
+            }
+        }
+    }
+};
+
 template <typename Op>
 struct FixedStringOperationImpl
 {
@@ -540,7 +617,8 @@ class FunctionBinaryArithmetic : public IFunction
             DataTypeDecimal<Decimal64>,
             DataTypeDecimal<Decimal128>,
             DataTypeDecimal<Decimal256>,
-            DataTypeFixedString
+            DataTypeFixedString,
+            DataTypeString
         >(type, std::forward<F>(f));
     }
 
@@ -566,7 +644,8 @@ class FunctionBinaryArithmetic : public IFunction
             DataTypeDecimal<Decimal64>,
             DataTypeDecimal<Decimal128>,
             DataTypeDecimal<Decimal256>,
-            DataTypeFixedString
+            DataTypeFixedString,
+            DataTypeString
         >(type, std::forward<F>(f));
     }
 
@@ -1012,19 +1091,31 @@ public:
             using LeftDataType = std::decay_t<decltype(left)>;
             using RightDataType = std::decay_t<decltype(right)>;
 
-            if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType> ||
-                          std::is_same_v<DataTypeFixedString, RightDataType>)
+            if constexpr ((std::is_same_v<DataTypeFixedString, LeftDataType> || std::is_same_v<DataTypeString, LeftDataType>) ||
+                (std::is_same_v<DataTypeFixedString, RightDataType> || std::is_same_v<DataTypeString, RightDataType>))
             {
-                if constexpr (!Op<DataTypeFixedString, DataTypeFixedString>::allow_fixed_string)
-                    return false;
-                else if constexpr (std::is_same_v<LeftDataType, RightDataType>)
+                if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType> &&
+                              std::is_same_v<DataTypeFixedString, RightDataType>)
                 {
-                    if (left.getN() == right.getN())
+                    if constexpr (!Op<DataTypeFixedString, DataTypeFixedString>::allow_fixed_string)
+                        return false;
+                    else
                     {
-                        type_res = std::make_shared<LeftDataType>(left.getN());
-                        return true;
+                        if (left.getN() == right.getN())
+                        {
+                            type_res = std::make_shared<LeftDataType>(left.getN());
+                            return true;
+                        }
                     }
                 }
+
+                if constexpr (!Op<LeftDataType, RightDataType>::allow_string_integer)
+                    return false;
+                else if constexpr (!IsIntegral<RightDataType>)
+                    return false;
+                else
+                    type_res = std::make_shared<DataTypeString>();
+                return true;
             }
             else
             {
@@ -1161,6 +1252,99 @@ public:
         return nullptr;
     }
 
+
+    template <typename LeftColumnType, typename A, typename B>
+    ColumnPtr executeStringInteger(const ColumnsWithTypeAndName & arguments, const A & left, const B & right) const
+    {
+        using LeftDataType = std::decay_t<decltype(left)>;
+        using RightDataType = std::decay_t<decltype(right)>;
+        using ResultDataType = DataTypeString;
+
+        const auto * const col_left_raw = arguments[0].column.get();
+        const auto * const col_right_raw = arguments[1].column.get();
+        using T1 = typename RightDataType::FieldType;
+
+        using ColVecT1 = ColumnVector<T1>;
+        const ColVecT1 * const col_right = checkAndGetColumn<ColVecT1>(col_right_raw);
+        const ColumnConst * const col_right_const = checkAndGetColumnConst<ColVecT1>(col_right_raw);
+
+        ColumnString::MutablePtr col_res = ColumnString::create();
+
+        ColumnString::Chars & out_vec = col_res->getChars();
+        ColumnString::Offsets & out_offsets = col_res->getOffsets();
+
+        using OpImpl = StringIntegerOperationImpl<T1, Op<LeftDataType, T1>>;
+
+        const ColumnConst * const col_left_const = checkAndGetColumnConst<LeftColumnType>(col_left_raw);
+
+        const auto * col_left = col_left_const ? checkAndGetColumn<LeftColumnType>(col_left_const->getDataColumn())
+                                               : checkAndGetColumn<LeftColumnType>(col_left_raw);
+
+        const typename LeftColumnType::Chars & in_vec = col_left->getChars();
+
+        UInt64 n;
+        const UInt64 * n_or_in_offsets;
+        if constexpr (std::is_same_v<LeftDataType, DataTypeFixedString>)
+        {
+            n = col_left->getN();
+            n_or_in_offsets = &n;
+        }
+        else
+            n_or_in_offsets = col_left->getOffsets().data();
+
+        if (col_left_const && col_right_const)
+        {
+            const T1 value = col_right_const->template getValue<T1>();
+            OpImpl::template process<OpCase::Vector, std::is_same_v<LeftDataType, DataTypeFixedString>>(
+                in_vec.data(),
+                n_or_in_offsets,
+                &value,
+                out_vec,
+                out_offsets,
+                1);
+
+            return ResultDataType().createColumnConst(col_left_const->size(), col_res->size() ? (*col_res)[0] : Field(""));
+        }
+        else if (!col_left_const && !col_right_const && col_left && col_right)
+        {
+            out_offsets.reserve(col_left->size());
+            OpImpl::template process<OpCase::Vector, std::is_same_v<LeftDataType, DataTypeFixedString>>(
+                in_vec.data(),
+                n_or_in_offsets,
+                col_right->getData().data(),
+                out_vec,
+                out_offsets,
+                col_left->size());
+        }
+        else if (col_left_const && col_right)
+        {
+            out_offsets.reserve(col_right->size());
+            OpImpl::template process<OpCase::LeftConstant, std::is_same_v<LeftDataType, DataTypeFixedString>>(
+                in_vec.data(),
+                n_or_in_offsets,
+                col_right->getData().data(),
+                out_vec,
+                out_offsets,
+                col_right->size());
+        }
+        else if (col_left && col_right_const)
+        {
+            const T1 value = col_right_const->template getValue<T1>();
+
+            OpImpl::template process<OpCase::RightConstant, std::is_same_v<LeftDataType, DataTypeFixedString>>(
+                in_vec.data(),
+                n_or_in_offsets,
+                &value,
+                out_vec,
+                out_offsets,
+                col_left->size());
+        }
+        else
+            return nullptr;
+
+        return col_res;
+    }
+
     template <typename A, typename B>
     ColumnPtr executeNumeric(const ColumnsWithTypeAndName & arguments, const A & left, const B & right) const
     {
@@ -1287,13 +1471,28 @@ public:
             using LeftDataType = std::decay_t<decltype(left)>;
             using RightDataType = std::decay_t<decltype(right)>;
 
-            if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType> ||
-                std::is_same_v<DataTypeFixedString, RightDataType>)
+            if constexpr ((std::is_same_v<DataTypeFixedString, LeftDataType> || std::is_same_v<DataTypeString, LeftDataType>) ||
+                          (std::is_same_v<DataTypeFixedString, RightDataType> || std::is_same_v<DataTypeString, RightDataType>))
             {
-                if constexpr (!Op<DataTypeFixedString, DataTypeFixedString>::allow_fixed_string)
+                if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType> &&
+                              std::is_same_v<DataTypeFixedString, RightDataType>)
+                {
+                    if constexpr (!Op<DataTypeFixedString, DataTypeFixedString>::allow_fixed_string)
+                        return false;
+                    else
+                        return (res = executeFixedString(arguments)) != nullptr;
+                }
+
+                if constexpr (!Op<LeftDataType, RightDataType>::allow_string_integer)
                     return false;
-                else
-                    return (res = executeFixedString(arguments)) != nullptr;
+                else if constexpr (!IsIntegral<RightDataType>)
+                    return false;
+                else if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType>)
+                {
+                    return (res = executeStringInteger<ColumnFixedString>(arguments, left, right)) != nullptr;
+                }
+                else if constexpr (std::is_same_v<DataTypeString, LeftDataType>)
+                    return (res = executeStringInteger<ColumnString>(arguments, left, right)) != nullptr;
             }
             else
                 return (res = executeNumeric(arguments, left, right)) != nullptr;
diff --git a/src/Functions/GCDLCMImpl.h b/src/Functions/GCDLCMImpl.h
index f13a6dc3f95..722dacfe2f1 100644
--- a/src/Functions/GCDLCMImpl.h
+++ b/src/Functions/GCDLCMImpl.h
@@ -25,6 +25,7 @@ struct GCDLCMImpl
 {
     using ResultType = typename NumberTraits::ResultOfAdditionMultiplication<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/abs.cpp b/src/Functions/abs.cpp
index 10664f7b421..0e99705044c 100644
--- a/src/Functions/abs.cpp
+++ b/src/Functions/abs.cpp
@@ -11,6 +11,7 @@ struct AbsImpl
 {
     using ResultType = std::conditional_t<IsDecimalNumber<A>, A, typename NumberTraits::ResultOfAbs<A>::Type>;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline NO_SANITIZE_UNDEFINED ResultType apply(A a)
     {
diff --git a/src/Functions/bitAnd.cpp b/src/Functions/bitAnd.cpp
index aa4b7593c79..63f92839638 100644
--- a/src/Functions/bitAnd.cpp
+++ b/src/Functions/bitAnd.cpp
@@ -17,6 +17,7 @@ struct BitAndImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static constexpr const bool allow_fixed_string = true;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/bitBoolMaskAnd.cpp b/src/Functions/bitBoolMaskAnd.cpp
index 9b0ea85f3fd..ec208615363 100644
--- a/src/Functions/bitBoolMaskAnd.cpp
+++ b/src/Functions/bitBoolMaskAnd.cpp
@@ -22,6 +22,7 @@ struct BitBoolMaskAndImpl
 {
     using ResultType = UInt8;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply([[maybe_unused]] A left, [[maybe_unused]] B right)
diff --git a/src/Functions/bitBoolMaskOr.cpp b/src/Functions/bitBoolMaskOr.cpp
index d68a54924d0..595417d04b4 100644
--- a/src/Functions/bitBoolMaskOr.cpp
+++ b/src/Functions/bitBoolMaskOr.cpp
@@ -22,6 +22,7 @@ struct BitBoolMaskOrImpl
 {
     using ResultType = UInt8;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply([[maybe_unused]] A left, [[maybe_unused]] B right)
diff --git a/src/Functions/bitCount.cpp b/src/Functions/bitCount.cpp
index 2890b1a8253..de6e9917647 100644
--- a/src/Functions/bitCount.cpp
+++ b/src/Functions/bitCount.cpp
@@ -14,6 +14,7 @@ struct BitCountImpl
 {
     using ResultType = UInt8;
     static constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType apply(A a)
     {
diff --git a/src/Functions/bitNot.cpp b/src/Functions/bitNot.cpp
index 050d8dc3e3d..3e1e69fccc2 100644
--- a/src/Functions/bitNot.cpp
+++ b/src/Functions/bitNot.cpp
@@ -18,6 +18,7 @@ struct BitNotImpl
 {
     using ResultType = typename NumberTraits::ResultOfBitNot<A>::Type;
     static const constexpr bool allow_fixed_string = true;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType apply(A a)
     {
diff --git a/src/Functions/bitOr.cpp b/src/Functions/bitOr.cpp
index adf2244bc0a..65847e93b8b 100644
--- a/src/Functions/bitOr.cpp
+++ b/src/Functions/bitOr.cpp
@@ -16,6 +16,7 @@ struct BitOrImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static constexpr const bool allow_fixed_string = true;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/bitRotateLeft.cpp b/src/Functions/bitRotateLeft.cpp
index 9962ac174fd..2cddb93e333 100644
--- a/src/Functions/bitRotateLeft.cpp
+++ b/src/Functions/bitRotateLeft.cpp
@@ -17,6 +17,7 @@ struct BitRotateLeftImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a [[maybe_unused]], B b [[maybe_unused]])
diff --git a/src/Functions/bitRotateRight.cpp b/src/Functions/bitRotateRight.cpp
index 8352f2f92bc..66664c4ab8d 100644
--- a/src/Functions/bitRotateRight.cpp
+++ b/src/Functions/bitRotateRight.cpp
@@ -17,6 +17,7 @@ struct BitRotateRightImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a [[maybe_unused]], B b [[maybe_unused]])
diff --git a/src/Functions/bitShiftLeft.cpp b/src/Functions/bitShiftLeft.cpp
index 96e0fbe6d6f..18a43ae120c 100644
--- a/src/Functions/bitShiftLeft.cpp
+++ b/src/Functions/bitShiftLeft.cpp
@@ -17,6 +17,7 @@ struct BitShiftLeftImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a [[maybe_unused]], B b [[maybe_unused]])
diff --git a/src/Functions/bitShiftRight.cpp b/src/Functions/bitShiftRight.cpp
index 37c3908f8de..85e6cfbddaf 100644
--- a/src/Functions/bitShiftRight.cpp
+++ b/src/Functions/bitShiftRight.cpp
@@ -1,5 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionBinaryArithmetic.h>
+#include <Common/hex.h>
 
 namespace DB
 {
@@ -17,6 +18,7 @@ struct BitShiftRightImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = true;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a [[maybe_unused]], B b [[maybe_unused]])
@@ -29,6 +31,51 @@ struct BitShiftRightImpl
             return static_cast<Result>(a) >> static_cast<Result>(b);
     }
 
+    static inline NO_SANITIZE_UNDEFINED void apply(const UInt8 * pos [[maybe_unused]], const UInt8 * end [[maybe_unused]], const B & b [[maybe_unused]], ColumnString::Chars & out_vec, ColumnString::Offsets & out_offsets)
+    {
+        if constexpr (is_big_int_v<B>)
+            throw Exception("BitShiftRight is not implemented for big integers as second argument", ErrorCodes::NOT_IMPLEMENTED);
+        else
+        {
+            UInt8 word_size = 8;
+            if (b >= static_cast<B>((end - pos) * word_size))
+            {
+                // insert default value
+                out_vec.push_back(0);
+                out_offsets.push_back(out_offsets.back() + 1);
+                return;
+            }
+
+            size_t shift_right_bytes = b / word_size;
+            size_t shift_right_bits = b % word_size;
+
+            const UInt8 * begin = pos;
+            const UInt8 * shift_right_end = end - shift_right_bytes;
+
+            const size_t old_size = out_vec.size();
+            size_t length = shift_right_end - begin;
+            const size_t new_size = old_size + length + 1;
+            out_vec.resize(new_size);
+
+            UInt8 * op_pointer = const_cast<UInt8 *>(shift_right_end);
+            out_vec[old_size + length] = 0;
+            UInt8 * out = out_vec.data() + old_size + length;
+            while (op_pointer > begin)
+            {
+                op_pointer--;
+                out--;
+                UInt8 temp_value = *op_pointer >> shift_right_bits;
+                if (op_pointer - 1 >= begin)
+                {
+                    *out = UInt8(UInt8(*(op_pointer - 1) << (8 - shift_right_bits)) | temp_value);
+                }
+                else
+                    *out = temp_value;
+            }
+            out_offsets.push_back(new_size);
+        }
+    }
+
 #if USE_EMBEDDED_COMPILER
     static constexpr bool compilable = true;
 
@@ -41,6 +88,7 @@ struct BitShiftRightImpl
 #endif
 };
 
+
 struct NameBitShiftRight { static constexpr auto name = "bitShiftRight"; };
 using FunctionBitShiftRight = BinaryArithmeticOverloadResolver<BitShiftRightImpl, NameBitShiftRight, true, false>;
 
diff --git a/src/Functions/bitSwapLastTwo.cpp b/src/Functions/bitSwapLastTwo.cpp
index 4103511085d..566e6a47352 100644
--- a/src/Functions/bitSwapLastTwo.cpp
+++ b/src/Functions/bitSwapLastTwo.cpp
@@ -20,6 +20,7 @@ struct BitSwapLastTwoImpl
 {
     using ResultType = UInt8;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType NO_SANITIZE_UNDEFINED apply([[maybe_unused]] A a)
     {
diff --git a/src/Functions/bitTest.cpp b/src/Functions/bitTest.cpp
index b7e9a84c6c1..9c12268d2ef 100644
--- a/src/Functions/bitTest.cpp
+++ b/src/Functions/bitTest.cpp
@@ -18,6 +18,7 @@ struct BitTestImpl
 {
     using ResultType = UInt8;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     NO_SANITIZE_UNDEFINED static inline Result apply(A a [[maybe_unused]], B b [[maybe_unused]])
diff --git a/src/Functions/bitWrapperFunc.cpp b/src/Functions/bitWrapperFunc.cpp
index 8395865d554..5b2db50f8e0 100644
--- a/src/Functions/bitWrapperFunc.cpp
+++ b/src/Functions/bitWrapperFunc.cpp
@@ -20,6 +20,7 @@ struct BitWrapperFuncImpl
 {
     using ResultType = UInt8;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType NO_SANITIZE_UNDEFINED apply(A a [[maybe_unused]])
     {
diff --git a/src/Functions/bitXor.cpp b/src/Functions/bitXor.cpp
index d8901c6c9ff..8f3b6a1f9ca 100644
--- a/src/Functions/bitXor.cpp
+++ b/src/Functions/bitXor.cpp
@@ -16,6 +16,7 @@ struct BitXorImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static constexpr bool allow_fixed_string = true;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/divide.cpp b/src/Functions/divide.cpp
index aa36e23d344..7b8fcf94313 100644
--- a/src/Functions/divide.cpp
+++ b/src/Functions/divide.cpp
@@ -13,6 +13,7 @@ struct DivideFloatingImpl
 {
     using ResultType = typename NumberTraits::ResultOfFloatingPointDivision<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a [[maybe_unused]], B b [[maybe_unused]])
diff --git a/src/Functions/greatest.cpp b/src/Functions/greatest.cpp
index 9fda95db01f..75837a409e9 100644
--- a/src/Functions/greatest.cpp
+++ b/src/Functions/greatest.cpp
@@ -12,6 +12,7 @@ struct GreatestBaseImpl
 {
     using ResultType = NumberTraits::ResultOfGreatest<A, B>;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
@@ -42,6 +43,7 @@ struct GreatestSpecialImpl
 {
     using ResultType = make_unsigned_t<A>;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/intDiv.cpp b/src/Functions/intDiv.cpp
index 14df8af66ca..6b77b2890d4 100644
--- a/src/Functions/intDiv.cpp
+++ b/src/Functions/intDiv.cpp
@@ -23,6 +23,7 @@ struct DivideIntegralByConstantImpl
     using Op = DivideIntegralImpl<A, B>;
     using ResultType = typename Op::ResultType;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <OpCase op_case>
     static void NO_INLINE process(const A * __restrict a, const B * __restrict b, ResultType * __restrict c, size_t size)
diff --git a/src/Functions/intDivOrZero.cpp b/src/Functions/intDivOrZero.cpp
index e44d53244cb..d1b3429abfb 100644
--- a/src/Functions/intDivOrZero.cpp
+++ b/src/Functions/intDivOrZero.cpp
@@ -10,6 +10,7 @@ struct DivideIntegralOrZeroImpl
 {
     using ResultType = typename NumberTraits::ResultOfIntegerDivision<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/intExp10.cpp b/src/Functions/intExp10.cpp
index daf87e717e9..9eca25fd79b 100644
--- a/src/Functions/intExp10.cpp
+++ b/src/Functions/intExp10.cpp
@@ -18,6 +18,7 @@ struct IntExp10Impl
 {
     using ResultType = UInt64;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType apply([[maybe_unused]] A a)
     {
diff --git a/src/Functions/intExp2.cpp b/src/Functions/intExp2.cpp
index d09f51a1269..59b829bbad8 100644
--- a/src/Functions/intExp2.cpp
+++ b/src/Functions/intExp2.cpp
@@ -19,6 +19,7 @@ struct IntExp2Impl
 {
     using ResultType = UInt64;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType apply([[maybe_unused]] A a)
     {
diff --git a/src/Functions/least.cpp b/src/Functions/least.cpp
index 6ba7989a344..b7fe2b302ff 100644
--- a/src/Functions/least.cpp
+++ b/src/Functions/least.cpp
@@ -12,6 +12,7 @@ struct LeastBaseImpl
 {
     using ResultType = NumberTraits::ResultOfLeast<A, B>;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
@@ -42,6 +43,7 @@ struct LeastSpecialImpl
 {
     using ResultType = std::make_signed_t<A>;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/minus.cpp b/src/Functions/minus.cpp
index 0ce90f3544d..a5853a22f34 100644
--- a/src/Functions/minus.cpp
+++ b/src/Functions/minus.cpp
@@ -10,6 +10,7 @@ struct MinusImpl
 {
     using ResultType = typename NumberTraits::ResultOfSubtraction<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a, B b)
diff --git a/src/Functions/modulo.cpp b/src/Functions/modulo.cpp
index 115f7a23443..e53f8d16a17 100644
--- a/src/Functions/modulo.cpp
+++ b/src/Functions/modulo.cpp
@@ -27,6 +27,7 @@ struct ModuloByConstantImpl
     using Op = ModuloImpl<A, B>;
     using ResultType = typename Op::ResultType;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <OpCase op_case>
     static void NO_INLINE process(const A * __restrict a, const B * __restrict b, ResultType * __restrict c, size_t size)
diff --git a/src/Functions/moduloOrZero.cpp b/src/Functions/moduloOrZero.cpp
index 4143266518a..ca55ccc79fd 100644
--- a/src/Functions/moduloOrZero.cpp
+++ b/src/Functions/moduloOrZero.cpp
@@ -12,6 +12,7 @@ struct ModuloOrZeroImpl
 {
     using ResultType = typename NumberTraits::ResultOfModulo<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/multiply.cpp b/src/Functions/multiply.cpp
index 52ab8decbf7..68c12397b8d 100644
--- a/src/Functions/multiply.cpp
+++ b/src/Functions/multiply.cpp
@@ -11,6 +11,7 @@ struct MultiplyImpl
 {
     using ResultType = typename NumberTraits::ResultOfAdditionMultiplication<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a, B b)
diff --git a/src/Functions/negate.cpp b/src/Functions/negate.cpp
index de3995927d3..e68af3328e2 100644
--- a/src/Functions/negate.cpp
+++ b/src/Functions/negate.cpp
@@ -10,6 +10,7 @@ struct NegateImpl
 {
     using ResultType = std::conditional_t<IsDecimalNumber<A>, A, typename NumberTraits::ResultOfNegate<A>::Type>;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline NO_SANITIZE_UNDEFINED ResultType apply(A a)
     {
diff --git a/src/Functions/plus.cpp b/src/Functions/plus.cpp
index 0a63741ea3b..41e5a025cd5 100644
--- a/src/Functions/plus.cpp
+++ b/src/Functions/plus.cpp
@@ -10,6 +10,7 @@ struct PlusImpl
 {
     using ResultType = typename NumberTraits::ResultOfAdditionMultiplication<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
     static const constexpr bool is_commutative = true;
 
     template <typename Result = ResultType>
diff --git a/src/Functions/roundAge.cpp b/src/Functions/roundAge.cpp
index 08ac941c2df..54e34dc7266 100644
--- a/src/Functions/roundAge.cpp
+++ b/src/Functions/roundAge.cpp
@@ -11,6 +11,7 @@ struct RoundAgeImpl
 {
     using ResultType = UInt8;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType apply(A x)
     {
diff --git a/src/Functions/roundDuration.cpp b/src/Functions/roundDuration.cpp
index dec3427a7e1..40018753d5e 100644
--- a/src/Functions/roundDuration.cpp
+++ b/src/Functions/roundDuration.cpp
@@ -11,6 +11,7 @@ struct RoundDurationImpl
 {
     using ResultType = UInt16;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType apply(A x)
     {
diff --git a/src/Functions/roundToExp2.cpp b/src/Functions/roundToExp2.cpp
index 8f467aa9281..33cfdaf1349 100644
--- a/src/Functions/roundToExp2.cpp
+++ b/src/Functions/roundToExp2.cpp
@@ -64,6 +64,7 @@ struct RoundToExp2Impl
 {
     using ResultType = T;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline T apply(T x)
     {
diff --git a/src/Functions/sign.cpp b/src/Functions/sign.cpp
index 8e2964c1859..928d8a98f4a 100644
--- a/src/Functions/sign.cpp
+++ b/src/Functions/sign.cpp
@@ -10,6 +10,7 @@ struct SignImpl
 {
     using ResultType = Int8;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline NO_SANITIZE_UNDEFINED ResultType apply(A a)
     {

From 7e58d7aad4b0069f949e1e16b9c706fad9dec7f1 Mon Sep 17 00:00:00 2001
From: zhangxiao871 <zhangxiao871@ZBMAC-C02DN6312.local>
Date: Mon, 30 Aug 2021 16:15:34 +0800
Subject: [PATCH 025/273] Add test and dealing with negative numbers.

---
 src/Functions/bitShiftRight.cpp               |  2 +-
 ...t_shift_right_for_string_integer.reference | 44 +++++++++++++++++++
 ...016_bit_shift_right_for_string_integer.sql | 44 +++++++++++++++++++
 3 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.reference
 create mode 100644 tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.sql

diff --git a/src/Functions/bitShiftRight.cpp b/src/Functions/bitShiftRight.cpp
index 85e6cfbddaf..58e8f580c5e 100644
--- a/src/Functions/bitShiftRight.cpp
+++ b/src/Functions/bitShiftRight.cpp
@@ -38,7 +38,7 @@ struct BitShiftRightImpl
         else
         {
             UInt8 word_size = 8;
-            if (b >= static_cast<B>((end - pos) * word_size))
+            if (b >= static_cast<B>((end - pos) * word_size) || b < 0)
             {
                 // insert default value
                 out_vec.push_back(0);
diff --git a/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.reference b/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.reference
new file mode 100644
index 00000000000..b381832c771
--- /dev/null
+++ b/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.reference
@@ -0,0 +1,44 @@
+1
+0100100001100101011011000110110001101111
+0010010000110010101101100011011000110111
+0001001000011001010110110001101100011011
+0000100100001100101011011000110110001101
+0000010010000110010101101100011011000110
+0000001001000011001010110110001101100011
+0000000100100001100101011011000110110001
+0000000010010000110010101101100011011000
+01001000011001010110110001101100
+00100100001100101011011000110110
+00010010000110010101101100011011
+00001001000011001010110110001101
+00000100100001100101011011000110
+00000010010000110010101101100011
+00000001001000011001010110110001
+00000000100100001100101011011000
+010010000110010101101100
+001001000011001010110110
+000100100001100101011011
+000010010000110010101101
+000001001000011001010110
+000000100100001100101011
+000000010010000110010101
+000000001001000011001010
+0100100001100101
+0010010000110010
+0001001000011001
+0000100100001100
+0000010010000110
+0000001001000011
+0000000100100001
+0000000010010000
+01001000
+00100100
+00010010
+00001001
+00000100
+00000010
+00000001
+00000000
+
+
+
diff --git a/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.sql b/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.sql
new file mode 100644
index 00000000000..ea1ad4ca4b7
--- /dev/null
+++ b/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.sql
@@ -0,0 +1,44 @@
+SELECT bin('Hello') == bin(bitShiftRight('Hello', 0));
+SELECT bin(bitShiftRight('Hello', 0));
+SELECT bin(bitShiftRight('Hello', 1));
+SELECT bin(bitShiftRight('Hello', 2));
+SELECT bin(bitShiftRight('Hello', 3));
+SELECT bin(bitShiftRight('Hello', 4));
+SELECT bin(bitShiftRight('Hello', 5));
+SELECT bin(bitShiftRight('Hello', 6));
+SELECT bin(bitShiftRight('Hello', 7));
+SELECT bin(bitShiftRight('Hello', 8));
+SELECT bin(bitShiftRight('Hello', 9));
+SELECT bin(bitShiftRight('Hello', 10));
+SELECT bin(bitShiftRight('Hello', 11));
+SELECT bin(bitShiftRight('Hello', 12));
+SELECT bin(bitShiftRight('Hello', 13));
+SELECT bin(bitShiftRight('Hello', 14));
+SELECT bin(bitShiftRight('Hello', 15));
+SELECT bin(bitShiftRight('Hello', 16));
+SELECT bin(bitShiftRight('Hello', 17));
+SELECT bin(bitShiftRight('Hello', 18));
+SELECT bin(bitShiftRight('Hello', 19));
+SELECT bin(bitShiftRight('Hello', 20));
+SELECT bin(bitShiftRight('Hello', 21));
+SELECT bin(bitShiftRight('Hello', 22));
+SELECT bin(bitShiftRight('Hello', 23));
+SELECT bin(bitShiftRight('Hello', 24));
+SELECT bin(bitShiftRight('Hello', 25));
+SELECT bin(bitShiftRight('Hello', 26));
+SELECT bin(bitShiftRight('Hello', 27));
+SELECT bin(bitShiftRight('Hello', 28));
+SELECT bin(bitShiftRight('Hello', 29));
+SELECT bin(bitShiftRight('Hello', 30));
+SELECT bin(bitShiftRight('Hello', 31));
+SELECT bin(bitShiftRight('Hello', 32));
+SELECT bin(bitShiftRight('Hello', 33));
+SELECT bin(bitShiftRight('Hello', 34));
+SELECT bin(bitShiftRight('Hello', 35));
+SELECT bin(bitShiftRight('Hello', 36));
+SELECT bin(bitShiftRight('Hello', 37));
+SELECT bin(bitShiftRight('Hello', 38));
+SELECT bin(bitShiftRight('Hello', 39));
+SELECT bin(bitShiftRight('Hello', 40));
+SELECT bin(bitShiftRight('Hello', 41));
+SELECT bin(bitShiftRight('Hello', 42));

From ff0f049af217fcd04716d7286962e0909e53ad03 Mon Sep 17 00:00:00 2001
From: Roman Zhukov <romanzhukov@yandex-team.ru>
Date: Mon, 30 Aug 2021 09:15:31 +0000
Subject: [PATCH 026/273] revert tests.md

---
 docs/en/development/tests.md | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/docs/en/development/tests.md b/docs/en/development/tests.md
index 776843e53a6..c7c0ec88be4 100644
--- a/docs/en/development/tests.md
+++ b/docs/en/development/tests.md
@@ -66,21 +66,13 @@ See `tests/integration/README.md` on how to run these tests.
 
 Note that integration of ClickHouse with third-party drivers is not tested. Also, we currently do not have integration tests with our JDBC and ODBC drivers.
 
-## Модульные тесты {#unit-tests}
+## Unit Tests {#unit-tests}
 
-Модульные тесты полезны, когда вы хотите протестировать не ClickHouse в целом, а отдельную изолированную библиотеку или класс. Вы можете включить или отключить выполнение тестов при сборке с помощью опции CMake `ENABLE_TESTS`. Модульные тесты (как и другие тестовые программы) расположены в подкаталогах `tests` по всему репозиторию.
+Unit tests are useful when you want to test not the ClickHouse as a whole, but a single isolated library or class. You can enable or disable build of tests with `ENABLE_TESTS` CMake option. Unit tests (and other test programs) are located in `tests` subdirectories across the code. To run unit tests, type `ninja test`. Some tests use `gtest`, but some are just programs that return non-zero exit code on test failure.
 
-Чтобы запустить модульные тесты введите:
+It’s not necessary to have unit tests if the code is already covered by functional tests (and functional tests are usually much more simple to use).
 
-```bash
-ninja test
-```
-
-Некоторые тесты используют `gtest`, но некоторые из них — это просто программы, которые возвращают ненулевой код выхода при сбое теста.
-
-Нет необходимости в модульных тестах, если код уже охвачен функциональными тестами (ведь функциональные тесты обычно намного проще в использовании).
-
-Вы можете запускать отдельные проверки `gtest`, вызвав исполняемый файл напрямую, например:
+You can run individual gtest checks by calling the executable directly, for example:
 
 ```bash
 $ ./src/unit_tests_dbms --gtest_filter=LocalAddress*

From 0cf650615663d9270a2666c5e9f374a1b49d6c63 Mon Sep 17 00:00:00 2001
From: zhangxiao871 <zhangxiao871@ZBMAC-C02DN6312.local>
Date: Mon, 30 Aug 2021 17:29:25 +0800
Subject: [PATCH 027/273] reserve for newPoints.

---
 src/AggregateFunctions/AggregateFunctionSparkbar.h           | 5 +++--
 ...k_bar.reference => 02016_aggregation_spark_bar.reference} | 0
 ...egation_spark_bar.sql => 02016_aggregation_spark_bar.sql} | 0
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename tests/queries/0_stateless/{02012_aggregation_spark_bar.reference => 02016_aggregation_spark_bar.reference} (100%)
 rename tests/queries/0_stateless/{02012_aggregation_spark_bar.sql => 02016_aggregation_spark_bar.sql} (100%)

diff --git a/src/AggregateFunctions/AggregateFunctionSparkbar.h b/src/AggregateFunctions/AggregateFunctionSparkbar.h
index dd1028d5d1f..51c10d05f6f 100644
--- a/src/AggregateFunctions/AggregateFunctionSparkbar.h
+++ b/src/AggregateFunctions/AggregateFunctionSparkbar.h
@@ -170,6 +170,7 @@ private:
 
             std::optional<Float64> new_y;
             std::vector<std::optional<Float64>> newPoints;
+            newPoints.reserve(width);
 
             std::pair<size_t, Float64> bound{0, 0.0};
             size_t cur_bucket_num = 0;
@@ -194,7 +195,7 @@ private:
                     {
                         Float64 avg_y = new_y.value() / multiple_d;
 
-                        newPoints.template emplace_back(avg_y);
+                        newPoints.emplace_back(avg_y);
                         // If min_y has no value, or if the avg_y of the current bucket is less than min_y, update it.
                         if (!min_y || avg_y < min_y)
                             min_y = avg_y;
@@ -203,7 +204,7 @@ private:
                     }
                     else
                     {
-                        newPoints.template emplace_back(std::optional<Float64>());
+                        newPoints.emplace_back();
                     }
 
                     // next bucket
diff --git a/tests/queries/0_stateless/02012_aggregation_spark_bar.reference b/tests/queries/0_stateless/02016_aggregation_spark_bar.reference
similarity index 100%
rename from tests/queries/0_stateless/02012_aggregation_spark_bar.reference
rename to tests/queries/0_stateless/02016_aggregation_spark_bar.reference
diff --git a/tests/queries/0_stateless/02012_aggregation_spark_bar.sql b/tests/queries/0_stateless/02016_aggregation_spark_bar.sql
similarity index 100%
rename from tests/queries/0_stateless/02012_aggregation_spark_bar.sql
rename to tests/queries/0_stateless/02016_aggregation_spark_bar.sql

From a573f28ecb66f9a0197b2eff961c881363f9c433 Mon Sep 17 00:00:00 2001
From: zhangxiao871 <zhangxiao871@ZBMAC-C02DN6312.local>
Date: Mon, 30 Aug 2021 17:59:32 +0800
Subject: [PATCH 028/273] Try fix USE_EMBEDDED_COMPILER error.

---
 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 06911557a96..f26fb6c7bfb 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -1522,7 +1522,7 @@ public:
         {
             using LeftDataType = std::decay_t<decltype(left)>;
             using RightDataType = std::decay_t<decltype(right)>;
-            if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType> || std::is_same_v<DataTypeFixedString, RightDataType>)
+            if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType> || std::is_same_v<DataTypeFixedString, RightDataType> || std::is_same_v<DataTypeString, LeftDataType> || std::is_same_v<DataTypeString, RightDataType>)
                 return false;
             else
             {
@@ -1542,7 +1542,7 @@ public:
         {
             using LeftDataType = std::decay_t<decltype(left)>;
             using RightDataType = std::decay_t<decltype(right)>;
-            if constexpr (!std::is_same_v<DataTypeFixedString, LeftDataType> && !std::is_same_v<DataTypeFixedString, RightDataType>)
+            if constexpr (!std::is_same_v<DataTypeFixedString, LeftDataType> && !std::is_same_v<DataTypeFixedString, RightDataType> && !std::is_same_v<DataTypeString, LeftDataType> && !std::is_same_v<DataTypeString, RightDataType>)
             {
                 using ResultDataType = typename BinaryOperationTraits<Op, LeftDataType, RightDataType>::ResultDataType;
                 using OpSpec = Op<typename LeftDataType::FieldType, typename RightDataType::FieldType>;

From 61091395cd476a6594970de9415f827459f7022a Mon Sep 17 00:00:00 2001
From: Roman Zhukov <romanzhukov@yandex-team.ru>
Date: Mon, 30 Aug 2021 13:35:27 +0000
Subject: [PATCH 029/273] Update bin/unbin

---
 .../functions/encoding-functions.md           |  6 ++---
 .../functions/encoding-functions.md           | 24 +++++++++++++++++--
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/docs/en/sql-reference/functions/encoding-functions.md b/docs/en/sql-reference/functions/encoding-functions.md
index 6fd98510b3a..f34bd1aaf35 100644
--- a/docs/en/sql-reference/functions/encoding-functions.md
+++ b/docs/en/sql-reference/functions/encoding-functions.md
@@ -220,7 +220,7 @@ Alias: `BIN`.
 
 For integer arguments, it prints bin digits from the most significant to least significant (big-endian or “human-readable” order). It starts with the most significant non-zero byte (leading zero bytes are omitted) but always prints eight digits of every byte if the leading digit is zero.
 
-Values of type `Date` and `DateTime` are formatted as corresponding integers (the number of days since Epoch for Date and the value of Unix Timestamp for DateTime).
+Values of type [Date](../../sql-reference/data-types/date.md) and [DateTime](../../sql-reference/data-types/datetime.md) are formatted as corresponding integers (the number of days since Epoch for `Date` and the value of Unix Timestamp for `DateTime`).
 
 For `String` and `FixedString`, all bytes are simply encoded as eight binary numbers. Zero bytes are not omitted.
 
@@ -284,7 +284,7 @@ Result:
 
 ## unbin {#unbinstr}
 
-Interprets each pair of binary digits (in the argument) as a number and converts it to the byte represented by the number. The return value is a binary string (BLOB). The functions performs the opposite operation of [bin](#bin).
+Interprets each pair of binary digits (in the argument) as a number and converts it to the byte represented by the number. The functions performs the opposite operation of [bin](#bin).
 
 **Syntax**
 
@@ -299,7 +299,7 @@ If you want to convert the result to a number, you can use the [reverse](../../s
 !!! note "Note"
     If `unbin` is invoked from within the `clickhouse-client`, binary strings display using UTF-8.
 
-Supports binary digits `0-1`. The number of binary digits does not have to be multiples of eight. If the argument string contains anything other than binary digits, some implementation-defined result is returned (an exception isn’t thrown). For a numeric argument the inverse of bin(N) is not performed by unbin().
+Supports binary digits `0-1`. The number of binary digits does not have to be multiples of eight. If the argument string contains anything other than binary digits, some implementation-defined result is returned (an exception isn’t thrown). For a numeric argument the inverse of `bin(N)` is not performed by `unbin()`.
 
 **Arguments**
 
diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index 95fb8a3e25f..b041804b5f4 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -210,6 +210,8 @@ SELECT reinterpretAsUInt64(reverse(unhex('FFF'))) AS num;
 
 ## bin {#bin}
 
+Возвращает строку, содержащую бинарное представление аргумента.
+
 **Синтаксис**
 
 ``` sql
@@ -218,14 +220,24 @@ bin(arg)
 
 Алиас: `BIN`.
 
+Для целочисленных аргументов возвращаются двоичные числа от наиболее значимого до наименее значимого (`big-endian` или в понятном человеку порядке). Порядок начинается с самого значимого ненулевого байта (начальные нулевые байты опущены), но всегда возвращает восемь цифр каждого байта, если начальная цифра равна нулю.
+
+Значения типа [Date](../../sql-reference/data-types/date.md) и [DateTime](../../sql-reference/data-types/datetime.md) форматируются как соответствующие целые числа (количество дней с момента unix-эпохи для `Date` и значение Unix Timestamp для `DateTime`).
+
+Для `String` и `FixedString` все байты кодируются как восемь двоичных чисел. Нулевые байты не опущены.
+
+Значения `floating-point` and `Decimal` кодируются как их представление в памяти. Поскольку мы поддерживаем архитектуру `little-endian`, они кодируются от младшего к старшему байту. Нулевые начальные конечные байты не опущены.
+
+
+
 
 **Аргументы**
 
--   `arg` — 
+-   `arg` — значение для преобразования в двоичный код. [String](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) или [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Возвращаемое значение**
 
--   Бинарная строка (BLOB).
+-   Бинарная строка (BLOB) — двоичное представление аргумента.
 
 Тип: [String](../../sql-reference/data-types/string.md).
 
@@ -277,6 +289,7 @@ SELECT bin(toFloat64(number)) AS bin_presentation FROM numbers(15, 2);
 
 ## unbin {#unbinstr}
 
+Интерпретирует каждую пару двоичных цифр аргумента как число и преобразует его в байт, представленный числом. Функция выполняет операцию, противоположную [bin](#bin).
 
 **Синтаксис**
 
@@ -286,6 +299,13 @@ unbin(arg)
 
 Алиас: `UNBIN`.
 
+Если вы хотите преобразовать результат в число, вы можете использовать [reverse](../../sql-reference/functions/string-functions.md#reverse)и [reinterpretAs<Type>](../../sql-reference/functions/type-conversion-functions.md#type-conversion-functions) функции.
+
+!!! note "Note"
+    Если `unbin` вызывается из клиента `clickhouse-client`, бинарная строка возвращается в кодировке UTF-8.
+
+Поддерживает двоичные цифры `0-1`. Количество двоичных цифр не обязательно должно быть кратно восьми. Если строка аргумента содержит что-либо, кроме двоичных цифр, возвращается некоторый результат, определенный реализацией (ошибки не возникает). Для числового аргумента обратное значение bin(N), функцией unbin() не выполняется.
+
 **Аргументы**
 
 -   `arg` — 

From 2ce6d2760f8ce28dddb8189a1925500b7cfb62ff Mon Sep 17 00:00:00 2001
From: Roman Zhukov <romanzhukov@yandex-team.ru>
Date: Mon, 30 Aug 2021 14:10:13 +0000
Subject: [PATCH 030/273] Update bin/unbin

---
 .../functions/encoding-functions.md            |  6 +++---
 .../functions/encoding-functions.md            | 18 ++++++------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/docs/en/sql-reference/functions/encoding-functions.md b/docs/en/sql-reference/functions/encoding-functions.md
index f34bd1aaf35..40402126587 100644
--- a/docs/en/sql-reference/functions/encoding-functions.md
+++ b/docs/en/sql-reference/functions/encoding-functions.md
@@ -222,13 +222,13 @@ For integer arguments, it prints bin digits from the most significant to least s
 
 Values of type [Date](../../sql-reference/data-types/date.md) and [DateTime](../../sql-reference/data-types/datetime.md) are formatted as corresponding integers (the number of days since Epoch for `Date` and the value of Unix Timestamp for `DateTime`).
 
-For `String` and `FixedString`, all bytes are simply encoded as eight binary numbers. Zero bytes are not omitted.
+For [String](../../sql-reference/data-types/string.md) and [FixedString](../../sql-reference/data-types/fixedstring.md), all bytes are simply encoded as eight binary numbers. Zero bytes are not omitted.
 
-Values of `floating-point` and `Decimal` types are encoded as their representation in memory. As we support little-endian architecture, they are encoded in little-endian. Zero leading/trailing bytes are not omitted.
+Values of [Float](../../sql-reference/data-types/float) and [Decimal](../../sql-reference/data-types/decimal.md) types are encoded as their representation in memory. As we support little-endian architecture, they are encoded in little-endian. Zero leading/trailing bytes are not omitted.
 
 **Arguments**
 
--   `arg` — A value to convert to binary. [String](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md), or [DateTime](../../sql-reference/data-types/datetime.md).
+-   `arg` — A value to convert to binary. [String](../../sql-reference/data-types/string.md), [FixedString](../../sql-reference/data-types/fixedstring.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md), or [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Returned value**
 
diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index b041804b5f4..c67a8d7c23c 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -224,16 +224,13 @@ bin(arg)
 
 Значения типа [Date](../../sql-reference/data-types/date.md) и [DateTime](../../sql-reference/data-types/datetime.md) форматируются как соответствующие целые числа (количество дней с момента unix-эпохи для `Date` и значение Unix Timestamp для `DateTime`).
 
-Для `String` и `FixedString` все байты кодируются как восемь двоичных чисел. Нулевые байты не опущены.
-
-Значения `floating-point` and `Decimal` кодируются как их представление в памяти. Поскольку мы поддерживаем архитектуру `little-endian`, они кодируются от младшего к старшему байту. Нулевые начальные конечные байты не опущены.
-
-
+Для [String](../../sql-reference/data-types/string.md) и [FixedString](../../sql-reference/data-types/fixedstring.md) все байты кодируются как восемь двоичных чисел. Нулевые байты не опущены.
 
+Значения [Float](../../sql-reference/data-types/float) and [Decimal](../../sql-reference/data-types/decimal.md) кодируются как их представление в памяти. Поскольку мы поддерживаем архитектуру `little-endian`, они кодируются от младшего к старшему байту. Нулевые начальные конечные байты не опущены.
 
 **Аргументы**
 
--   `arg` — значение для преобразования в двоичный код. [String](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) или [DateTime](../../sql-reference/data-types/datetime.md).
+-   `arg` — значение для преобразования в двоичный код. [String](../../sql-reference/data-types/string.md), [FixedString](../../sql-reference/data-types/fixedstring.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) или [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Возвращаемое значение**
 
@@ -301,14 +298,14 @@ unbin(arg)
 
 Если вы хотите преобразовать результат в число, вы можете использовать [reverse](../../sql-reference/functions/string-functions.md#reverse)и [reinterpretAs<Type>](../../sql-reference/functions/type-conversion-functions.md#type-conversion-functions) функции.
 
-!!! note "Note"
+!!! note "Примечание"
     Если `unbin` вызывается из клиента `clickhouse-client`, бинарная строка возвращается в кодировке UTF-8.
 
-Поддерживает двоичные цифры `0-1`. Количество двоичных цифр не обязательно должно быть кратно восьми. Если строка аргумента содержит что-либо, кроме двоичных цифр, возвращается некоторый результат, определенный реализацией (ошибки не возникает). Для числового аргумента обратное значение bin(N), функцией unbin() не выполняется.
+Поддерживает двоичные цифры `0-1`. Количество двоичных цифр не обязательно должно быть кратно восьми. Если строка аргумента содержит что-либо, кроме двоичных цифр, возвращается некоторый результат, определенный реализацией (ошибки не возникает). Для числового аргумента обратное значение `bin(N)`, функцией `unbin()` не выполняется.
 
 **Аргументы**
 
--   `arg` — 
+-   `arg` — строка, содержащая любое количество двоичных цифр. [String](../../sql-reference/data-types/string.md).
 
 **Возвращаемое значение**
 
@@ -347,9 +344,6 @@ SELECT reinterpretAsUInt64(reverse(unbin('1110'))) AS num;
 └─────┘
 ```
 
-
-
-
 ## UUIDStringToNum(str) {#uuidstringtonumstr}
 
 Принимает строку, содержащую 36 символов в формате `123e4567-e89b-12d3-a456-426655440000`, и возвращает в виде набора байт в FixedString(16).

From c54bf838b0fab6b7dead4fd2be0f4b613b12fc51 Mon Sep 17 00:00:00 2001
From: Roman Zhukov <romanzhukov@yandex-team.ru>
Date: Mon, 30 Aug 2021 14:17:20 +0000
Subject: [PATCH 031/273] Update bin/unbin

---
 docs/ru/sql-reference/functions/encoding-functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index c67a8d7c23c..259a0e6c7cf 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -17,7 +17,7 @@ char(number_1, [number_2, ..., number_n]);
 
 **Аргументы**
 
--   `number_1, number_2, ..., number_n` — числовые аргументы, которые интерпретируются как целые числа. Типы: [Int](../../sql-reference/functions/encoding-functions.md), [Float](../../sql-reference/functions/encoding-functions.md).
+-   `number_1, number_2, ..., number_n` — числовые аргументы, которые интерпретируются как целые числа. Типы: [Int](../../sql-reference/functions/encoding-functions.md), [Float](../../sql-reference/data-types/float.md).
 
 **Возвращаемое значение**
 

From 4feafb43889b022c216617b96456bc3a7c6e45ad Mon Sep 17 00:00:00 2001
From: Roman Bug <rrrrrroman@gmail.com>
Date: Tue, 31 Aug 2021 09:32:06 +0300
Subject: [PATCH 032/273] Update
 docs/ru/sql-reference/functions/encoding-functions.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
---
 docs/ru/sql-reference/functions/encoding-functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index 259a0e6c7cf..207a2f63737 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -17,7 +17,7 @@ char(number_1, [number_2, ..., number_n]);
 
 **Аргументы**
 
--   `number_1, number_2, ..., number_n` — числовые аргументы, которые интерпретируются как целые числа. Типы: [Int](../../sql-reference/functions/encoding-functions.md), [Float](../../sql-reference/data-types/float.md).
+-   `number_1, number_2, ..., number_n` — числовые аргументы, которые интерпретируются как целые числа. Типы: [Int](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md).
 
 **Возвращаемое значение**
 

From 3553ae3e13db70461eed73a532024db29d9e8ced Mon Sep 17 00:00:00 2001
From: Roman Bug <rrrrrroman@gmail.com>
Date: Tue, 31 Aug 2021 09:32:25 +0300
Subject: [PATCH 033/273] Update
 docs/ru/sql-reference/functions/encoding-functions.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
---
 docs/ru/sql-reference/functions/encoding-functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index 207a2f63737..7b3b67533d1 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -226,7 +226,7 @@ bin(arg)
 
 Для [String](../../sql-reference/data-types/string.md) и [FixedString](../../sql-reference/data-types/fixedstring.md) все байты кодируются как восемь двоичных чисел. Нулевые байты не опущены.
 
-Значения [Float](../../sql-reference/data-types/float) and [Decimal](../../sql-reference/data-types/decimal.md) кодируются как их представление в памяти. Поскольку мы поддерживаем архитектуру `little-endian`, они кодируются от младшего к старшему байту. Нулевые начальные конечные байты не опущены.
+Значения [Float](../../sql-reference/data-types/float) и [Decimal](../../sql-reference/data-types/decimal.md) кодируются как их представление в памяти. Поскольку ClickHouse поддерживает архитектуру `little-endian`, они кодируются от младшего к старшему байту. Нулевые начальные конечные байты не опущены.
 
 **Аргументы**
 

From 78d2bfeada1107cd112e27b28aff471a2b8910b3 Mon Sep 17 00:00:00 2001
From: Roman Bug <rrrrrroman@gmail.com>
Date: Tue, 31 Aug 2021 09:33:45 +0300
Subject: [PATCH 034/273] Update
 docs/ru/sql-reference/functions/encoding-functions.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
---
 docs/ru/sql-reference/functions/encoding-functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index 7b3b67533d1..c125b8ec6c7 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -296,7 +296,7 @@ unbin(arg)
 
 Алиас: `UNBIN`.
 
-Если вы хотите преобразовать результат в число, вы можете использовать [reverse](../../sql-reference/functions/string-functions.md#reverse)и [reinterpretAs<Type>](../../sql-reference/functions/type-conversion-functions.md#type-conversion-functions) функции.
+Для числового аргумента `unbin()` не возвращает значение, обратное результату `bin()`. Чтобы преобразовать результат в число, используйте функции [reverse](../../sql-reference/functions/string-functions.md#reverse) и [reinterpretAs<Type>](../../sql-reference/functions/type-conversion-functions.md#reinterpretasuint8163264).
 
 !!! note "Примечание"
     Если `unbin` вызывается из клиента `clickhouse-client`, бинарная строка возвращается в кодировке UTF-8.

From 952b993afe744e529ea4dd018cde01f81c2a36e2 Mon Sep 17 00:00:00 2001
From: Roman Bug <rrrrrroman@gmail.com>
Date: Tue, 31 Aug 2021 09:33:54 +0300
Subject: [PATCH 035/273] Update
 docs/ru/sql-reference/functions/encoding-functions.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
---
 docs/ru/sql-reference/functions/encoding-functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index c125b8ec6c7..b9bd61ad891 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -301,7 +301,7 @@ unbin(arg)
 !!! note "Примечание"
     Если `unbin` вызывается из клиента `clickhouse-client`, бинарная строка возвращается в кодировке UTF-8.
 
-Поддерживает двоичные цифры `0-1`. Количество двоичных цифр не обязательно должно быть кратно восьми. Если строка аргумента содержит что-либо, кроме двоичных цифр, возвращается некоторый результат, определенный реализацией (ошибки не возникает). Для числового аргумента обратное значение `bin(N)`, функцией `unbin()` не выполняется.
+Поддерживает двоичные цифры `0-1`. Количество двоичных цифр не обязательно должно быть кратно восьми. Если строка аргумента содержит что-либо, кроме двоичных цифр, возвращается некоторый результат, определенный реализацией (ошибки не возникает). 
 
 **Аргументы**
 

From e0c643777ef1ea93deec8b997962e37558d07c54 Mon Sep 17 00:00:00 2001
From: Roman Bug <rrrrrroman@gmail.com>
Date: Tue, 31 Aug 2021 09:34:05 +0300
Subject: [PATCH 036/273] Update
 docs/ru/sql-reference/functions/encoding-functions.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
---
 docs/ru/sql-reference/functions/encoding-functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index b9bd61ad891..7917c98567b 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -222,7 +222,7 @@ bin(arg)
 
 Для целочисленных аргументов возвращаются двоичные числа от наиболее значимого до наименее значимого (`big-endian` или в понятном человеку порядке). Порядок начинается с самого значимого ненулевого байта (начальные нулевые байты опущены), но всегда возвращает восемь цифр каждого байта, если начальная цифра равна нулю.
 
-Значения типа [Date](../../sql-reference/data-types/date.md) и [DateTime](../../sql-reference/data-types/datetime.md) форматируются как соответствующие целые числа (количество дней с момента unix-эпохи для `Date` и значение Unix Timestamp для `DateTime`).
+Значения типа [Date](../../sql-reference/data-types/date.md) и [DateTime](../../sql-reference/data-types/datetime.md) формируются как соответствующие целые числа (количество дней с момента Unix-эпохи для `Date` и значение Unix Timestamp для `DateTime`).
 
 Для [String](../../sql-reference/data-types/string.md) и [FixedString](../../sql-reference/data-types/fixedstring.md) все байты кодируются как восемь двоичных чисел. Нулевые байты не опущены.
 

From 5bbeb0e9354953bf61c6afa9ed905aad601c7e60 Mon Sep 17 00:00:00 2001
From: Roman Bug <rrrrrroman@gmail.com>
Date: Tue, 31 Aug 2021 09:34:11 +0300
Subject: [PATCH 037/273] Update
 docs/en/sql-reference/functions/encoding-functions.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
---
 docs/en/sql-reference/functions/encoding-functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/functions/encoding-functions.md b/docs/en/sql-reference/functions/encoding-functions.md
index 40402126587..450c2bb18c4 100644
--- a/docs/en/sql-reference/functions/encoding-functions.md
+++ b/docs/en/sql-reference/functions/encoding-functions.md
@@ -294,7 +294,7 @@ unbin(arg)
 
 Alias: `UNBIN`.
 
-If you want to convert the result to a number, you can use the [reverse](../../sql-reference/functions/string-functions.md#reverse) and [reinterpretAs<Type>](../../sql-reference/functions/type-conversion-functions.md#type-conversion-functions) functions.
+For a numeric argument `unbin()` does not return the inverse of `bin()`. If you want to convert the result to a number, you can use the [reverse](../../sql-reference/functions/string-functions.md#reverse) and [reinterpretAs<Type>](../../sql-reference/functions/type-conversion-functions.md#type-conversion-functions) functions.
 
 !!! note "Note"
     If `unbin` is invoked from within the `clickhouse-client`, binary strings display using UTF-8.

From 36e54621420aa70b306435a7e5a25f96903c4234 Mon Sep 17 00:00:00 2001
From: Roman Bug <rrrrrroman@gmail.com>
Date: Tue, 31 Aug 2021 09:34:18 +0300
Subject: [PATCH 038/273] Update
 docs/en/sql-reference/functions/encoding-functions.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
---
 docs/en/sql-reference/functions/encoding-functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/functions/encoding-functions.md b/docs/en/sql-reference/functions/encoding-functions.md
index 450c2bb18c4..f780f5ed9c7 100644
--- a/docs/en/sql-reference/functions/encoding-functions.md
+++ b/docs/en/sql-reference/functions/encoding-functions.md
@@ -299,7 +299,7 @@ For a numeric argument `unbin()` does not return the inverse of `bin()`. If you
 !!! note "Note"
     If `unbin` is invoked from within the `clickhouse-client`, binary strings display using UTF-8.
 
-Supports binary digits `0-1`. The number of binary digits does not have to be multiples of eight. If the argument string contains anything other than binary digits, some implementation-defined result is returned (an exception isn’t thrown). For a numeric argument the inverse of `bin(N)` is not performed by `unbin()`.
+Supports binary digits `0-1`. The number of binary digits does not have to be multiples of eight. If the argument string contains anything other than binary digits, some implementation-defined result is returned (an exception isn’t thrown). 
 
 **Arguments**
 

From 43529c4e094b323c849a44a75a34df2b939255c5 Mon Sep 17 00:00:00 2001
From: Roman Bug <rrrrrroman@gmail.com>
Date: Tue, 31 Aug 2021 09:34:25 +0300
Subject: [PATCH 039/273] Update
 docs/en/sql-reference/functions/encoding-functions.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
---
 docs/en/sql-reference/functions/encoding-functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/functions/encoding-functions.md b/docs/en/sql-reference/functions/encoding-functions.md
index f780f5ed9c7..163cf9fd597 100644
--- a/docs/en/sql-reference/functions/encoding-functions.md
+++ b/docs/en/sql-reference/functions/encoding-functions.md
@@ -284,7 +284,7 @@ Result:
 
 ## unbin {#unbinstr}
 
-Interprets each pair of binary digits (in the argument) as a number and converts it to the byte represented by the number. The functions performs the opposite operation of [bin](#bin).
+Interprets each pair of binary digits (in the argument) as a number and converts it to the byte represented by the number. The functions performs the opposite operation to [bin](#bin).
 
 **Syntax**
 

From ff5f5e9f77156c3a0480d3fe4dcee6bd99a28236 Mon Sep 17 00:00:00 2001
From: Roman Bug <rrrrrroman@gmail.com>
Date: Tue, 31 Aug 2021 09:34:32 +0300
Subject: [PATCH 040/273] Update
 docs/en/sql-reference/functions/encoding-functions.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
---
 docs/en/sql-reference/functions/encoding-functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/functions/encoding-functions.md b/docs/en/sql-reference/functions/encoding-functions.md
index 163cf9fd597..3bb1211d08f 100644
--- a/docs/en/sql-reference/functions/encoding-functions.md
+++ b/docs/en/sql-reference/functions/encoding-functions.md
@@ -297,7 +297,7 @@ Alias: `UNBIN`.
 For a numeric argument `unbin()` does not return the inverse of `bin()`. If you want to convert the result to a number, you can use the [reverse](../../sql-reference/functions/string-functions.md#reverse) and [reinterpretAs<Type>](../../sql-reference/functions/type-conversion-functions.md#type-conversion-functions) functions.
 
 !!! note "Note"
-    If `unbin` is invoked from within the `clickhouse-client`, binary strings display using UTF-8.
+    If `unbin` is invoked from within the `clickhouse-client`, binary strings are displayed using UTF-8.
 
 Supports binary digits `0-1`. The number of binary digits does not have to be multiples of eight. If the argument string contains anything other than binary digits, some implementation-defined result is returned (an exception isn’t thrown). 
 

From b7d647d74b67db15595bd193499ecd9422fcfa68 Mon Sep 17 00:00:00 2001
From: Roman Zhukov <romanzhukov@yandex-team.ru>
Date: Tue, 31 Aug 2021 06:45:22 +0000
Subject: [PATCH 041/273] Fix PR comments.

---
 docs/en/sql-reference/functions/encoding-functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/functions/encoding-functions.md b/docs/en/sql-reference/functions/encoding-functions.md
index 3bb1211d08f..a9238d69fb2 100644
--- a/docs/en/sql-reference/functions/encoding-functions.md
+++ b/docs/en/sql-reference/functions/encoding-functions.md
@@ -294,7 +294,7 @@ unbin(arg)
 
 Alias: `UNBIN`.
 
-For a numeric argument `unbin()` does not return the inverse of `bin()`. If you want to convert the result to a number, you can use the [reverse](../../sql-reference/functions/string-functions.md#reverse) and [reinterpretAs<Type>](../../sql-reference/functions/type-conversion-functions.md#type-conversion-functions) functions.
+For a numeric argument `unbin()` does not return the inverse of `bin()`. If you want to convert the result to a number, you can use the [reverse](../../sql-reference/functions/string-functions.md#reverse) and [reinterpretAs<Type>](../../sql-reference/functions/type-conversion-functions.md#type-conversion-functions.md#reinterpretasuint8163264) functions.
 
 !!! note "Note"
     If `unbin` is invoked from within the `clickhouse-client`, binary strings are displayed using UTF-8.

From 7c3a37ee375e86a371894b13f78b6ad55cd5023f Mon Sep 17 00:00:00 2001
From: Roman Zhukov <romanzhukov@yandex-team.ru>
Date: Tue, 31 Aug 2021 07:25:05 +0000
Subject: [PATCH 042/273] Fix PR comments.

---
 docs/en/sql-reference/functions/encoding-functions.md | 2 +-
 docs/ru/sql-reference/functions/encoding-functions.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/en/sql-reference/functions/encoding-functions.md b/docs/en/sql-reference/functions/encoding-functions.md
index a9238d69fb2..2ef0fda437d 100644
--- a/docs/en/sql-reference/functions/encoding-functions.md
+++ b/docs/en/sql-reference/functions/encoding-functions.md
@@ -224,7 +224,7 @@ Values of type [Date](../../sql-reference/data-types/date.md) and [DateTime](../
 
 For [String](../../sql-reference/data-types/string.md) and [FixedString](../../sql-reference/data-types/fixedstring.md), all bytes are simply encoded as eight binary numbers. Zero bytes are not omitted.
 
-Values of [Float](../../sql-reference/data-types/float) and [Decimal](../../sql-reference/data-types/decimal.md) types are encoded as their representation in memory. As we support little-endian architecture, they are encoded in little-endian. Zero leading/trailing bytes are not omitted.
+Values of [Float](../../sql-reference/data-types/float.md) and [Decimal](../../sql-reference/data-types/decimal.md) types are encoded as their representation in memory. As we support little-endian architecture, they are encoded in little-endian. Zero leading/trailing bytes are not omitted.
 
 **Arguments**
 
diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index 7917c98567b..3a05b461323 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -111,7 +111,7 @@ Values of floating point and Decimal types are encoded as their representation i
 
 **Parameters**
 
--   `arg` — A value to convert to hexadecimal. Types: [String](../../sql-reference/functions/encoding-functions.md), [UInt](../../sql-reference/functions/encoding-functions.md), [Float](../../sql-reference/functions/encoding-functions.md), [Decimal](../../sql-reference/functions/encoding-functions.md), [Date](../../sql-reference/functions/encoding-functions.md) or [DateTime](../../sql-reference/functions/encoding-functions.md).
+-   `arg` — A value to convert to hexadecimal. Types: [String](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Returned value**
 
@@ -226,7 +226,7 @@ bin(arg)
 
 Для [String](../../sql-reference/data-types/string.md) и [FixedString](../../sql-reference/data-types/fixedstring.md) все байты кодируются как восемь двоичных чисел. Нулевые байты не опущены.
 
-Значения [Float](../../sql-reference/data-types/float) и [Decimal](../../sql-reference/data-types/decimal.md) кодируются как их представление в памяти. Поскольку ClickHouse поддерживает архитектуру `little-endian`, они кодируются от младшего к старшему байту. Нулевые начальные конечные байты не опущены.
+Значения [Float](../../sql-reference/data-types/float.md) и [Decimal](../../sql-reference/data-types/decimal.md) кодируются как их представление в памяти. Поскольку ClickHouse поддерживает архитектуру `little-endian`, они кодируются от младшего к старшему байту. Нулевые начальные конечные байты не опущены.
 
 **Аргументы**
 

From 981fdadaa6ca96b84e06d7af7d579895aa98011f Mon Sep 17 00:00:00 2001
From: romanzhukov <romanzhukov@yandex-team.ru>
Date: Tue, 31 Aug 2021 14:24:56 +0300
Subject: [PATCH 043/273] Fix links errors.

---
 docs/en/sql-reference/functions/encoding-functions.md | 2 +-
 docs/ru/sql-reference/functions/encoding-functions.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/sql-reference/functions/encoding-functions.md b/docs/en/sql-reference/functions/encoding-functions.md
index a9238d69fb2..2ef0fda437d 100644
--- a/docs/en/sql-reference/functions/encoding-functions.md
+++ b/docs/en/sql-reference/functions/encoding-functions.md
@@ -224,7 +224,7 @@ Values of type [Date](../../sql-reference/data-types/date.md) and [DateTime](../
 
 For [String](../../sql-reference/data-types/string.md) and [FixedString](../../sql-reference/data-types/fixedstring.md), all bytes are simply encoded as eight binary numbers. Zero bytes are not omitted.
 
-Values of [Float](../../sql-reference/data-types/float) and [Decimal](../../sql-reference/data-types/decimal.md) types are encoded as their representation in memory. As we support little-endian architecture, they are encoded in little-endian. Zero leading/trailing bytes are not omitted.
+Values of [Float](../../sql-reference/data-types/float.md) and [Decimal](../../sql-reference/data-types/decimal.md) types are encoded as their representation in memory. As we support little-endian architecture, they are encoded in little-endian. Zero leading/trailing bytes are not omitted.
 
 **Arguments**
 
diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index 7917c98567b..c5ac4e3eace 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -226,7 +226,7 @@ bin(arg)
 
 Для [String](../../sql-reference/data-types/string.md) и [FixedString](../../sql-reference/data-types/fixedstring.md) все байты кодируются как восемь двоичных чисел. Нулевые байты не опущены.
 
-Значения [Float](../../sql-reference/data-types/float) и [Decimal](../../sql-reference/data-types/decimal.md) кодируются как их представление в памяти. Поскольку ClickHouse поддерживает архитектуру `little-endian`, они кодируются от младшего к старшему байту. Нулевые начальные конечные байты не опущены.
+Значения [Float](../../sql-reference/data-types/float.md) и [Decimal](../../sql-reference/data-types/decimal.md) кодируются как их представление в памяти. Поскольку ClickHouse поддерживает архитектуру `little-endian`, они кодируются от младшего к старшему байту. Нулевые начальные конечные байты не опущены.
 
 **Аргументы**
 

From 1b00ec99a9d6e668972c4e19685bf566c43a07f0 Mon Sep 17 00:00:00 2001
From: Roman Bug <rrrrrroman@gmail.com>
Date: Tue, 31 Aug 2021 15:42:10 +0300
Subject: [PATCH 044/273] Update
 docs/ru/sql-reference/functions/encoding-functions.md

Co-authored-by: Alexey Boykov <33257111+mathalex@users.noreply.github.com>
---
 docs/ru/sql-reference/functions/encoding-functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index 3a05b461323..64c46d6bc50 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -226,7 +226,7 @@ bin(arg)
 
 Для [String](../../sql-reference/data-types/string.md) и [FixedString](../../sql-reference/data-types/fixedstring.md) все байты кодируются как восемь двоичных чисел. Нулевые байты не опущены.
 
-Значения [Float](../../sql-reference/data-types/float.md) и [Decimal](../../sql-reference/data-types/decimal.md) кодируются как их представление в памяти. Поскольку ClickHouse поддерживает архитектуру `little-endian`, они кодируются от младшего к старшему байту. Нулевые начальные конечные байты не опущены.
+Значения [Float](../../sql-reference/data-types/float.md) и [Decimal](../../sql-reference/data-types/decimal.md) кодируются как их представление в памяти. Поскольку ClickHouse поддерживает архитектуру `little-endian`, они кодируются от младшего к старшему байту. Нулевые начальные/конечные байты не опущены.
 
 **Аргументы**
 

From 2cea77c39594b9ade9343991c373874b23ca16c3 Mon Sep 17 00:00:00 2001
From: romanzhukov <romanzhukov@yandex-team.ru>
Date: Tue, 31 Aug 2021 16:54:41 +0300
Subject: [PATCH 045/273] Fix PR comment.

---
 .../functions/encoding-functions.md           | 57 +++++++++----------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index 64c46d6bc50..23d2424f79f 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -73,7 +73,7 @@ SELECT char(0xE4, 0xBD, 0xA0, 0xE5, 0xA5, 0xBD) AS hello;
 
 ## hex {#hex}
 
-Returns a string containing the argument’s hexadecimal representation.
+Возвращает строку, содержащую шестнадцатеричное представление аргумента.
 
 Синоним: `HEX`.
 
@@ -83,25 +83,10 @@ Returns a string containing the argument’s hexadecimal representation.
 hex(arg)
 ```
 
-The function is using uppercase letters `A-F` and not using any prefixes (like `0x`) or suffixes (like `h`).
+Функция использует прописные буквы `A-F` и не использует никаких префиксов (например, `0x`) или суффиксов (например, `h`).
 
-For integer arguments, it prints hex digits («nibbles») from the most significant to least significant (big endian or «human readable» order). It starts with the most significant non-zero byte (leading zero bytes are omitted) but always prints both digits of every byte even if leading digit is zero.
+Для целочисленных аргументов возвращает шестнадцатеричные цифры ("кусочки") от наиболее значимых до наименее значимых (`big endian` или в порядке, понятному человеку).Он начинается с самого значимого ненулевого байта (начальные нулевые байты опущены), но всегда выводит обе цифры каждого байта, даже если начальная цифра равна нулю.
 
-Example:
-
-**Example**
-
-Query:
-
-``` sql
-SELECT hex(1);
-```
-
-Result:
-
-``` text
-01
-```
 
 Values of type `Date` and `DateTime` are formatted as corresponding integers (the number of days since Epoch for Date and the value of Unix Timestamp for DateTime).
 
@@ -109,25 +94,37 @@ For `String` and `FixedString`, all bytes are simply encoded as two hexadecimal
 
 Values of floating point and Decimal types are encoded as their representation in memory. As we support little endian architecture, they are encoded in little endian. Zero leading/trailing bytes are not omitted.
 
-**Parameters**
+**Аргументы**
 
--   `arg` — A value to convert to hexadecimal. Types: [String](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+-   `arg` — значение для преобразования в шестнадцатеричное. [String](../../sql-reference/functions/encoding-functions.md), [UInt](../../sql-reference/functions/encoding-functions.md), [Float](../../sql-reference/functions/encoding-functions.md), [Decimal](../../sql-reference/functions/encoding-functions.md), [Date](../../sql-reference/functions/encoding-functions.md) или [DateTime](../../sql-reference/functions/encoding-functions.md).
 
-**Returned value**
+**Возвращаемое значение**
 
--   A string with the hexadecimal representation of the argument.
+-   Строка — шестнадцатеричное представление аргумента.
 
-Type: `String`.
+Тип: [String](../../sql-reference/functions/encoding-functions.md).
 
-**Example**
+**Примеры**
 
-Query:
+Запрос:
 
 ``` sql
-SELECT hex(toFloat32(number)) as hex_presentation FROM numbers(15, 2);
+SELECT hex(1);
 ```
 
-Result:
+Результат:
+
+``` text
+01
+```
+
+Запрос:
+
+``` sql
+SELECT hex(toFloat32(number)) AS hex_presentation FROM numbers(15, 2);
+```
+
+Результат:
 
 ``` text
 ┌─hex_presentation─┐
@@ -136,13 +133,13 @@ Result:
 └──────────────────┘
 ```
 
-Query:
+Запрос:
 
 ``` sql
-SELECT hex(toFloat64(number)) as hex_presentation FROM numbers(15, 2);
+SELECT hex(toFloat64(number)) AS hex_presentation FROM numbers(15, 2);
 ```
 
-Result:
+Результат:
 
 ``` text
 ┌─hex_presentation─┐

From 42483d31b79e5da26dad429c74e2c6e653c60a2c Mon Sep 17 00:00:00 2001
From: Roman Zhukov <romanzhukov@yandex-team.ru>
Date: Wed, 1 Sep 2021 13:53:12 +0000
Subject: [PATCH 046/273] Fix PR comments.

---
 docs/ru/sql-reference/functions/encoding-functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index 23d2424f79f..2671bfb533d 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -96,7 +96,7 @@ Values of floating point and Decimal types are encoded as their representation i
 
 **Аргументы**
 
--   `arg` — значение для преобразования в шестнадцатеричное. [String](../../sql-reference/functions/encoding-functions.md), [UInt](../../sql-reference/functions/encoding-functions.md), [Float](../../sql-reference/functions/encoding-functions.md), [Decimal](../../sql-reference/functions/encoding-functions.md), [Date](../../sql-reference/functions/encoding-functions.md) или [DateTime](../../sql-reference/functions/encoding-functions.md).
+-   `arg` — значение для преобразования в шестнадцатеричное. [String](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) или [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Возвращаемое значение**
 

From 0726af6d0c3f7076652ba1a9d0213a567a99c1c4 Mon Sep 17 00:00:00 2001
From: Roman Zhukov <romanzhukov@yandex-team.ru>
Date: Wed, 1 Sep 2021 14:08:34 +0000
Subject: [PATCH 047/273] Fix PR comments.

---
 .../sql-reference/functions/encoding-functions.md | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index 2671bfb533d..b37c4160558 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -77,7 +77,7 @@ SELECT char(0xE4, 0xBD, 0xA0, 0xE5, 0xA5, 0xBD) AS hello;
 
 Синоним: `HEX`.
 
-**Syntax**
+**Синтаксис**
 
 ``` sql
 hex(arg)
@@ -87,12 +87,11 @@ hex(arg)
 
 Для целочисленных аргументов возвращает шестнадцатеричные цифры ("кусочки") от наиболее значимых до наименее значимых (`big endian` или в порядке, понятному человеку).Он начинается с самого значимого ненулевого байта (начальные нулевые байты опущены), но всегда выводит обе цифры каждого байта, даже если начальная цифра равна нулю.
 
+Значения типа [Date](../../sql-reference/data-types/date.md) и [DateTime](../../sql-reference/data-types/datetime.md) формируются как соответствующие целые числа (количество дней с момента Unix-эпохи для `Date` и значение Unix Timestamp для `DateTime`).
 
-Values of type `Date` and `DateTime` are formatted as corresponding integers (the number of days since Epoch for Date and the value of Unix Timestamp for DateTime).
+Для [String](../../sql-reference/data-types/string.md) и [FixedString](../../sql-reference/data-types/fixedstring.md), все байты просто кодируются как два шестнадцатеричных числа. Нулевые байты не опущены.
 
-For `String` and `FixedString`, all bytes are simply encoded as two hexadecimal numbers. Zero bytes are not omitted.
-
-Values of floating point and Decimal types are encoded as their representation in memory. As we support little endian architecture, they are encoded in little endian. Zero leading/trailing bytes are not omitted.
+Значения [Float](../../sql-reference/data-types/float.md) и [Decimal](../../sql-reference/data-types/decimal.md) кодируются как их представление в памяти. Поскольку ClickHouse поддерживает архитектуру `little-endian`, они кодируются от младшего к старшему байту. Нулевые начальные/конечные байты не опущены.
 
 **Аргументы**
 
@@ -215,7 +214,7 @@ SELECT reinterpretAsUInt64(reverse(unhex('FFF'))) AS num;
 bin(arg)
 ```
 
-Алиас: `BIN`.
+Синоним: `BIN`.
 
 Для целочисленных аргументов возвращаются двоичные числа от наиболее значимого до наименее значимого (`big-endian` или в понятном человеку порядке). Порядок начинается с самого значимого ненулевого байта (начальные нулевые байты опущены), но всегда возвращает восемь цифр каждого байта, если начальная цифра равна нулю.
 
@@ -291,7 +290,7 @@ SELECT bin(toFloat64(number)) AS bin_presentation FROM numbers(15, 2);
 unbin(arg)
 ```
 
-Алиас: `UNBIN`.
+Синоним: `UNBIN`.
 
 Для числового аргумента `unbin()` не возвращает значение, обратное результату `bin()`. Чтобы преобразовать результат в число, используйте функции [reverse](../../sql-reference/functions/string-functions.md#reverse) и [reinterpretAs<Type>](../../sql-reference/functions/type-conversion-functions.md#reinterpretasuint8163264).
 
@@ -396,7 +395,7 @@ SELECT bitPositionsToArray(toInt8(1)) AS bit_positions;
 Запрос:
 
 ``` sql
-select bitPositionsToArray(toInt8(-1)) as bit_positions;
+select bitPositionsToArray(toInt8(-1)) AS bit_positions;
 ```
 
 Результат:

From 248a97201c17879889184c712432aed93519e2e6 Mon Sep 17 00:00:00 2001
From: Roman Zhukov <romanzhukov@yandex-team.ru>
Date: Wed, 1 Sep 2021 14:26:36 +0000
Subject: [PATCH 048/273] Fix PR comments.

---
 .../functions/encoding-functions.md           | 42 +++++++++----------
 .../functions/encoding-functions.md           |  3 +-
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/docs/en/sql-reference/functions/encoding-functions.md b/docs/en/sql-reference/functions/encoding-functions.md
index 2ef0fda437d..0fccbb5cc09 100644
--- a/docs/en/sql-reference/functions/encoding-functions.md
+++ b/docs/en/sql-reference/functions/encoding-functions.md
@@ -87,7 +87,23 @@ The function is using uppercase letters `A-F` and not using any prefixes (like `
 
 For integer arguments, it prints hex digits (“nibbles”) from the most significant to least significant (big-endian or “human-readable” order). It starts with the most significant non-zero byte (leading zero bytes are omitted) but always prints both digits of every byte even if the leading digit is zero.
 
-**Example**
+Values of type [Date](../../sql-reference/data-types/date.md) and [DateTime](../../sql-reference/data-types/datetime.md) are formatted as corresponding integers (the number of days since Epoch for Date and the value of Unix Timestamp for DateTime).
+
+For [String](../../sql-reference/data-types/string.md) and [FixedString](../../sql-reference/data-types/fixedstring.md), all bytes are simply encoded as two hexadecimal numbers. Zero bytes are not omitted.
+
+Values of [Float](../../sql-reference/data-types/float.md) and [Decimal](../../sql-reference/data-types/decimal.md) types are encoded as their representation in memory. As we support little-endian architecture, they are encoded in little-endian. Zero leading/trailing bytes are not omitted.
+
+**Arguments**
+
+-   `arg` — A value to convert to hexadecimal. Types: [String](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Returned value**
+
+-   A string with the hexadecimal representation of the argument.
+
+Type: [String](../../sql-reference/data-types/string.md).
+
+**Examples**
 
 Query:
 
@@ -101,28 +117,10 @@ Result:
 01
 ```
 
-Values of type `Date` and `DateTime` are formatted as corresponding integers (the number of days since Epoch for Date and the value of Unix Timestamp for DateTime).
-
-For `String` and `FixedString`, all bytes are simply encoded as two hexadecimal numbers. Zero bytes are not omitted.
-
-Values of floating point and Decimal types are encoded as their representation in memory. As we support little-endian architecture, they are encoded in little-endian. Zero leading/trailing bytes are not omitted.
-
-**Arguments**
-
--   `arg` — A value to convert to hexadecimal. Types: [String](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
-
-**Returned value**
-
--   A string with the hexadecimal representation of the argument.
-
-Type: `String`.
-
-**Example**
-
 Query:
 
 ``` sql
-SELECT hex(toFloat32(number)) as hex_presentation FROM numbers(15, 2);
+SELECT hex(toFloat32(number)) AS hex_presentation FROM numbers(15, 2);
 ```
 
 Result:
@@ -137,7 +135,7 @@ Result:
 Query:
 
 ``` sql
-SELECT hex(toFloat64(number)) as hex_presentation FROM numbers(15, 2);
+SELECT hex(toFloat64(number)) AS hex_presentation FROM numbers(15, 2);
 ```
 
 Result:
@@ -396,7 +394,7 @@ Result:
 Query:
 
 ``` sql
-select bitPositionsToArray(toInt8(-1)) as bit_positions;
+SELECT bitPositionsToArray(toInt8(-1)) AS bit_positions;
 ```
 
 Result:
diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index b37c4160558..b0ba81aec06 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -309,7 +309,6 @@ unbin(arg)
 
 Тип: [String](../../sql-reference/data-types/string.md).
 
-
 **Примеры**
 
 Запрос:
@@ -395,7 +394,7 @@ SELECT bitPositionsToArray(toInt8(1)) AS bit_positions;
 Запрос:
 
 ``` sql
-select bitPositionsToArray(toInt8(-1)) AS bit_positions;
+SELECT bitPositionsToArray(toInt8(-1)) AS bit_positions;
 ```
 
 Результат:

From cce799d9b54a6a2f573fb65ff57db2c99f503055 Mon Sep 17 00:00:00 2001
From: Roman Zhukov <romanzhukov@yandex-team.ru>
Date: Wed, 1 Sep 2021 14:28:23 +0000
Subject: [PATCH 049/273] Fix PR comments.

---
 docs/ru/sql-reference/functions/encoding-functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index b0ba81aec06..b0db509a797 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -101,7 +101,7 @@ hex(arg)
 
 -   Строка — шестнадцатеричное представление аргумента.
 
-Тип: [String](../../sql-reference/functions/encoding-functions.md).
+Тип: [String](../../sql-reference/data-types/string.md).
 
 **Примеры**
 

From 81a3ee6584c4c3ab1066b469991c9435ea0157d3 Mon Sep 17 00:00:00 2001
From: Roman Zhukov <romanzhukov@yandex-team.ru>
Date: Wed, 1 Sep 2021 14:41:05 +0000
Subject: [PATCH 050/273] Fix PR comments.

---
 docs/ru/sql-reference/functions/encoding-functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index b0db509a797..ad3aa8d87e6 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -23,7 +23,7 @@ char(number_1, [number_2, ..., number_n]);
 
 -   Строка из соответствующих байт.
 
-Тип: `String`.
+Тип: [String](../../sql-reference/data-types/string.md).
 
 **Пример**
 

From f0414ed7f9f00ab23621c121ab86de21fc3f714d Mon Sep 17 00:00:00 2001
From: romanzhukov <romanzhukov@yandex-team.ru>
Date: Wed, 1 Sep 2021 21:05:22 +0300
Subject: [PATCH 051/273] Fix err arg.

---
 docs/en/sql-reference/functions/encoding-functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/functions/encoding-functions.md b/docs/en/sql-reference/functions/encoding-functions.md
index 0fccbb5cc09..0abf7bb7da9 100644
--- a/docs/en/sql-reference/functions/encoding-functions.md
+++ b/docs/en/sql-reference/functions/encoding-functions.md
@@ -292,7 +292,7 @@ unbin(arg)
 
 Alias: `UNBIN`.
 
-For a numeric argument `unbin()` does not return the inverse of `bin()`. If you want to convert the result to a number, you can use the [reverse](../../sql-reference/functions/string-functions.md#reverse) and [reinterpretAs<Type>](../../sql-reference/functions/type-conversion-functions.md#type-conversion-functions.md#reinterpretasuint8163264) functions.
+For a numeric argument `unbin()` does not return the inverse of `bin()`. If you want to convert the result to a number, you can use the [reverse](../../sql-reference/functions/string-functions.md#reverse) and [reinterpretAs<Type>](../../sql-reference/functions/type-conversion-functions.md#reinterpretasuint8163264) functions.
 
 !!! note "Note"
     If `unbin` is invoked from within the `clickhouse-client`, binary strings are displayed using UTF-8.

From 299fc2604af575b058f996f32bde77c6f4c66a30 Mon Sep 17 00:00:00 2001
From: Alexey <lehasm@gmail.com>
Date: Wed, 1 Sep 2021 18:36:35 +0000
Subject: [PATCH 052/273] Example fixed

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

diff --git a/docs/en/sql-reference/statements/create/function.md b/docs/en/sql-reference/statements/create/function.md
index 8de7e23cfb1..b678d455a81 100644
--- a/docs/en/sql-reference/statements/create/function.md
+++ b/docs/en/sql-reference/statements/create/function.md
@@ -13,6 +13,7 @@ Creates a user defined function from a lambda expression. The expression must co
 CREATE FUNCTION name AS (parameter0, ...) -> expression
 ```
 A function can have an arbitrary number of parameters.
+
 There are a few restrictions.
 
 -   The name of a function must be unique among user defined and system functions.
@@ -43,7 +44,7 @@ Result:
 A [conditional function](../../../sql-reference/functions/conditional-functions.md) is called in a user defined function in the following query:
 
 ```sql
-CREATE FUNCTION parity AS (n) -> if(number % 2, 'odd', 'even');
+CREATE FUNCTION parity AS (n) -> if(n % 2, 'odd', 'even');
 SELECT number, parity(number) FROM numbers(3);
 ```
 

From 610257dcd2959f93e2f42fec34e52e35d01ca738 Mon Sep 17 00:00:00 2001
From: Alexey <lehasm@gmail.com>
Date: Wed, 1 Sep 2021 18:36:47 +0000
Subject: [PATCH 053/273] Translated to Russian

---
 .../statements/create/function.md             | 59 +++++++++++++++++++
 .../sql-reference/statements/create/index.md  |  1 +
 docs/ru/sql-reference/statements/drop.md      | 17 ++++++
 docs/ru/sql-reference/statements/grant.md     |  2 +
 4 files changed, 79 insertions(+)
 create mode 100644 docs/ru/sql-reference/statements/create/function.md

diff --git a/docs/ru/sql-reference/statements/create/function.md b/docs/ru/sql-reference/statements/create/function.md
new file mode 100644
index 00000000000..99c04c8af69
--- /dev/null
+++ b/docs/ru/sql-reference/statements/create/function.md
@@ -0,0 +1,59 @@
+---
+toc_priority: 38
+toc_title: FUNCTION
+---
+
+# CREATE FUNCTION {#create-function}
+
+Создает пользовательскую функцию из лямбда-выражения. Выражение должно состоять из параметров функции, констант, операторов и вызовов других функций.
+
+**Синтаксис**
+
+```sql
+CREATE FUNCTION name AS (parameter0, ...) -> expression
+```
+У функции может быть произвольное число параметров.
+
+Существует несколько ограничений на создаваемые функции.
+
+-   Имя функции должно быть уникальным среди всех пользовательских и системных функций.
+-   Рекурсивные вызовы запрещены.
+-   Все переменные, используемые функцией, должны быть перечислены в списке ее параметров.
+
+Если какое-нибудь ограничение нарушается, то при попытке создать функцию возникает исключение.
+
+**Пример**
+
+Запрос:
+
+```sql
+CREATE FUNCTION linear_equation AS (x, k, b) -> k*x + b;
+SELECT number, linear_equation(number, 2, 1) FROM numbers(3);
+```
+
+Результат:
+
+``` text
+┌─number─┬─linear_equation(number, 2, 1)─┐
+│      0 │                             1 │
+│      1 │                             3 │
+│      2 │                             5 │
+└────────┴───────────────────────────────┘
+```
+
+В следующем запросе пользовательская функция вызывает [условную функцию](../../../sql-reference/functions/conditional-functions.md):
+
+```sql
+CREATE FUNCTION parity AS (n) -> if(n % 2, 'odd', 'even');
+SELECT number, parity(number) FROM numbers(3);
+```
+
+Результат:
+
+``` text
+┌─number─┬─parity(number)─┐
+│      0 │ even           │
+│      1 │ odd            │
+│      2 │ even           │
+└────────┴────────────────┘
+```
diff --git a/docs/ru/sql-reference/statements/create/index.md b/docs/ru/sql-reference/statements/create/index.md
index dfa5c28fff7..61d4d053fec 100644
--- a/docs/ru/sql-reference/statements/create/index.md
+++ b/docs/ru/sql-reference/statements/create/index.md
@@ -12,6 +12,7 @@ toc_title: "Обзор"
 -   [TABLE](../../../sql-reference/statements/create/table.md)
 -   [VIEW](../../../sql-reference/statements/create/view.md)
 -   [DICTIONARY](../../../sql-reference/statements/create/dictionary.md)
+-   [FUNCTION](../../../sql-reference/statements/create/function.md)
 -   [USER](../../../sql-reference/statements/create/user.md)
 -   [ROLE](../../../sql-reference/statements/create/role.md)
 -   [ROW POLICY](../../../sql-reference/statements/create/row-policy.md)
diff --git a/docs/ru/sql-reference/statements/drop.md b/docs/ru/sql-reference/statements/drop.md
index 118f8eb923a..437c2d02a94 100644
--- a/docs/ru/sql-reference/statements/drop.md
+++ b/docs/ru/sql-reference/statements/drop.md
@@ -97,3 +97,20 @@ DROP [SETTINGS] PROFILE [IF EXISTS] name [,...] [ON CLUSTER cluster_name]
 DROP VIEW [IF EXISTS] [db.]name [ON CLUSTER cluster]
 ```
 
+## DROP FUNCTION {#drop-function}
+
+Удаляет пользовательскую функцию, созданную с помощью [CREATE FUNCTION](./create/function.md).
+Удалить системные функции нельзя.
+
+**Синтаксис**
+
+``` sql
+DROP FUNCTION [IF EXISTS] function_name
+```
+
+**Пример**
+
+``` sql
+CREATE FUNCTION linear_equation AS (x, k, b) -> k*x + b;
+DROP FUNCTION linear_equation;
+```
diff --git a/docs/ru/sql-reference/statements/grant.md b/docs/ru/sql-reference/statements/grant.md
index 8d6605e1571..45ba9bb0343 100644
--- a/docs/ru/sql-reference/statements/grant.md
+++ b/docs/ru/sql-reference/statements/grant.md
@@ -109,11 +109,13 @@ GRANT SELECT(x,y) ON db.table TO john WITH GRANT OPTION
         - `CREATE TEMPORARY TABLE`
     - `CREATE VIEW`
     - `CREATE DICTIONARY`
+    - `CREATE FUNCTION`
 - [DROP](#grant-drop)
     - `DROP DATABASE`
     - `DROP TABLE`
     - `DROP VIEW`
     - `DROP DICTIONARY`
+    - `DROP FUNCTION`
 - [TRUNCATE](#grant-truncate)
 - [OPTIMIZE](#grant-optimize)
 - [SHOW](#grant-show)

From c4839e28d32b091cd821ef016d101d8b9f06657f Mon Sep 17 00:00:00 2001
From: George <gyuton@yandex-team.ru>
Date: Thu, 2 Sep 2021 03:48:47 +0300
Subject: [PATCH 054/273] Added documentation

---
 .../mergetree-family/replication.md           |  2 +
 .../settings/merge-tree-settings.md           | 42 +++++++++++++++++++
 docs/en/operations/settings/settings.md       | 42 +++++++++++++++++++
 3 files changed, 86 insertions(+)

diff --git a/docs/en/engines/table-engines/mergetree-family/replication.md b/docs/en/engines/table-engines/mergetree-family/replication.md
index 277339f9b47..8092baba199 100644
--- a/docs/en/engines/table-engines/mergetree-family/replication.md
+++ b/docs/en/engines/table-engines/mergetree-family/replication.md
@@ -288,5 +288,7 @@ If the data in ZooKeeper was lost or damaged, you can save data by moving it to
 -   [background_schedule_pool_size](../../../operations/settings/settings.md#background_schedule_pool_size)
 -   [background_fetches_pool_size](../../../operations/settings/settings.md#background_fetches_pool_size)
 -   [execute_merges_on_single_replica_time_threshold](../../../operations/settings/settings.md#execute-merges-on-single-replica-time-threshold)
+-   [max_replicated_fetches_network_bandwidth](../../../operations/settings/merge-tree-settings.md#max_replicated_fetches_network_bandwidth)
+-   [max_replicated_sends_network_bandwidth](../../../operations/settings/merge-tree-settings.md#max_replicated_sends_network_bandwidth)
 
 [Original article](https://clickhouse.tech/docs/en/operations/table_engines/replication/) <!--hide-->
diff --git a/docs/en/operations/settings/merge-tree-settings.md b/docs/en/operations/settings/merge-tree-settings.md
index 65d63438aea..c96beccb2b3 100644
--- a/docs/en/operations/settings/merge-tree-settings.md
+++ b/docs/en/operations/settings/merge-tree-settings.md
@@ -181,6 +181,48 @@ Possible values:
 
 Default value: 0.
 
+## max_replicated_fetches_network_bandwidth {#max_replicated_fetches_network_bandwidth}
+
+Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) fetches for a table.
+
+The setting isn't followed perfectly accurately.
+
+Possible values:
+
+-   Positive integer.
+-   0 — Unlimited.
+
+Default value: `0`.
+
+**Usage**
+
+Could be used for throttling speed when replicating the data to add or replace new nodes.
+
+**See Also**
+
+-   [max_replicated_fetches_network_bandwidth_for_server](../../operations/settings/settings.md#max_replicated_fetches_network_bandwidth_for_server)
+
+## max_replicated_sends_network_bandwidth {#max_replicated_sends_network_bandwidth}
+
+Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) sends for a table.
+
+The setting isn't followed perfectly accurately.
+
+Possible values:
+
+-   Positive integer.
+-   0 — Unlimited.
+
+Default value: `0`.
+
+**Usage**
+
+Could be used for throttling speed when replicating the data to add or replace new nodes.
+
+**See Also**
+
+-   [max_replicated_sends_network_bandwidth_for_server](../../operations/settings/settings.md#max_replicated_sends_network_bandwidth_for_server)
+
 ## old_parts_lifetime {#old-parts-lifetime}
 
 The time (in seconds) of storing inactive parts to protect against data loss during spontaneous server reboots.
diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index 07bfe158a0a..243f771f957 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -1107,6 +1107,48 @@ Possible values:
 
 Default value: `5`.
 
+## max_replicated_fetches_network_bandwidth_for_server {#max_replicated_fetches_network_bandwidth_for_server}
+
+Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) fetches for the server.
+
+The setting isn't followed perfectly accurately.
+
+Possible values:
+
+-   Positive integer.
+-   0 — Unlimited.
+
+Default value: `0`.
+
+**Usage**
+
+Could be used for throttling speed when replicating the data to add or replace new nodes.
+
+**See Also**
+
+-   [max_replicated_fetches_network_bandwidth](../../operations/merge-tree-settings/settings.md#max_replicated_fetches_network_bandwidth)
+
+## max_replicated_sends_network_bandwidth_for_server {#max_replicated_sends_network_bandwidth_for_server}
+
+Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) sends for the server.
+
+The setting isn't followed perfectly accurately.
+
+Possible values:
+
+-   Positive integer.
+-   0 — Unlimited.
+
+Default value: `0`.
+
+**Usage**
+
+Could be used for throttling speed when replicating the data to add or replace new nodes.
+
+**See Also**
+
+-   [max_replicated_sends_network_bandwidth](../../operations/settings/merge-tree-settings.md#max_replicated_sends_network_bandwidth)
+
 ## connect_timeout_with_failover_ms {#connect-timeout-with-failover-ms}
 
 The timeout in milliseconds for connecting to a remote server for a Distributed table engine, if the ‘shard’ and ‘replica’ sections are used in the cluster definition.

From e968de659ae04b181f1428e5422898d3c366ce29 Mon Sep 17 00:00:00 2001
From: George <gyuton@yandex-team.ru>
Date: Thu, 2 Sep 2021 04:53:21 +0300
Subject: [PATCH 055/273] fixed broken link

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

diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index 243f771f957..286b9611376 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -1126,7 +1126,7 @@ Could be used for throttling speed when replicating the data to add or replace n
 
 **See Also**
 
--   [max_replicated_fetches_network_bandwidth](../../operations/merge-tree-settings/settings.md#max_replicated_fetches_network_bandwidth)
+-   [max_replicated_fetches_network_bandwidth](../../operations/settings/merge-tree-settings.md#max_replicated_fetches_network_bandwidth)
 
 ## max_replicated_sends_network_bandwidth_for_server {#max_replicated_sends_network_bandwidth_for_server}
 

From 163a416366d8ac98171429a07f4fe460ea16af9d Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Sat, 28 Aug 2021 11:43:43 +0800
Subject: [PATCH 056/273] Refactor

---
 src/Common/StackTrace.cpp                   | 22 ++++++++++++---------
 src/Common/StackTrace.h                     |  3 ++-
 src/Common/SymbolIndex.cpp                  | 22 +++++++++++++--------
 src/Common/SymbolIndex.h                    |  4 +++-
 src/Interpreters/InterpreterSystemQuery.cpp |  2 +-
 5 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/src/Common/StackTrace.cpp b/src/Common/StackTrace.cpp
index 3fae1df0bfa..a9d4700490e 100644
--- a/src/Common/StackTrace.cpp
+++ b/src/Common/StackTrace.cpp
@@ -431,16 +431,20 @@ std::string StackTrace::toString(void ** frame_pointers_, size_t offset, size_t
     return toStringStatic(frame_pointers_copy, offset, size);
 }
 
-std::string StackTrace::toStringStatic(const StackTrace::FramePointers & frame_pointers, size_t offset, size_t size, bool reload)
+static SimpleCache<decltype(toStringImpl), &toStringImpl> & cacheInstance()
+{
+    static SimpleCache<decltype(toStringImpl), &toStringImpl> cache;
+    return cache;
+}
+
+std::string StackTrace::toStringStatic(const StackTrace::FramePointers & frame_pointers, size_t offset, size_t size)
 {
     /// Calculation of stack trace text is extremely slow.
     /// We use simple cache because otherwise the server could be overloaded by trash queries.
-    static SimpleCache<decltype(toStringImpl), &toStringImpl> func_cached;
-    /// Reload cached stacktrace instead.
-    if (reload)
-    {
-        func_cached.drop();
-        return "";
-    }
-    return func_cached(frame_pointers, offset, size);
+    return cacheInstance()(frame_pointers, offset, size);
+}
+
+void StackTrace::dropCache()
+{
+    cacheInstance().drop();
 }
diff --git a/src/Common/StackTrace.h b/src/Common/StackTrace.h
index 7e6edabaf0d..62acb70563f 100644
--- a/src/Common/StackTrace.h
+++ b/src/Common/StackTrace.h
@@ -61,7 +61,8 @@ public:
     std::string toString() const;
 
     static std::string toString(void ** frame_pointers, size_t offset, size_t size);
-    static std::string toStringStatic(const FramePointers & frame_pointers, size_t offset, size_t size, bool reload = false);
+    static std::string toStringStatic(const FramePointers & frame_pointers, size_t offset, size_t size);
+    static void dropCache();
     static void symbolize(const FramePointers & frame_pointers, size_t offset, size_t size, StackTrace::Frames & frames);
 
     void toStringEveryLine(std::function<void(const std::string &)> callback) const;
diff --git a/src/Common/SymbolIndex.cpp b/src/Common/SymbolIndex.cpp
index 72ce51cccd0..2d875b7042d 100644
--- a/src/Common/SymbolIndex.cpp
+++ b/src/Common/SymbolIndex.cpp
@@ -462,16 +462,22 @@ String SymbolIndex::getBuildIDHex() const
     return build_id_hex;
 }
 
-MultiVersion<SymbolIndex>::Version SymbolIndex::instance(bool reload)
+MultiVersion<SymbolIndex> & SymbolIndex::instanceImpl()
 {
     static MultiVersion<SymbolIndex> instance(std::unique_ptr<SymbolIndex>(new SymbolIndex));
-    if (reload)
-    {
-        instance.set(std::unique_ptr<SymbolIndex>(new SymbolIndex));
-        /// Also reload stacktrace cache.
-        StackTrace::toStringStatic({}, 0, 0, true);
-    }
-    return instance.get();
+    return instance;
+}
+
+MultiVersion<SymbolIndex>::Version SymbolIndex::instance()
+{
+    return instanceImpl().get();
+}
+
+void SymbolIndex::reload()
+{
+    instanceImpl().set(std::unique_ptr<SymbolIndex>(new SymbolIndex));
+    /// Also drop stacktrace cache.
+    StackTrace::dropCache();
 }
 
 }
diff --git a/src/Common/SymbolIndex.h b/src/Common/SymbolIndex.h
index 65e446a7fc4..37862987bd2 100644
--- a/src/Common/SymbolIndex.h
+++ b/src/Common/SymbolIndex.h
@@ -22,7 +22,8 @@ protected:
     SymbolIndex() { update(); }
 
 public:
-    static MultiVersion<SymbolIndex>::Version instance(bool reload = false);
+    static MultiVersion<SymbolIndex>::Version instance();
+    static void reload();
 
     struct Symbol
     {
@@ -60,6 +61,7 @@ private:
     Data data;
 
     void update();
+    static MultiVersion<SymbolIndex> & instanceImpl();
 };
 
 }
diff --git a/src/Interpreters/InterpreterSystemQuery.cpp b/src/Interpreters/InterpreterSystemQuery.cpp
index d4ac555add0..31c04a7b431 100644
--- a/src/Interpreters/InterpreterSystemQuery.cpp
+++ b/src/Interpreters/InterpreterSystemQuery.cpp
@@ -337,7 +337,7 @@ BlockIO InterpreterSystemQuery::execute()
         {
 #if defined(__ELF__) && !defined(__FreeBSD__)
             getContext()->checkAccess(AccessType::SYSTEM_RELOAD_SYMBOLS);
-            (void)SymbolIndex::instance(true);
+            SymbolIndex::reload();
             break;
 #else
             throw Exception("SYSTEM RELOAD SYMBOLS is not supported on current platform", ErrorCodes::NOT_IMPLEMENTED);

From 7667a209365c635f0ca157efd2bee33bdd133074 Mon Sep 17 00:00:00 2001
From: Alexey <lehasm@gmail.com>
Date: Thu, 2 Sep 2021 18:44:37 +0000
Subject: [PATCH 057/273] Russian fixes

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

diff --git a/docs/ru/sql-reference/statements/create/function.md b/docs/ru/sql-reference/statements/create/function.md
index 99c04c8af69..2364425cdd2 100644
--- a/docs/ru/sql-reference/statements/create/function.md
+++ b/docs/ru/sql-reference/statements/create/function.md
@@ -14,10 +14,10 @@ CREATE FUNCTION name AS (parameter0, ...) -> expression
 ```
 У функции может быть произвольное число параметров.
 
-Существует несколько ограничений на создаваемые функции.
+Существует несколько ограничений на создаваемые функции:
 
 -   Имя функции должно быть уникальным среди всех пользовательских и системных функций.
--   Рекурсивные вызовы запрещены.
+-   Рекурсивные функции запрещены.
 -   Все переменные, используемые функцией, должны быть перечислены в списке ее параметров.
 
 Если какое-нибудь ограничение нарушается, то при попытке создать функцию возникает исключение.

From acf655de165dbe43c981374ba1d749c83e701764 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 3 Sep 2021 10:23:59 +0300
Subject: [PATCH 058/273] Fix insert_quorum_timeout in
 zookeeper_mutations_and_insert_quorum_long

---
 .../01090_zookeeper_mutations_and_insert_quorum_long.sql       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum_long.sql b/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum_long.sql
index 555db6962a7..d8aa75f1349 100644
--- a/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum_long.sql
+++ b/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum_long.sql
@@ -4,7 +4,8 @@ DROP TABLE IF EXISTS mutations_and_quorum2;
 CREATE TABLE mutations_and_quorum1 (`server_date` Date, `something` String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01090/mutations_and_quorum', '1') PARTITION BY toYYYYMM(server_date) ORDER BY (server_date, something);
 CREATE TABLE mutations_and_quorum2 (`server_date` Date, `something` String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01090/mutations_and_quorum', '2') PARTITION BY toYYYYMM(server_date) ORDER BY (server_date, something);
 
-SET insert_quorum=2, insert_quorum_parallel=0, insert_quorum_timeout=3000000;
+-- Should not be larger then 600e6 (default timeout in clickhouse-test)
+SET insert_quorum=2, insert_quorum_parallel=0, insert_quorum_timeout=300e3;
 
 INSERT INTO mutations_and_quorum1 VALUES ('2019-01-01', 'test1'), ('2019-02-01', 'test2'), ('2019-03-01', 'test3'), ('2019-04-01', 'test4'), ('2019-05-01', 'test1'), ('2019-06-01', 'test2'), ('2019-07-01', 'test3'), ('2019-08-01', 'test4'), ('2019-09-01', 'test1'), ('2019-10-01', 'test2'), ('2019-11-01', 'test3'), ('2019-12-01', 'test4');
 

From 9aabf3235e1e43a8e16fc3f5d881ade880a0abd2 Mon Sep 17 00:00:00 2001
From: gyuton <40863448+gyuton@users.noreply.github.com>
Date: Fri, 3 Sep 2021 12:50:38 +0300
Subject: [PATCH 059/273] Apply suggestions from code review

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
---
 docs/en/operations/settings/merge-tree-settings.md | 4 ++--
 docs/en/operations/settings/settings.md            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/en/operations/settings/merge-tree-settings.md b/docs/en/operations/settings/merge-tree-settings.md
index c96beccb2b3..96697c287d8 100644
--- a/docs/en/operations/settings/merge-tree-settings.md
+++ b/docs/en/operations/settings/merge-tree-settings.md
@@ -183,7 +183,7 @@ Default value: 0.
 
 ## max_replicated_fetches_network_bandwidth {#max_replicated_fetches_network_bandwidth}
 
-Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) fetches for a table.
+Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) fetches. This setting is applied to the particular table, unlike the [max_replicated_fetches_network_bandwidth_for_server](settings.md#max_replicated_fetches_network_bandwidth_for_server) setting, which is applied to the server.
 
 The setting isn't followed perfectly accurately.
 
@@ -204,7 +204,7 @@ Could be used for throttling speed when replicating the data to add or replace n
 
 ## max_replicated_sends_network_bandwidth {#max_replicated_sends_network_bandwidth}
 
-Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) sends for a table.
+Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) sends. This setting is applied to the particular table, unlike the [max_replicated_sends_network_bandwidth_for_server](settings.md#max_replicated_sends_network_bandwidth_for_server) setting, which is applied to the server.
 
 The setting isn't followed perfectly accurately.
 
diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index 286b9611376..4d9a1801540 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -1109,7 +1109,7 @@ Default value: `5`.
 
 ## max_replicated_fetches_network_bandwidth_for_server {#max_replicated_fetches_network_bandwidth_for_server}
 
-Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) fetches for the server.
+Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) fetches for the server. Only has meaning at server startup.
 
 The setting isn't followed perfectly accurately.
 
@@ -1130,7 +1130,7 @@ Could be used for throttling speed when replicating the data to add or replace n
 
 ## max_replicated_sends_network_bandwidth_for_server {#max_replicated_sends_network_bandwidth_for_server}
 
-Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) sends for the server.
+Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) sends for the server. Only has meaning at server startup.
 
 The setting isn't followed perfectly accurately.
 

From 6bcfac838ccfa5c74f4fcb1d37d19725b212af53 Mon Sep 17 00:00:00 2001
From: George <gyuton@yandex-team.ru>
Date: Fri, 3 Sep 2021 13:13:03 +0300
Subject: [PATCH 060/273] Updated relations

---
 docs/en/operations/settings/merge-tree-settings.md | 12 ++++--------
 docs/en/operations/settings/settings.md            | 12 ++----------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/docs/en/operations/settings/merge-tree-settings.md b/docs/en/operations/settings/merge-tree-settings.md
index 96697c287d8..fb6238c70b5 100644
--- a/docs/en/operations/settings/merge-tree-settings.md
+++ b/docs/en/operations/settings/merge-tree-settings.md
@@ -185,6 +185,8 @@ Default value: 0.
 
 Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) fetches. This setting is applied to the particular table, unlike the [max_replicated_fetches_network_bandwidth_for_server](settings.md#max_replicated_fetches_network_bandwidth_for_server) setting, which is applied to the server.
 
+You can limit both the server network and a network for a particular table, but for this the value of the table-level setting should be less than server-level one. Otherwise the server considers only the `max_replicated_fetches_network_bandwidth_for_server` setting.
+
 The setting isn't followed perfectly accurately.
 
 Possible values:
@@ -198,14 +200,12 @@ Default value: `0`.
 
 Could be used for throttling speed when replicating the data to add or replace new nodes.
 
-**See Also**
-
--   [max_replicated_fetches_network_bandwidth_for_server](../../operations/settings/settings.md#max_replicated_fetches_network_bandwidth_for_server)
-
 ## max_replicated_sends_network_bandwidth {#max_replicated_sends_network_bandwidth}
 
 Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) sends. This setting is applied to the particular table, unlike the [max_replicated_sends_network_bandwidth_for_server](settings.md#max_replicated_sends_network_bandwidth_for_server) setting, which is applied to the server.
 
+You can limit both the server network and a network for a particular table, but for this the value of the table-level setting should be less than server-level one. Otherwise the server considers only the `max_replicated_sends_network_bandwidth_for_server` setting.
+
 The setting isn't followed perfectly accurately.
 
 Possible values:
@@ -219,10 +219,6 @@ Default value: `0`.
 
 Could be used for throttling speed when replicating the data to add or replace new nodes.
 
-**See Also**
-
--   [max_replicated_sends_network_bandwidth_for_server](../../operations/settings/settings.md#max_replicated_sends_network_bandwidth_for_server)
-
 ## old_parts_lifetime {#old-parts-lifetime}
 
 The time (in seconds) of storing inactive parts to protect against data loss during spontaneous server reboots.
diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index 4d9a1801540..a1d602d8938 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -1109,7 +1109,7 @@ Default value: `5`.
 
 ## max_replicated_fetches_network_bandwidth_for_server {#max_replicated_fetches_network_bandwidth_for_server}
 
-Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) fetches for the server. Only has meaning at server startup.
+Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) fetches for the server. Only has meaning at server startup. You can also limit the speed for a particular table with [max_replicated_fetches_network_bandwidth](../../operations/settings/merge-tree-settings.md#max_replicated_fetches_network_bandwidth) setting.
 
 The setting isn't followed perfectly accurately.
 
@@ -1124,13 +1124,9 @@ Default value: `0`.
 
 Could be used for throttling speed when replicating the data to add or replace new nodes.
 
-**See Also**
-
--   [max_replicated_fetches_network_bandwidth](../../operations/settings/merge-tree-settings.md#max_replicated_fetches_network_bandwidth)
-
 ## max_replicated_sends_network_bandwidth_for_server {#max_replicated_sends_network_bandwidth_for_server}
 
-Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) sends for the server. Only has meaning at server startup.
+Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) sends for the server. Only has meaning at server startup.  You can also limit the speed for a particular table with [max_replicated_sends_network_bandwidth](../../operations/settings/merge-tree-settings.md#max_replicated_sends_network_bandwidth) setting.
 
 The setting isn't followed perfectly accurately.
 
@@ -1145,10 +1141,6 @@ Default value: `0`.
 
 Could be used for throttling speed when replicating the data to add or replace new nodes.
 
-**See Also**
-
--   [max_replicated_sends_network_bandwidth](../../operations/settings/merge-tree-settings.md#max_replicated_sends_network_bandwidth)
-
 ## connect_timeout_with_failover_ms {#connect-timeout-with-failover-ms}
 
 The timeout in milliseconds for connecting to a remote server for a Distributed table engine, if the ‘shard’ and ‘replica’ sections are used in the cluster definition.

From 1f148719ce39aa9a4f493ed0ecc2ede3e9f12272 Mon Sep 17 00:00:00 2001
From: Mike Kot <to@myrrc.dev>
Date: Fri, 3 Sep 2021 13:33:40 +0200
Subject: [PATCH 061/273] Review fixes

---
 src/Storages/MergeTree/MergeTreePartInfo.cpp |  6 +++---
 src/Storages/MergeTree/MergeTreePartInfo.h   | 20 ++++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/Storages/MergeTree/MergeTreePartInfo.cpp b/src/Storages/MergeTree/MergeTreePartInfo.cpp
index 39337fbd4c3..7e140ec2375 100644
--- a/src/Storages/MergeTree/MergeTreePartInfo.cpp
+++ b/src/Storages/MergeTree/MergeTreePartInfo.cpp
@@ -15,10 +15,10 @@ namespace ErrorCodes
 
 MergeTreePartInfo MergeTreePartInfo::fromPartName(const String & part_name, MergeTreeDataFormatVersion format_version)
 {
-    if (auto part_opt = tryParsePartName(part_name, format_version); !part_opt)
-        throw Exception(ErrorCodes::BAD_DATA_PART_NAME, "Unexpected part name: {}", part_name);
-    else
+    if (auto part_opt = tryParsePartName(part_name, format_version))
         return *part_opt;
+    else
+        throw Exception(ErrorCodes::BAD_DATA_PART_NAME, "Unexpected part name: {}", part_name);
 }
 
 void MergeTreePartInfo::validatePartitionID(const String & partition_id, MergeTreeDataFormatVersion format_version)
diff --git a/src/Storages/MergeTree/MergeTreePartInfo.h b/src/Storages/MergeTree/MergeTreePartInfo.h
index bda7c24bab8..73761048035 100644
--- a/src/Storages/MergeTree/MergeTreePartInfo.h
+++ b/src/Storages/MergeTree/MergeTreePartInfo.h
@@ -126,18 +126,22 @@ struct DetachedPartInfo : public MergeTreePartInfo
     bool valid_name;
 
     static constexpr auto DETACH_REASONS = std::to_array<std::string_view>({
-        "broken", "unexpected", "noquorum",
-        "ignored", "broken-on-start", "clone",
-        "attaching", "deleting", "tmp-fetch"
+        "broken",
+        "unexpected",
+        "noquorum",
+        "ignored",
+        "broken-on-start",
+        "clone",
+        "attaching",
+        "deleting",
+        "tmp-fetch"
     });
 
     /// NOTE: It may parse part info incorrectly.
     /// For example, if prefix contains '_' or if DETACH_REASONS doesn't contain prefix.
-    // This method has different semantics with MergeTreePartInfo::tryParsePartName as
-    // the former is used for (1) verifying that a part can be parsed without using the result and (2) parsing part
-    // for later usage.
-    // Detached parts are always parsed regardless of their validity (valid_name is used to check that), so we do not
-    // need an std::optional
+    // This method has different semantics with MergeTreePartInfo::tryParsePartName.
+    // Detached parts are always parsed regardless of their validity.
+    // DetachedPartInfo::valid_name field specifies whether parsing was successful or not.
     static DetachedPartInfo parseDetachedPartName(std::string_view dir_name, MergeTreeDataFormatVersion format_version);
 
 private:

From 7a14deaf8d3a83adf5ae675e6b0a555f9bd35d8e Mon Sep 17 00:00:00 2001
From: George <gyuton@yandex-team.ru>
Date: Fri, 3 Sep 2021 15:53:14 +0300
Subject: [PATCH 062/273] added translation

---
 .../mergetree-family/replication.md           |  3 +-
 .../settings/merge-tree-settings.md           | 38 +++++++++++++++++++
 docs/ru/operations/settings/settings.md       | 34 +++++++++++++++++
 3 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/docs/ru/engines/table-engines/mergetree-family/replication.md b/docs/ru/engines/table-engines/mergetree-family/replication.md
index db749ba455e..a7c1a7d2d1b 100644
--- a/docs/ru/engines/table-engines/mergetree-family/replication.md
+++ b/docs/ru/engines/table-engines/mergetree-family/replication.md
@@ -253,4 +253,5 @@ $ sudo -u clickhouse touch /var/lib/clickhouse/flags/force_restore_data
 -   [background_schedule_pool_size](../../../operations/settings/settings.md#background_schedule_pool_size)
 -   [background_fetches_pool_size](../../../operations/settings/settings.md#background_fetches_pool_size)
 -   [execute_merges_on_single_replica_time_threshold](../../../operations/settings/settings.md#execute-merges-on-single-replica-time-threshold)
-
+-   [max_replicated_fetches_network_bandwidth](../../../operations/settings/merge-tree-settings.md#max_replicated_fetches_network_bandwidth)
+-   [max_replicated_sends_network_bandwidth](../../../operations/settings/merge-tree-settings.md#max_replicated_sends_network_bandwidth)
diff --git a/docs/ru/operations/settings/merge-tree-settings.md b/docs/ru/operations/settings/merge-tree-settings.md
index 88c511d4d80..6da15132524 100644
--- a/docs/ru/operations/settings/merge-tree-settings.md
+++ b/docs/ru/operations/settings/merge-tree-settings.md
@@ -201,6 +201,44 @@ Eсли суммарное число активных кусков во все
 
 Значение по умолчанию: `0`.
 
+## max_replicated_fetches_network_bandwidth {#max_replicated_fetches_network_bandwidth}
+
+Ограничивает максимальную скорость обмена данными в сети в байтах в секунду для [репликационных](../../engines/table-engines/mergetree-family/replication.md) синхронизаций. Настройка применяется к конкретной таблице, в отличие от [max_replicated_fetches_network_bandwidth_for_server](settings.md#max_replicated_fetches_network_bandwidth_for_server), которая применяется к серверу.
+
+Можно ограничить как сеть сервера, так и сеть для конкретной таблицы, но для этого значение табличной настройки должно быть меньше, чем серверной. Иначе сервер будет учитывать только настройку `max_replicated_fetches_network_bandwidth_for_server`.
+
+Значение настройки следуется неточно.
+
+Возможные значения:
+
+-   Любое целое положительное число.
+-   0 — Скорость неограничена.
+
+Значение по умолчанию: `0`.
+
+**Использование**
+
+Может быть использована для тротлинга скорости при репликации данных для добавления или замены новых узлов.
+
+## max_replicated_sends_network_bandwidth {#max_replicated_sends_network_bandwidth}
+
+Ограничивает максимальную скорость обмена данными в сети в байтах в секунду для [репликационных](../../engines/table-engines/mergetree-family/replication.md) отправок. Настройка применяется к конкретной таблице, в отличие от [max_replicated_sends_network_bandwidth_for_server](settings.md#max_replicated_sends_network_bandwidth_for_server), которая применяется к серверу.
+
+Можно ограничить как сеть сервера, так и сеть для конкретной таблицы, но для этого значение табличной настройки должно быть меньше, чем серверной. Иначе сервер будет учитывать только настройку `max_replicated_sends_network_bandwidth_for_server`.
+
+Значение настройки следуется неточно.
+
+Возможные значения:
+
+-   Любое целое положительное число.
+-   0 — Скорость неограничена.
+
+Значение по умолчанию: `0`.
+
+**Использование**
+
+Может быть использована для тротлинга скорости при репликации данных для добавления или замены новых узлов.
+
 ## max_bytes_to_merge_at_max_space_in_pool {#max-bytes-to-merge-at-max-space-in-pool}
 
 Максимальный суммарный размер кусков (в байтах) в одном слиянии, если есть свободные ресурсы в фоновом пуле.
diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index 209c2e2001d..186238c33b3 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -1065,6 +1065,40 @@ SELECT type, query FROM system.query_log WHERE log_comment = 'log_comment test'
 
 Значение по умолчанию: `5`.
 
+## max_replicated_fetches_network_bandwidth_for_server {#max_replicated_fetches_network_bandwidth_for_server}
+
+Ограничивает максимальную скорость обмена данными в сети в байтах в секунду для [репликационных](../../engines/table-engines/mergetree-family/replication.md) синхронизаций. Применяется на старте сервера. Возможно также ограничить скорость для конкретной таблицы с помощью настройки [max_replicated_fetches_network_bandwidth](../../operations/settings/merge-tree-settings.md#max_replicated_fetches_network_bandwidth).
+
+Значение настройки следуется неточно.
+
+Возможные значения:
+
+-   Любое целое положительное число.
+-   0 — Скорость неограничена.
+
+Значение по умолчанию: `0`.
+
+**Использование**
+
+Может быть использована для тротлинга скорости при репликации данных для добавления или замены новых узлов.
+
+## max_replicated_sends_network_bandwidth_for_server {#max_replicated_sends_network_bandwidth_for_server}
+
+Ограничивает максимальную скорость обмена данными в сети в байтах в секунду для [репликационных](../../engines/table-engines/mergetree-family/replication.md) отправок. Применяется на старте сервера. Возможно также ограничить скорость для конкретной таблицы с помощью настройки [max_replicated_sends_network_bandwidth](../../operations/settings/merge-tree-settings.md#max_replicated_sends_network_bandwidth).
+
+Значение настройки следуется неточно.
+
+Возможные значения:
+
+-   Любое целое положительное число.
+-   0 — Скорость неограничена.
+
+Значение по умолчанию: `0`.
+
+**Использование**
+
+Может быть использована для тротлинга скорости при репликации данных для добавления или замены новых узлов.
+
 ## connect_timeout_with_failover_ms {#connect-timeout-with-failover-ms}
 
 Таймаут в миллисекундах на соединение с удалённым сервером, для движка таблиц Distributed, если используются секции shard и replica в описании кластера.

From 213a0a5886745878ee3de703e3c90e7db6c73169 Mon Sep 17 00:00:00 2001
From: George <gyuton@yandex-team.ru>
Date: Fri, 3 Sep 2021 16:36:43 +0300
Subject: [PATCH 063/273] minor fixes

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

diff --git a/docs/en/operations/settings/merge-tree-settings.md b/docs/en/operations/settings/merge-tree-settings.md
index fb6238c70b5..dc90df52183 100644
--- a/docs/en/operations/settings/merge-tree-settings.md
+++ b/docs/en/operations/settings/merge-tree-settings.md
@@ -183,7 +183,7 @@ Default value: 0.
 
 ## max_replicated_fetches_network_bandwidth {#max_replicated_fetches_network_bandwidth}
 
-Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) fetches. This setting is applied to the particular table, unlike the [max_replicated_fetches_network_bandwidth_for_server](settings.md#max_replicated_fetches_network_bandwidth_for_server) setting, which is applied to the server.
+Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) fetches. This setting is applied to a particular table, unlike the [max_replicated_fetches_network_bandwidth_for_server](settings.md#max_replicated_fetches_network_bandwidth_for_server) setting, which is applied to the server.
 
 You can limit both the server network and a network for a particular table, but for this the value of the table-level setting should be less than server-level one. Otherwise the server considers only the `max_replicated_fetches_network_bandwidth_for_server` setting.
 
@@ -202,7 +202,7 @@ Could be used for throttling speed when replicating the data to add or replace n
 
 ## max_replicated_sends_network_bandwidth {#max_replicated_sends_network_bandwidth}
 
-Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) sends. This setting is applied to the particular table, unlike the [max_replicated_sends_network_bandwidth_for_server](settings.md#max_replicated_sends_network_bandwidth_for_server) setting, which is applied to the server.
+Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) sends. This setting is applied to a particular table, unlike the [max_replicated_sends_network_bandwidth_for_server](settings.md#max_replicated_sends_network_bandwidth_for_server) setting, which is applied to the server.
 
 You can limit both the server network and a network for a particular table, but for this the value of the table-level setting should be less than server-level one. Otherwise the server considers only the `max_replicated_sends_network_bandwidth_for_server` setting.
 
diff --git a/docs/ru/operations/settings/merge-tree-settings.md b/docs/ru/operations/settings/merge-tree-settings.md
index 6da15132524..afe828cafa0 100644
--- a/docs/ru/operations/settings/merge-tree-settings.md
+++ b/docs/ru/operations/settings/merge-tree-settings.md
@@ -205,9 +205,9 @@ Eсли суммарное число активных кусков во все
 
 Ограничивает максимальную скорость обмена данными в сети в байтах в секунду для [репликационных](../../engines/table-engines/mergetree-family/replication.md) синхронизаций. Настройка применяется к конкретной таблице, в отличие от [max_replicated_fetches_network_bandwidth_for_server](settings.md#max_replicated_fetches_network_bandwidth_for_server), которая применяется к серверу.
 
-Можно ограничить как сеть сервера, так и сеть для конкретной таблицы, но для этого значение табличной настройки должно быть меньше, чем серверной. Иначе сервер будет учитывать только настройку `max_replicated_fetches_network_bandwidth_for_server`.
+Можно ограничить как сеть сервера, так и сеть для конкретной таблицы, но для этого значение табличной настройки должно быть меньше серверной. Иначе сервер будет учитывать только настройку `max_replicated_fetches_network_bandwidth_for_server`.
 
-Значение настройки следуется неточно.
+Настройка следуется неточно.
 
 Возможные значения:
 
@@ -224,9 +224,9 @@ Eсли суммарное число активных кусков во все
 
 Ограничивает максимальную скорость обмена данными в сети в байтах в секунду для [репликационных](../../engines/table-engines/mergetree-family/replication.md) отправок. Настройка применяется к конкретной таблице, в отличие от [max_replicated_sends_network_bandwidth_for_server](settings.md#max_replicated_sends_network_bandwidth_for_server), которая применяется к серверу.
 
-Можно ограничить как сеть сервера, так и сеть для конкретной таблицы, но для этого значение табличной настройки должно быть меньше, чем серверной. Иначе сервер будет учитывать только настройку `max_replicated_sends_network_bandwidth_for_server`.
+Можно ограничить как сеть сервера, так и сеть для конкретной таблицы, но для этого значение табличной настройки должно быть меньше серверной. Иначе сервер будет учитывать только настройку `max_replicated_sends_network_bandwidth_for_server`.
 
-Значение настройки следуется неточно.
+Настройка следуется неточно.
 
 Возможные значения:
 

From 6ee94c923fc4e718c9cecb7f33e4663851aa4f99 Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Sat, 4 Sep 2021 00:43:15 +0300
Subject: [PATCH 064/273] Fix

---
 .../static-files-disk-uploader.cpp            |  24 ++--
 src/Disks/DiskWebServer.cpp                   |  68 +++++------
 src/Disks/DiskWebServer.h                     |  25 ++--
 src/Disks/ReadIndirectBufferFromWebServer.cpp |   7 +-
 src/Storages/MergeTree/MergeTreeData.cpp      |  11 +-
 .../configs/storage_conf_web.xml              |   1 -
 .../test_disk_over_web_server/test.py         |   2 +-
 utils/s3tools/s3uploader                      | 108 ++++++++++++++----
 8 files changed, 154 insertions(+), 92 deletions(-)

diff --git a/programs/static-files-disk-uploader/static-files-disk-uploader.cpp b/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
index 95611771b58..9e44b42dc86 100644
--- a/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
+++ b/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
@@ -16,7 +16,7 @@
 namespace fs = std::filesystem;
 
 #define UUID_PATTERN "[\\w]{8}-[\\w]{4}-[\\w]{4}-[\\w]{4}-[\\w]{12}"
-#define EXTRACT_UUID_PATTERN fmt::format(".*/({})/.*", UUID_PATTERN)
+#define EXTRACT_UUID_PATTERN fmt::format(".*\\/({})\\/.*", UUID_PATTERN)
 
 
 namespace DB
@@ -32,19 +32,20 @@ namespace ErrorCodes
  * If test-mode option is added, files will be put by given url via PUT request.
  */
 
-void processTableFiles(const fs::path & path, const String & files_prefix, String uuid,
+void processTableFiles(const fs::path & path, String root_path, String uuid,
         WriteBuffer & metadata_buf, std::function<std::shared_ptr<WriteBuffer>(const String &)> create_dst_buf)
 {
     fs::directory_iterator dir_end;
     auto process_file = [&](const String & file_name, const String & file_path)
     {
-        auto remote_file_name = files_prefix + "-" + uuid + "-" + file_name;
+        auto remote_file_name = uuid + "/" + file_name;
         writeText(remote_file_name, metadata_buf);
         writeChar('\t', metadata_buf);
         writeIntText(fs::file_size(file_path), metadata_buf);
         writeChar('\n', metadata_buf);
 
         auto src_buf = createReadBufferFromFileBase(file_path, {}, fs::file_size(file_path));
+        fs::create_directories((fs::path(root_path) / remote_file_name).parent_path());
         auto dst_buf = create_dst_buf(remote_file_name);
 
         copyData(*src_buf, *dst_buf);
@@ -58,7 +59,7 @@ void processTableFiles(const fs::path & path, const String & files_prefix, Strin
         {
             fs::directory_iterator files_end;
             for (fs::directory_iterator file_it(dir_it->path()); file_it != files_end; ++file_it)
-                process_file(dir_it->path().filename().string() + "-" + file_it->path().filename().string(), file_it->path());
+                process_file(dir_it->path().filename() / file_it->path().filename(), file_it->path());
         }
         else
         {
@@ -80,8 +81,7 @@ try
         ("metadata-path", po::value<std::string>(), "Metadata path (select data_paths from system.tables where name='table_name'")
         ("test-mode", "Use test mode, which will put data on given url via PUT")
         ("url", po::value<std::string>(), "Web server url for test mode")
-        ("output-dir", po::value<std::string>(), "Directory to put files in non-test mode")
-        ("files-prefix", po::value<std::string>(), "Prefix for stored files");
+        ("output-dir", po::value<std::string>(), "Directory to put files in non-test mode");
 
     po::parsed_options parsed = po::command_line_parser(argc, argv).options(description).run();
     po::variables_map options;
@@ -94,18 +94,13 @@ try
         exit(0);
     }
 
-    String url, metadata_path, files_prefix;
+    String url, metadata_path;
 
     if (options.count("metadata-path"))
         metadata_path = options["metadata-path"].as<std::string>();
     else
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "No metadata-path option passed");
 
-    if (options.count("files-prefix"))
-        files_prefix = options["files-prefix"].as<std::string>();
-    else
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "No files-prefix option passed");
-
     fs::path fs_path = fs::weakly_canonical(metadata_path);
     if (!fs::exists(fs_path))
     {
@@ -121,7 +116,8 @@ try
     std::function<std::shared_ptr<WriteBuffer>(const String &)> create_dst_buf;
     String root_path;
 
-    if (options.count("test-mode"))
+    auto test_mode = options.contains("test-mode");
+    if (test_mode)
     {
         if (options.count("url"))
             url = options["url"].as<std::string>();
@@ -149,7 +145,7 @@ try
         };
     }
 
-    processTableFiles(fs_path, files_prefix, uuid, *metadata_buf, create_dst_buf);
+    processTableFiles(fs_path, root_path, uuid, *metadata_buf, create_dst_buf);
     metadata_buf->next();
     metadata_buf->finalize();
 
diff --git a/src/Disks/DiskWebServer.cpp b/src/Disks/DiskWebServer.cpp
index 5958b29b23b..22d49157383 100644
--- a/src/Disks/DiskWebServer.cpp
+++ b/src/Disks/DiskWebServer.cpp
@@ -18,14 +18,11 @@
 
 
 #define UUID_PATTERN "[\\w]{8}-[\\w]{4}-[\\w]{4}-[\\w]{4}-[\\w]{12}"
-#define EXTRACT_UUID_PATTERN fmt::format(".*/({})/.*", UUID_PATTERN)
+#define EXTRACT_UUID_PATTERN fmt::format(".*/({})\\/.*", UUID_PATTERN)
 
-#define DIRECTORY_FILE_PATTERN(prefix) fmt::format("{}-({})-(\\w+)-(.*)", prefix, UUID_PATTERN)
-#define ROOT_FILE_PATTERN(prefix) fmt::format("{}-({})-(\\w+\\.\\w+)", prefix, UUID_PATTERN)
-
-#define MATCH_DIRECTORY_FILE_PATTERN fmt::format(".*/({})/(\\w+)/(.*)", UUID_PATTERN)
-#define MATCH_DIRECTORY_PATTERN fmt::format(".*/({})/(\\w+)/", UUID_PATTERN)
-#define MATCH_ROOT_FILE_PATTERN fmt::format(".*/({})/(\\w+\\.\\w+)", UUID_PATTERN)
+#define MATCH_DIRECTORY_FILE_PATTERN fmt::format(".*({})\\/(\\w+)\\/(.*)", UUID_PATTERN)
+#define MATCH_DIRECTORY_PATTERN fmt::format(".*({})\\/(\\w+)\\/", UUID_PATTERN)
+#define MATCH_ROOT_FILE_PATTERN fmt::format(".*({})\\/(\\w+\\.\\w+)", UUID_PATTERN)
 
 
 namespace DB
@@ -40,7 +37,7 @@ namespace ErrorCodes
 }
 
 
-void DiskWebServer::Metadata::initialize(const String & uri_with_path, const String & files_prefix, const String & table_uuid, ContextPtr context) const
+void DiskWebServer::Metadata::initialize(const String & uri_with_path, const String & table_uuid, ContextPtr context) const
 {
     ReadWriteBufferFromHTTP metadata_buf(Poco::URI(fs::path(uri_with_path) / (".index-" + table_uuid)),
                                          Poco::Net::HTTPRequest::HTTP_GET,
@@ -58,20 +55,20 @@ void DiskWebServer::Metadata::initialize(const String & uri_with_path, const Str
         LOG_DEBUG(&Poco::Logger::get("DiskWeb"), "Read file: {}, size: {}", remote_file_name, file_size);
 
         /*
-         * URI/   {prefix}-{uuid}-all_x_x_x-{file}
+         * URI/   {uri}/{uuid}/all_x_x_x/{file}
          *        ...
-         *        {prefix}-{uuid}-format_version.txt
-         *        {prefix}-{uuid}-detached-{file}
+         *        {uri}/{uuid}/format_version.txt
+         *        {uri}/{uuid}/detached-{file}
          *        ...
         **/
-        if (RE2::FullMatch(remote_file_name, DIRECTORY_FILE_PATTERN(files_prefix), &uuid, &directory, &file))
+        if (RE2::FullMatch(remote_file_name, MATCH_DIRECTORY_FILE_PATTERN, &uuid, &directory, &file))
         {
             if (uuid != table_uuid)
                 throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected uuid: {}, expected: {}", uuid, table_uuid);
 
             tables_data[uuid][directory].emplace(std::make_pair(file, file_size));
         }
-        else if (RE2::FullMatch(remote_file_name, ROOT_FILE_PATTERN(files_prefix), &uuid, &file))
+        else if (RE2::FullMatch(remote_file_name, MATCH_ROOT_FILE_PATTERN, &uuid, &file))
         {
             if (uuid != table_uuid)
                 throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected uuid: {}, expected: {}", uuid, table_uuid);
@@ -148,15 +145,6 @@ private:
 };
 
 
-class WriteBufferFromNothing : public WriteBufferFromFile
-{
-public:
-    WriteBufferFromNothing() : WriteBufferFromFile("/dev/null") {}
-
-    void sync() override {}
-};
-
-
 DiskWebServer::DiskWebServer(
             const String & disk_name_,
             const String & uri_,
@@ -173,16 +161,16 @@ DiskWebServer::DiskWebServer(
 }
 
 
-String DiskWebServer::getFileName(const String & path) const
+String DiskWebServer::getFileName(const String & path)
 {
     String result;
 
     if (RE2::FullMatch(path, MATCH_DIRECTORY_FILE_PATTERN)
-        && RE2::Extract(path, MATCH_DIRECTORY_FILE_PATTERN, fmt::format(R"({}-\1-\2-\3)", settings->files_prefix), &result))
+        && RE2::Extract(path, MATCH_DIRECTORY_FILE_PATTERN, R"(\1/\2/\3)", &result))
         return result;
 
     if (RE2::FullMatch(path, MATCH_ROOT_FILE_PATTERN)
-        && RE2::Extract(path, MATCH_ROOT_FILE_PATTERN, fmt::format(R"({}-\1-\2)", settings->files_prefix), &result))
+        && RE2::Extract(path, MATCH_ROOT_FILE_PATTERN, R"(\1/\2)", &result))
         return result;
 
     throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected file: {}", path);
@@ -203,6 +191,22 @@ bool DiskWebServer::findFileInMetadata(const String & path, File & file_info) co
         if (!metadata.tables_data.count(table_uuid))
             return false;
 
+        try
+        {
+            if (!metadata.tables_data.count(table_uuid))
+                metadata.initialize(uri, table_uuid, getContext());
+        }
+        catch (const Poco::Exception &)
+        {
+            const auto message = getCurrentExceptionMessage(false);
+            bool can_throw = CurrentThread::isInitialized() && CurrentThread::get().getQueryContext();
+            if (can_throw)
+                throw Exception(ErrorCodes::NETWORK_ERROR, "Cannot load disk metadata. Error: {}", message);
+
+            LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Cannot load disk metadata. Error: {}", message);
+            return false;
+        }
+
         if (!metadata.tables_data[table_uuid].count(directory_name))
             return false;
 
@@ -250,15 +254,6 @@ std::unique_ptr<ReadBufferFromFileBase> DiskWebServer::readFile(const String & p
 }
 
 
-std::unique_ptr<WriteBufferFromFileBase> DiskWebServer::writeFile(const String & path, size_t, WriteMode)
-{
-    if (path.ends_with("format_version.txt"))
-        return std::make_unique<WriteBufferFromNothing>();
-
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
-}
-
-
 DiskDirectoryIteratorPtr DiskWebServer::iterateDirectory(const String & path)
 {
     LOG_DEBUG(log, "Iterate directory: {}", path);
@@ -276,7 +271,7 @@ DiskDirectoryIteratorPtr DiskWebServer::iterateDirectory(const String & path)
     try
     {
         if (!metadata.tables_data.count(uuid))
-            metadata.initialize(uri, settings->files_prefix, uuid, getContext());
+            metadata.initialize(uri, uuid, getContext());
     }
     catch (const Poco::Exception &)
     {
@@ -340,8 +335,7 @@ void registerDiskWebServer(DiskFactory & factory)
 
         auto settings = std::make_unique<DiskWebServerSettings>(
             context->getGlobalContext()->getSettingsRef().http_max_single_read_retries,
-            config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024),
-            config.getString(config_prefix + ".files_prefix", disk_name));
+            config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024));
 
         String metadata_path = fs::path(context->getPath()) / "disks" / disk_name / "";
 
diff --git a/src/Disks/DiskWebServer.h b/src/Disks/DiskWebServer.h
index ccf780796e7..2b8a665c75b 100644
--- a/src/Disks/DiskWebServer.h
+++ b/src/Disks/DiskWebServer.h
@@ -19,25 +19,21 @@ struct DiskWebServerSettings
     size_t max_read_tries;
     /// Passed to SeekAvoidingReadBuffer.
     size_t min_bytes_for_seek;
-    String files_prefix;
 
-    DiskWebServerSettings(size_t max_read_tries_, size_t min_bytes_for_seek_, String files_prefix_)
-        : max_read_tries(max_read_tries_) , min_bytes_for_seek(min_bytes_for_seek_), files_prefix(files_prefix_) {}
+    DiskWebServerSettings(size_t max_read_tries_, size_t min_bytes_for_seek_)
+        : max_read_tries(max_read_tries_) , min_bytes_for_seek(min_bytes_for_seek_) {}
 };
 
 
 /*
- * Quick ready test - you can try this disk, by using these queries (disk has two tables) and this endpoint:
- *
- *  ATTACH TABLE contributors UUID 'a563f7d8-fb00-4d50-a563-f7d8fb007d50' (good_person_name String) engine=MergeTree() order by good_person_name settings storage_policy='web';
- *  ATTACH TABLE test UUID '11c7a2f9-a949-4c88-91c7-a2f9a949ec88' (a Int32) engine=MergeTree() order by a settings storage_policy='web';
+ * Quick ready test: ATTACH TABLE test_hits UUID 'dbeecc07-58f3-4e89-9bee-cc0758f34e89'  ( WatchID UInt64,  JavaEnable UInt8,  Title String,  GoodEvent Int16,  EventTime DateTime,  EventDate Date,  CounterID UInt32,  ClientIP UInt32,  ClientIP6 FixedString(16),  RegionID UInt32,  UserID UInt64,  CounterClass Int8,  OS UInt8,  UserAgent UInt8,  URL String,  Referer String,  URLDomain String,  RefererDomain String,  Refresh UInt8,  IsRobot UInt8,  RefererCategories Array(UInt16),  URLCategories Array(UInt16), URLRegions Array(UInt32),  RefererRegions Array(UInt32),  ResolutionWidth UInt16,  ResolutionHeight UInt16,  ResolutionDepth UInt8,  FlashMajor UInt8, FlashMinor UInt8,  FlashMinor2 String,  NetMajor UInt8,  NetMinor UInt8, UserAgentMajor UInt16,  UserAgentMinor FixedString(2),  CookieEnable UInt8, JavascriptEnable UInt8,  IsMobile UInt8,  MobilePhone UInt8,  MobilePhoneModel String,  Params String,  IPNetworkID UInt32,  TraficSourceID Int8, SearchEngineID UInt16,  SearchPhrase String,  AdvEngineID UInt8,  IsArtifical UInt8,  WindowClientWidth UInt16,  WindowClientHeight UInt16,  ClientTimeZone Int16,  ClientEventTime DateTime,  SilverlightVersion1 UInt8, SilverlightVersion2 UInt8,  SilverlightVersion3 UInt32,  SilverlightVersion4 UInt16,  PageCharset String,  CodeVersion UInt32,  IsLink UInt8,  IsDownload UInt8,  IsNotBounce UInt8,  FUniqID UInt64,  HID UInt32,  IsOldCounter UInt8, IsEvent UInt8,  IsParameter UInt8,  DontCountHits UInt8,  WithHash UInt8, HitColor FixedString(1),  UTCEventTime DateTime,  Age UInt8,  Sex UInt8,  Income UInt8,  Interests UInt16,  Robotness UInt8,  GeneralInterests Array(UInt16), RemoteIP UInt32,  RemoteIP6 FixedString(16),  WindowName Int32,  OpenerName Int32,  HistoryLength Int16,  BrowserLanguage FixedString(2),  BrowserCountry FixedString(2),  SocialNetwork String,  SocialAction String,  HTTPError UInt16, SendTiming Int32,  DNSTiming Int32,  ConnectTiming Int32,  ResponseStartTiming Int32,  ResponseEndTiming Int32,  FetchTiming Int32,  RedirectTiming Int32, DOMInteractiveTiming Int32,  DOMContentLoadedTiming Int32,  DOMCompleteTiming Int32,  LoadEventStartTiming Int32,  LoadEventEndTiming Int32, NSToDOMContentLoadedTiming Int32,  FirstPaintTiming Int32,  RedirectCount Int8, SocialSourceNetworkID UInt8,  SocialSourcePage String,  ParamPrice Int64, ParamOrderID String,  ParamCurrency FixedString(3),  ParamCurrencyID UInt16, GoalsReached Array(UInt32),  OpenstatServiceName String,  OpenstatCampaignID String,  OpenstatAdID String,  OpenstatSourceID String,  UTMSource String, UTMMedium String,  UTMCampaign String,  UTMContent String,  UTMTerm String, FromTag String,  HasGCLID UInt8,  RefererHash UInt64,  URLHash UInt64,  CLID UInt32,  YCLID UInt64,  ShareService String,  ShareURL String,  ShareTitle String,  ParsedParams Nested(Key1 String,  Key2 String, Key3 String, Key4 String, Key5 String,  ValueDouble Float64),  IslandID FixedString(16),  RequestNum UInt32,  RequestTry UInt8)
+ *                   ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS  storage_policy='web';
  *
  *   <storage_configuration>
  *       <disks>
  *           <web>
  *               <type>web</type>
- *               <endpoint>https://clickhouse-datasets.s3.yandex.net/kssenii-static-files-disk-test/kssenii-disk-tests/test1/</endpoint>
- *               <files_prefix>data</files_prefix>
+                 <endpoint>https://clickhouse-datasets.s3.yandex.net/test-hits/</endpoint>
  *           </web>
  *       </disks>
  *       <policies>
@@ -52,7 +48,7 @@ struct DiskWebServerSettings
  *   </storage_configuration>
  *
  * To get files for upload run:
- * clickhouse static-files-disk-uploader --metadata-path <path> --output-dir <dir> --files-prefix data
+ * clickhouse static-files-disk-uploader --metadata-path <path> --output-dir <dir>
  * (--metadata-path can be found in query: `select data_paths from system.tables where name='<table_name>';`)
  *
  * If url is not reachable on disk load when server is starting up tables, then all errors are caught.
@@ -96,7 +92,7 @@ public:
 
         Metadata() = default;
 
-        void initialize(const String & uri_with_path, const String & files_prefix, const String & uuid, ContextPtr context) const;
+        void initialize(const String & uri_with_path, const String & uuid, ContextPtr context) const;
     };
 
     using UUIDDirectoryListing = std::unordered_map<String, RootDirectory>;
@@ -107,7 +103,7 @@ public:
 
     bool supportZeroCopyReplication() const override { return false; }
 
-    String getFileName(const String & path) const;
+    static String getFileName(const String & path);
 
     DiskType getType() const override { return DiskType::WebServer; }
 
@@ -151,7 +147,10 @@ public:
 
     /// Write and modification part
 
-    std::unique_ptr<WriteBufferFromFileBase> writeFile(const String &, size_t, WriteMode) override;
+    std::unique_ptr<WriteBufferFromFileBase> writeFile(const String &, size_t, WriteMode) override
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
+    }
 
     void moveFile(const String &, const String &) override
     {
diff --git a/src/Disks/ReadIndirectBufferFromWebServer.cpp b/src/Disks/ReadIndirectBufferFromWebServer.cpp
index 89644e12e8c..ec5c236aec4 100644
--- a/src/Disks/ReadIndirectBufferFromWebServer.cpp
+++ b/src/Disks/ReadIndirectBufferFromWebServer.cpp
@@ -38,13 +38,18 @@ std::unique_ptr<ReadBuffer> ReadIndirectBufferFromWebServer::initialize()
 
     ReadWriteBufferFromHTTP::HTTPHeaderEntries headers;
     headers.emplace_back(std::make_pair("Range", fmt::format("bytes={}-", offset)));
+    const auto & settings = context->getSettingsRef();
     LOG_DEBUG(log, "Reading from offset: {}", offset);
 
     return std::make_unique<ReadWriteBufferFromHTTP>(
         uri,
         Poco::Net::HTTPRequest::HTTP_GET,
         ReadWriteBufferFromHTTP::OutStreamCallback(),
-        ConnectionTimeouts::getHTTPTimeouts(context),
+        ConnectionTimeouts(std::max(Poco::Timespan(settings.http_connection_timeout.totalSeconds(), 0), Poco::Timespan(20, 0)),
+                           settings.http_send_timeout,
+                           std::max(Poco::Timespan(settings.http_receive_timeout.totalSeconds(), 0), Poco::Timespan(20, 0)),
+                           settings.tcp_keep_alive_timeout,
+                           std::max(Poco::Timespan(settings.http_receive_timeout.totalSeconds(), 0), Poco::Timespan(20, 0))),
         0,
         Poco::Net::HTTPBasicCredentials{},
         buf_size,
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index 4050d3fba0b..55f931c1d4d 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -278,10 +278,13 @@ MergeTreeData::MergeTreeData(
     if (!attach || !version_file_exists)
     {
         format_version = min_format_version;
-        auto buf = version_file.second->writeFile(version_file.first);
-        writeIntText(format_version.toUnderType(), *buf);
-        if (getContext()->getSettingsRef().fsync_metadata)
-            buf->sync();
+        if (!version_file.second->isReadOnly())
+        {
+            auto buf = version_file.second->writeFile(version_file.first);
+            writeIntText(format_version.toUnderType(), *buf);
+            if (getContext()->getSettingsRef().fsync_metadata)
+                buf->sync();
+        }
     }
     else
     {
diff --git a/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml b/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml
index c074b078dad..8fad4d40483 100644
--- a/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml
+++ b/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml
@@ -5,7 +5,6 @@
             <web>
                 <type>web</type>
                 <endpoint>http://nginx:80/test1/</endpoint>
-                <files_prefix>data</files_prefix>
             </web>
         </disks>
         <policies>
diff --git a/tests/integration/test_disk_over_web_server/test.py b/tests/integration/test_disk_over_web_server/test.py
index 78e50dee1bf..b8629fdbe9e 100644
--- a/tests/integration/test_disk_over_web_server/test.py
+++ b/tests/integration/test_disk_over_web_server/test.py
@@ -26,7 +26,7 @@ def cluster():
             print(f'Metadata: {metadata_path}')
 
             node1.exec_in_container(['bash', '-c',
-                                    '/usr/bin/clickhouse static-files-disk-uploader --test-mode --files-prefix data --url http://nginx:80/test1 --metadata-path {}'.format(metadata_path)], user='root')
+                                    '/usr/bin/clickhouse static-files-disk-uploader --test-mode --url http://nginx:80/test1 --metadata-path {}'.format(metadata_path)], user='root')
             parts = metadata_path.split('/')
             uuids.append(parts[3])
             print(f'UUID: {parts[3]}')
diff --git a/utils/s3tools/s3uploader b/utils/s3tools/s3uploader
index a21263c1094..45b14c9a26e 100755
--- a/utils/s3tools/s3uploader
+++ b/utils/s3tools/s3uploader
@@ -23,12 +23,13 @@ class S3API(object):
 
     def upload_file(self, bucket_name, file_path, s3_path):
         logging.info("Start uploading file to bucket %s", bucket_name)
+
         bucket = self.connection.get_bucket(bucket_name)
         key = bucket.initiate_multipart_upload(s3_path)
         logging.info("Will upload to s3 path %s", s3_path)
         chunksize = 1024 * 1024 * 1024 # 1 GB
         filesize = os.stat(file_path).st_size
-        logging.info("File size if %s", filesize)
+        logging.info("File size is %s", filesize)
         chunkcount = int(math.ceil(filesize / chunksize))
 
         def call_back(x, y):
@@ -38,6 +39,7 @@ class S3API(object):
                 logging.info("Uploading chunk %s of %s", i, chunkcount + 1)
                 offset = chunksize * i
                 bytes_size = min(chunksize, filesize - offset)
+
                 with open(file_path, 'r') as fp:
                     fp.seek(offset)
                     key.upload_part_from_file(fp=fp, part_num=i+1,
@@ -51,6 +53,50 @@ class S3API(object):
         return "https://{bucket}.{mds_url}/{path}".format(
             bucket=bucket_name, mds_url=self.mds_url, path=s3_path)
 
+    def set_file_contents(self, bucket, local_file_path, s3_file_path):
+        key = Key(bucket)
+        key.key = s3_file_path
+        file_size = os.stat(local_file_path).st_size
+        logging.info("Uploading file `%s` to `%s`. Size is %s", local_file_path, s3_file_path, file_size)
+        def call_back(x, y):
+            print("Uploaded {}/{} bytes".format(x, y))
+        key.set_contents_from_filename(local_file_path, cb=call_back)
+
+    def upload_data_for_static_files_disk(self, bucket_name, directory_path, s3_path):
+        logging.info("Will upload files to bucket '%s' from directory '%s' to s3 path '%s'", bucket_name, directory_path, s3_path)
+        bucket = self.connection.get_bucket(bucket_name)
+        for file_name in os.listdir(directory_path):
+            if file_name.startswith('.index'):
+                local_file_path = os.path.join(directory_path, file_name)
+                s3_file_path = os.path.join(s3_path, file_name)
+                self.set_file_contents(bucket, local_file_path, s3_file_path)
+
+                file_path = os.path.join(directory_path, file_name)
+                with open(file_path) as file:
+                    lines = file.readlines()
+                    files = [line.rstrip() for line in lines]
+                    for file_line in files:
+                        file_path = file_line.split('\t')[0]
+                        s3_file_path = os.path.join(s3_path, file_path)
+                        local_file_path = os.path.join(directory_path, file_path)
+                        self.set_file_contents(bucket, local_file_path, s3_file_path)
+
+        logging.info("Uploading finished")
+        return "https://{bucket}.{mds_url}/{path}".format(bucket=bucket_name, mds_url=self.mds_url, path=s3_path)
+
+    def list_bucket_keys(self, bucket_name, s3_path):
+        bucket = self.connection.get_bucket(bucket_name)
+        for obj in bucket.get_all_keys():
+            print(obj.key)
+
+    def remove_folder_from_bucket(self, bucket_name, folder_path):
+        bucket = self.connection.get_bucket(bucket_name)
+        bucket.get_all_keys()
+        for obj in bucket.get_all_keys():
+            if obj.key.startswith(folder_path):
+                print('Removing ' + obj.key)
+                obj.delete()
+
 
 def make_tar_file_for_table(clickhouse_data_path, db_name, table_name,
                             tmp_prefix):
@@ -96,6 +142,9 @@ if __name__ == "__main__":
                             help='Name of table with database, if you are uploading partitions')
     data_group.add_argument('--file-path',
                             help='Name of file, if you are uploading')
+    data_group.add_argument('--directory-path', help='Path to directory with files to upload')
+    data_group.add_argument('--list-directory', help='List s3 directory by --directory-path')
+    data_group.add_argument('--remove-directory', help='Remove s3 directory by --directory-path')
     args = parser.parse_args()
 
     if args.table_name is not None and args.clickhouse_data_path is None:
@@ -106,27 +155,44 @@ if __name__ == "__main__":
         args.access_key_id, args.secret_access_key,
         args.s3_api_url, args.s3_common_url)
 
-    if args.table_name is not None:
-        if '.' not in args.table_name:
-            db_name = 'default'
+    file_path = ''
+    directory_path = ''
+    s3_path = args.s3_path
+
+    if args.s3_path and args.list_directory:
+        s3_conn.list_bucket_keys(args.bucket_name, s3_path)
+    elif args.directory_path is not None:
+        directory_path = args.directory_path
+
+        if args.remove_directory:
+            print('Removing s3 path: ' + args.remove_directory)
+            s3_conn.remove_folder_from_bucket(args.bucket_name, args.remove_directory)
         else:
-            db_name, table_name = args.table_name.split('.')
-        file_path = make_tar_file_for_table(
-            args.clickhouse_data_path, db_name, table_name, args.tmp_prefix)
+            url = s3_conn.upload_data_for_static_files_disk(args.bucket_name, directory_path, s3_path)
+            logging.info("Data uploaded: %s", url)
     else:
-        file_path = args.file_path
 
-    if 'tsv' in file_path:
-        s3_path = os.path.join(
-            args.dataset_name, 'tsv', os.path.basename(file_path))
-    elif args.table_name is not None:
-        s3_path = os.path.join(
-            args.dataset_name, 'partitions', os.path.basename(file_path))
-    elif args.s3_path is not None:
-        s3_path = os.path.join(
-            args.dataset_name, args.s3_path, os.path.basename(file_path))
-    else:
-        raise Exception("Don't know s3-path to upload")
+        if args.table_name is not None:
+            if '.' not in args.table_name:
+                db_name = 'default'
+            else:
+                db_name, table_name = args.table_name.split('.')
+            file_path = make_tar_file_for_table(
+                args.clickhouse_data_path, db_name, table_name, args.tmp_prefix)
+        else:
+            file_path = args.file_path
 
-    url = s3_conn.upload_file(args.bucket_name, file_path, s3_path)
-    logging.info("Data uploaded: %s", url)
+        if 'tsv' in file_path:
+            s3_path = os.path.join(
+                args.dataset_name, 'tsv', os.path.basename(file_path))
+        if args.table_name is not None:
+            s3_path = os.path.join(
+                args.dataset_name, 'partitions', os.path.basename(file_path))
+        elif args.s3_path is not None:
+            s3_path = os.path.join(
+                args.dataset_name, args.s3_path, os.path.basename(file_path))
+        else:
+            raise Exception("Don't know s3-path to upload")
+
+        url = s3_conn.upload_file(args.bucket_name, file_path, s3_path)
+        logging.info("Data uploaded: %s", url)

From 32686e11cb198cb395bd39b58ea6247972542c34 Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Sat, 4 Sep 2021 11:30:30 +0300
Subject: [PATCH 065/273] Fix style checl

---
 src/Disks/DiskWebServer.cpp | 1 -
 src/Disks/DiskWebServer.h   | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Disks/DiskWebServer.cpp b/src/Disks/DiskWebServer.cpp
index 22d49157383..11a17ea26cd 100644
--- a/src/Disks/DiskWebServer.cpp
+++ b/src/Disks/DiskWebServer.cpp
@@ -33,7 +33,6 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
     extern const int LOGICAL_ERROR;
     extern const int NETWORK_ERROR;
-    extern const int NOT_IMPLEMENTED;
 }
 
 
diff --git a/src/Disks/DiskWebServer.h b/src/Disks/DiskWebServer.h
index 2b8a665c75b..c023ba6c6b7 100644
--- a/src/Disks/DiskWebServer.h
+++ b/src/Disks/DiskWebServer.h
@@ -26,14 +26,14 @@ struct DiskWebServerSettings
 
 
 /*
- * Quick ready test: ATTACH TABLE test_hits UUID 'dbeecc07-58f3-4e89-9bee-cc0758f34e89'  ( WatchID UInt64,  JavaEnable UInt8,  Title String,  GoodEvent Int16,  EventTime DateTime,  EventDate Date,  CounterID UInt32,  ClientIP UInt32,  ClientIP6 FixedString(16),  RegionID UInt32,  UserID UInt64,  CounterClass Int8,  OS UInt8,  UserAgent UInt8,  URL String,  Referer String,  URLDomain String,  RefererDomain String,  Refresh UInt8,  IsRobot UInt8,  RefererCategories Array(UInt16),  URLCategories Array(UInt16), URLRegions Array(UInt32),  RefererRegions Array(UInt32),  ResolutionWidth UInt16,  ResolutionHeight UInt16,  ResolutionDepth UInt8,  FlashMajor UInt8, FlashMinor UInt8,  FlashMinor2 String,  NetMajor UInt8,  NetMinor UInt8, UserAgentMajor UInt16,  UserAgentMinor FixedString(2),  CookieEnable UInt8, JavascriptEnable UInt8,  IsMobile UInt8,  MobilePhone UInt8,  MobilePhoneModel String,  Params String,  IPNetworkID UInt32,  TraficSourceID Int8, SearchEngineID UInt16,  SearchPhrase String,  AdvEngineID UInt8,  IsArtifical UInt8,  WindowClientWidth UInt16,  WindowClientHeight UInt16,  ClientTimeZone Int16,  ClientEventTime DateTime,  SilverlightVersion1 UInt8, SilverlightVersion2 UInt8,  SilverlightVersion3 UInt32,  SilverlightVersion4 UInt16,  PageCharset String,  CodeVersion UInt32,  IsLink UInt8,  IsDownload UInt8,  IsNotBounce UInt8,  FUniqID UInt64,  HID UInt32,  IsOldCounter UInt8, IsEvent UInt8,  IsParameter UInt8,  DontCountHits UInt8,  WithHash UInt8, HitColor FixedString(1),  UTCEventTime DateTime,  Age UInt8,  Sex UInt8,  Income UInt8,  Interests UInt16,  Robotness UInt8,  GeneralInterests Array(UInt16), RemoteIP UInt32,  RemoteIP6 FixedString(16),  WindowName Int32,  OpenerName Int32,  HistoryLength Int16,  BrowserLanguage FixedString(2),  BrowserCountry FixedString(2),  SocialNetwork String,  SocialAction String,  HTTPError UInt16, SendTiming Int32,  DNSTiming Int32,  ConnectTiming Int32,  ResponseStartTiming Int32,  ResponseEndTiming Int32,  FetchTiming Int32,  RedirectTiming Int32, DOMInteractiveTiming Int32,  DOMContentLoadedTiming Int32,  DOMCompleteTiming Int32,  LoadEventStartTiming Int32,  LoadEventEndTiming Int32, NSToDOMContentLoadedTiming Int32,  FirstPaintTiming Int32,  RedirectCount Int8, SocialSourceNetworkID UInt8,  SocialSourcePage String,  ParamPrice Int64, ParamOrderID String,  ParamCurrency FixedString(3),  ParamCurrencyID UInt16, GoalsReached Array(UInt32),  OpenstatServiceName String,  OpenstatCampaignID String,  OpenstatAdID String,  OpenstatSourceID String,  UTMSource String, UTMMedium String,  UTMCampaign String,  UTMContent String,  UTMTerm String, FromTag String,  HasGCLID UInt8,  RefererHash UInt64,  URLHash UInt64,  CLID UInt32,  YCLID UInt64,  ShareService String,  ShareURL String,  ShareTitle String,  ParsedParams Nested(Key1 String,  Key2 String, Key3 String, Key4 String, Key5 String,  ValueDouble Float64),  IslandID FixedString(16),  RequestNum UInt32,  RequestTry UInt8)
- *                   ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS  storage_policy='web';
+ * Quick ready test: ATTACH TABLE test_hits UUID 'dbeecc07-58f3-4e89-9bee-cc0758f34e89' ( WatchID UInt64, JavaEnable UInt8, Title String, GoodEvent Int16, EventTime DateTime, EventDate Date, CounterID UInt32, ClientIP UInt32, ClientIP6 FixedString(16), RegionID UInt32, UserID UInt64, CounterClass Int8, OS UInt8, UserAgent UInt8, URL String, Referer String, URLDomain String, RefererDomain String, Refresh UInt8, IsRobot UInt8, RefererCategories Array(UInt16), URLCategories Array(UInt16), URLRegions Array(UInt32), RefererRegions Array(UInt32), ResolutionWidth UInt16, ResolutionHeight UInt16, ResolutionDepth UInt8, FlashMajor UInt8, FlashMinor UInt8, FlashMinor2 String, NetMajor UInt8, NetMinor UInt8, UserAgentMajor UInt16, UserAgentMinor FixedString(2), CookieEnable UInt8, JavascriptEnable UInt8, IsMobile UInt8, MobilePhone UInt8, MobilePhoneModel String, Params String, IPNetworkID UInt32, TraficSourceID Int8, SearchEngineID UInt16, SearchPhrase String, AdvEngineID UInt8, IsArtifical UInt8, WindowClientWidth UInt16, WindowClientHeight UInt16, ClientTimeZone Int16, ClientEventTime DateTime, SilverlightVersion1 UInt8, SilverlightVersion2 UInt8, SilverlightVersion3 UInt32, SilverlightVersion4 UInt16, PageCharset String, CodeVersion UInt32, IsLink UInt8, IsDownload UInt8, IsNotBounce UInt8, FUniqID UInt64, HID UInt32, IsOldCounter UInt8, IsEvent UInt8, IsParameter UInt8, DontCountHits UInt8, WithHash UInt8, HitColor FixedString(1), UTCEventTime DateTime, Age UInt8, Sex UInt8, Income UInt8, Interests UInt16, Robotness UInt8, GeneralInterests Array(UInt16), RemoteIP UInt32, RemoteIP6 FixedString(16), WindowName Int32, OpenerName Int32, HistoryLength Int16, BrowserLanguage FixedString(2), BrowserCountry FixedString(2), SocialNetwork String, SocialAction String, HTTPError UInt16, SendTiming Int32, DNSTiming Int32, ConnectTiming Int32, ResponseStartTiming Int32, ResponseEndTiming Int32, FetchTiming Int32, RedirectTiming Int32, DOMInteractiveTiming Int32, DOMContentLoadedTiming Int32, DOMCompleteTiming Int32, LoadEventStartTiming Int32, LoadEventEndTiming Int32, NSToDOMContentLoadedTiming Int32, FirstPaintTiming Int32, RedirectCount Int8, SocialSourceNetworkID UInt8, SocialSourcePage String, ParamPrice Int64, ParamOrderID String, ParamCurrency FixedString(3), ParamCurrencyID UInt16, GoalsReached Array(UInt32), OpenstatServiceName String, OpenstatCampaignID String, OpenstatAdID String, OpenstatSourceID String, UTMSource String, UTMMedium String, UTMCampaign String, UTMContent String, UTMTerm String, FromTag String, HasGCLID UInt8, RefererHash UInt64, URLHash UInt64, CLID UInt32, YCLID UInt64, ShareService String, ShareURL String, ShareTitle String, ParsedParams Nested(Key1 String, Key2 String, Key3 String, Key4 String, Key5 String, ValueDouble Float64), IslandID FixedString(16), RequestNum UInt32, RequestTry UInt8)
+ *                   ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS storage_policy='web';
  *
  *   <storage_configuration>
  *       <disks>
  *           <web>
  *               <type>web</type>
-                 <endpoint>https://clickhouse-datasets.s3.yandex.net/test-hits/</endpoint>
+ *               <endpoint>https://clickhouse-datasets.s3.yandex.net/test-hits/</endpoint>
  *           </web>
  *       </disks>
  *       <policies>

From 97e0a0310a72eef10d0f73b266cc6c4f2f9a51b6 Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Sat, 4 Sep 2021 12:02:07 +0300
Subject: [PATCH 066/273] Slightly better

---
 src/Disks/DiskWebServer.cpp                | 8 ++++----
 src/Interpreters/InterpreterAlterQuery.cpp | 2 +-
 src/Interpreters/InterpreterDropQuery.cpp  | 4 ++--
 src/Storages/IStorage.cpp                  | 2 +-
 src/Storages/IStorage.h                    | 2 +-
 src/Storages/StorageMergeTree.cpp          | 8 +++++++-
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/Disks/DiskWebServer.cpp b/src/Disks/DiskWebServer.cpp
index 11a17ea26cd..925fe5971d6 100644
--- a/src/Disks/DiskWebServer.cpp
+++ b/src/Disks/DiskWebServer.cpp
@@ -51,7 +51,7 @@ void DiskWebServer::Metadata::initialize(const String & uri_with_path, const Str
         assertChar('\t', metadata_buf);
         readIntText(file_size, metadata_buf);
         assertChar('\n', metadata_buf);
-        LOG_DEBUG(&Poco::Logger::get("DiskWeb"), "Read file: {}, size: {}", remote_file_name, file_size);
+        LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Read file: {}, size: {}", remote_file_name, file_size);
 
         /*
          * URI/   {uri}/{uuid}/all_x_x_x/{file}
@@ -227,7 +227,7 @@ bool DiskWebServer::findFileInMetadata(const String & path, File & file_info) co
 
 bool DiskWebServer::exists(const String & path) const
 {
-    LOG_DEBUG(log, "Checking existence of file: {}", path);
+    LOG_TRACE(log, "Checking existence of file: {}", path);
 
     File file;
     return findFileInMetadata(path, file);
@@ -243,7 +243,7 @@ std::unique_ptr<ReadBufferFromFileBase> DiskWebServer::readFile(const String & p
 
     auto file_name = escapeForFileName(fs::path(path).stem()) + fs::path(path).extension().string();
     auto remote_path = fs::path(path).parent_path() / file_name;
-    LOG_DEBUG(log, "Read from file by path: {}", remote_path.string());
+    LOG_TRACE(log, "Read from file by path: {}", remote_path.string());
 
     RemoteMetadata meta(uri, remote_path);
     meta.remote_fs_objects.emplace_back(std::make_pair(getFileName(remote_path), file.size));
@@ -255,7 +255,7 @@ std::unique_ptr<ReadBufferFromFileBase> DiskWebServer::readFile(const String & p
 
 DiskDirectoryIteratorPtr DiskWebServer::iterateDirectory(const String & path)
 {
-    LOG_DEBUG(log, "Iterate directory: {}", path);
+    LOG_TRACE(log, "Iterate directory: {}", path);
     String uuid;
 
     if (RE2::FullMatch(path, ".*/store/"))
diff --git a/src/Interpreters/InterpreterAlterQuery.cpp b/src/Interpreters/InterpreterAlterQuery.cpp
index c10f4d33f6d..08b9846b325 100644
--- a/src/Interpreters/InterpreterAlterQuery.cpp
+++ b/src/Interpreters/InterpreterAlterQuery.cpp
@@ -63,7 +63,7 @@ BlockIO InterpreterAlterQuery::execute()
     }
 
     StoragePtr table = DatabaseCatalog::instance().getTable(table_id, getContext());
-    if (table->isReadOnly())
+    if (table->isStaticStorage())
         throw Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is read-only");
     auto alter_lock = table->lockForAlter(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
     auto metadata_snapshot = table->getInMemoryMetadataPtr();
diff --git a/src/Interpreters/InterpreterDropQuery.cpp b/src/Interpreters/InterpreterDropQuery.cpp
index 608bd615e6a..fc0d318be8b 100644
--- a/src/Interpreters/InterpreterDropQuery.cpp
+++ b/src/Interpreters/InterpreterDropQuery.cpp
@@ -163,7 +163,7 @@ BlockIO InterpreterDropQuery::executeToTableImpl(ASTDropQuery & query, DatabaseP
         if (query.kind == ASTDropQuery::Kind::Detach)
         {
             getContext()->checkAccess(drop_storage, table_id);
-            if (table->isReadOnly())
+            if (table->isStaticStorage())
                 throw Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is read-only");
 
             if (table->isDictionary())
@@ -198,7 +198,7 @@ BlockIO InterpreterDropQuery::executeToTableImpl(ASTDropQuery & query, DatabaseP
                 throw Exception("Cannot TRUNCATE dictionary", ErrorCodes::SYNTAX_ERROR);
 
             getContext()->checkAccess(AccessType::TRUNCATE, table_id);
-            if (table->isReadOnly())
+            if (table->isStaticStorage())
                 throw Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is read-only");
 
             table->checkTableCanBeDropped();
diff --git a/src/Storages/IStorage.cpp b/src/Storages/IStorage.cpp
index d3636e6c756..758509f094f 100644
--- a/src/Storages/IStorage.cpp
+++ b/src/Storages/IStorage.cpp
@@ -201,7 +201,7 @@ NameDependencies IStorage::getDependentViewsByColumn(ContextPtr context) const
     return name_deps;
 }
 
-bool IStorage::isReadOnly() const
+bool IStorage::isStaticStorage() const
 {
     auto storage_policy = getStoragePolicy();
     if (storage_policy)
diff --git a/src/Storages/IStorage.h b/src/Storages/IStorage.h
index e1c0f030954..90cb963e064 100644
--- a/src/Storages/IStorage.h
+++ b/src/Storages/IStorage.h
@@ -540,7 +540,7 @@ public:
     virtual StoragePolicyPtr getStoragePolicy() const { return {}; }
 
     /// Returns true if all disks of storage are read-only.
-    virtual bool isReadOnly() const;
+    virtual bool isStaticStorage() const;
 
     /// If it is possible to quickly determine exact number of rows in the table at this moment of time, then return it.
     /// Used for:
diff --git a/src/Storages/StorageMergeTree.cpp b/src/Storages/StorageMergeTree.cpp
index 898e990f7d3..a20fca00964 100644
--- a/src/Storages/StorageMergeTree.cpp
+++ b/src/Storages/StorageMergeTree.cpp
@@ -113,6 +113,10 @@ void StorageMergeTree::startup()
     time_after_previous_cleanup_parts.restart();
     time_after_previous_cleanup_temporary_directories.restart();
 
+    /// Do not schedule any background jobs if current storage has static data files.
+    if (isStaticStorage())
+        return;
+
     try
     {
         background_executor.start();
@@ -243,7 +247,7 @@ void StorageMergeTree::drop()
 {
     shutdown();
     /// In case there is read-only disk we cannot allow to call dropAllData(), but dropping tables is allowed.
-    if (isReadOnly())
+    if (isStaticStorage())
         return;
     dropAllData();
 }
@@ -1049,6 +1053,8 @@ bool StorageMergeTree::scheduleDataProcessingJob(IBackgroundJobExecutor & execut
     if (shutdown_called)
         return false;
 
+    assert(!isStaticStorage());
+
     auto metadata_snapshot = getInMemoryMetadataPtr();
     std::shared_ptr<MergeMutateSelectedEntry> merge_entry, mutate_entry;
 

From d738f45ec0d90020a7e2bc52f063713f56a80dbf Mon Sep 17 00:00:00 2001
From: Alexey <lehasm@gmail.com>
Date: Sat, 4 Sep 2021 16:31:04 +0000
Subject: [PATCH 067/273] Examples fixed

---
 .../statements/create/function.md             | 24 +++++++++----------
 .../statements/create/function.md             | 24 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/docs/en/sql-reference/statements/create/function.md b/docs/en/sql-reference/statements/create/function.md
index cab421adfc9..ddfcdfef521 100644
--- a/docs/en/sql-reference/statements/create/function.md
+++ b/docs/en/sql-reference/statements/create/function.md
@@ -34,26 +34,26 @@ SELECT number, linear_equation(number, 2, 1) FROM numbers(3);
 Result:
 
 ``` text
-┌─number─┬─linear_equation(number, 2, 1)─┐
-│      0 │                             1 │
-│      1 │                             3 │
-│      2 │                             5 │
-└────────┴───────────────────────────────┘
+┌─number─┬─plus(multiply(2, number), 1)─┐
+│      0 │                            1 │
+│      1 │                            3 │
+│      2 │                            5 │
+└────────┴──────────────────────────────┘
 ```
 
 A [conditional function](../../../sql-reference/functions/conditional-functions.md) is called in a user defined function in the following query:
 
 ```sql
-CREATE FUNCTION parity AS (n) -> if(n % 2, 'odd', 'even');
-SELECT number, parity(number) FROM numbers(3);
+CREATE FUNCTION parity_str AS (n) -> if(n % 2, 'odd', 'even');
+SELECT number, parity_str(number) FROM numbers(3);
 ```
 
 Result:
 
 ``` text
-┌─number─┬─parity(number)─┐
-│      0 │ even           │
-│      1 │ odd            │
-│      2 │ even           │
-└────────┴────────────────┘
+┌─number─┬─if(modulo(number, 2), 'odd', 'even')─┐
+│      0 │ even                                 │
+│      1 │ odd                                  │
+│      2 │ even                                 │
+└────────┴──────────────────────────────────────┘
 ```
diff --git a/docs/ru/sql-reference/statements/create/function.md b/docs/ru/sql-reference/statements/create/function.md
index 2364425cdd2..90838b25744 100644
--- a/docs/ru/sql-reference/statements/create/function.md
+++ b/docs/ru/sql-reference/statements/create/function.md
@@ -34,26 +34,26 @@ SELECT number, linear_equation(number, 2, 1) FROM numbers(3);
 Результат:
 
 ``` text
-┌─number─┬─linear_equation(number, 2, 1)─┐
-│      0 │                             1 │
-│      1 │                             3 │
-│      2 │                             5 │
-└────────┴───────────────────────────────┘
+┌─number─┬─plus(multiply(2, number), 1)─┐
+│      0 │                            1 │
+│      1 │                            3 │
+│      2 │                            5 │
+└────────┴──────────────────────────────┘
 ```
 
 В следующем запросе пользовательская функция вызывает [условную функцию](../../../sql-reference/functions/conditional-functions.md):
 
 ```sql
-CREATE FUNCTION parity AS (n) -> if(n % 2, 'odd', 'even');
-SELECT number, parity(number) FROM numbers(3);
+CREATE FUNCTION parity_str AS (n) -> if(n % 2, 'odd', 'even');
+SELECT number, parity_str(number) FROM numbers(3);
 ```
 
 Результат:
 
 ``` text
-┌─number─┬─parity(number)─┐
-│      0 │ even           │
-│      1 │ odd            │
-│      2 │ even           │
-└────────┴────────────────┘
+┌─number─┬─if(modulo(number, 2), 'odd', 'even')─┐
+│      0 │ even                                 │
+│      1 │ odd                                  │
+│      2 │ even                                 │
+└────────┴──────────────────────────────────────┘
 ```

From 6d5605e1ee66737a0a61789e3c84c3d7066ce6c7 Mon Sep 17 00:00:00 2001
From: zhangxiao871 <zhangxiao871@jd.com>
Date: Sun, 5 Sep 2021 00:41:52 +0800
Subject: [PATCH 068/273] Better support FixedString type and add test case.

---
 src/Functions/FunctionBinaryArithmetic.h      | 112 +++---
 src/Functions/bitShiftRight.cpp               |  72 +++-
 ...t_shift_right_for_string_integer.reference | 375 ++++++++++++++++--
 ...016_bit_shift_right_for_string_integer.sql | 172 ++++++--
 4 files changed, 577 insertions(+), 154 deletions(-)

diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index f26fb6c7bfb..8dcce31ea9a 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -222,25 +222,16 @@ struct StringIntegerOperationImpl
     static const constexpr bool allow_fixed_string = false;
     static const constexpr bool allow_string_integer = true;
 
-    template <OpCase op_case, bool is_fixed_string>
-    static void NO_INLINE process(const UInt8 * __restrict in_vec, const UInt64 * __restrict n_or_in_offsets, const B * __restrict b, ColumnString::Chars & out_vec, ColumnString::Offsets & out_offsets, size_t size)
-    {
-        if constexpr (is_fixed_string)
-            processFixedString<op_case>(in_vec, *n_or_in_offsets, b, out_vec, out_offsets, size);
-        else
-            processString<op_case>(in_vec, n_or_in_offsets, b, out_vec, out_offsets, size);
-    }
-
     template <OpCase op_case>
-    static void NO_INLINE processFixedString(const UInt8 * __restrict in_vec, const UInt64 n, const B * __restrict b, ColumnString::Chars & out_vec, ColumnString::Offsets & out_offsets, size_t size)
+    static void NO_INLINE processFixedString(const UInt8 * __restrict in_vec, const UInt64 n, const B * __restrict b, ColumnFixedString::Chars & out_vec, size_t size)
     {
         size_t prev_offset = 0;
-
+        out_vec.reserve(n * size);
         for (size_t i = 0; i < size; ++i)
         {
             if constexpr (op_case == OpCase::LeftConstant)
             {
-                Op::apply(&in_vec[0], &in_vec[n], b[i], out_vec, out_offsets);
+                Op::apply(&in_vec[0], &in_vec[n], b[i], out_vec);
             }
             else
             {
@@ -248,11 +239,11 @@ struct StringIntegerOperationImpl
 
                 if constexpr (op_case == OpCase::Vector)
                 {
-                    Op::apply(&in_vec[prev_offset], &in_vec[new_offset], b[i], out_vec, out_offsets);
+                    Op::apply(&in_vec[prev_offset], &in_vec[new_offset], b[i], out_vec);
                 }
                 else
                 {
-                    Op::apply(&in_vec[prev_offset], &in_vec[new_offset], b[0], out_vec, out_offsets);
+                    Op::apply(&in_vec[prev_offset], &in_vec[new_offset], b[0], out_vec);
                 }
                 prev_offset = new_offset;
             }
@@ -1113,6 +1104,8 @@ public:
                     return false;
                 else if constexpr (!IsIntegral<RightDataType>)
                     return false;
+                else if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType>)
+                    type_res = std::make_shared<LeftDataType>(left.getN());
                 else
                     type_res = std::make_shared<DataTypeString>();
                 return true;
@@ -1268,11 +1261,6 @@ public:
         const ColVecT1 * const col_right = checkAndGetColumn<ColVecT1>(col_right_raw);
         const ColumnConst * const col_right_const = checkAndGetColumnConst<ColVecT1>(col_right_raw);
 
-        ColumnString::MutablePtr col_res = ColumnString::create();
-
-        ColumnString::Chars & out_vec = col_res->getChars();
-        ColumnString::Offsets & out_offsets = col_res->getOffsets();
-
         using OpImpl = StringIntegerOperationImpl<T1, Op<LeftDataType, T1>>;
 
         const ColumnConst * const col_left_const = checkAndGetColumnConst<LeftColumnType>(col_left_raw);
@@ -1282,62 +1270,72 @@ public:
 
         const typename LeftColumnType::Chars & in_vec = col_left->getChars();
 
-        UInt64 n;
-        const UInt64 * n_or_in_offsets;
+        typename LeftColumnType::MutablePtr col_res;
         if constexpr (std::is_same_v<LeftDataType, DataTypeFixedString>)
-        {
-            n = col_left->getN();
-            n_or_in_offsets = &n;
-        }
+            col_res = LeftColumnType::create(col_left->getN());
         else
-            n_or_in_offsets = col_left->getOffsets().data();
+            col_res = LeftColumnType::create();
+
+        typename LeftColumnType::Chars & out_vec = col_res->getChars();
 
         if (col_left_const && col_right_const)
         {
             const T1 value = col_right_const->template getValue<T1>();
-            OpImpl::template process<OpCase::Vector, std::is_same_v<LeftDataType, DataTypeFixedString>>(
-                in_vec.data(),
-                n_or_in_offsets,
-                &value,
-                out_vec,
-                out_offsets,
-                1);
+            if constexpr (std::is_same_v<LeftDataType, DataTypeFixedString>)
+            {
+                OpImpl::template processFixedString<OpCase::Vector>(in_vec.data(), col_left->getN(), &value, out_vec, 1);
+            }
+            else
+            {
+                ColumnString::Offsets & out_offsets = col_res->getOffsets();
+                OpImpl::template processString<OpCase::Vector>(in_vec.data(), col_left->getOffsets().data(), &value, out_vec, out_offsets, 1);
+            }
 
             return ResultDataType().createColumnConst(col_left_const->size(), col_res->size() ? (*col_res)[0] : Field(""));
         }
         else if (!col_left_const && !col_right_const && col_left && col_right)
         {
-            out_offsets.reserve(col_left->size());
-            OpImpl::template process<OpCase::Vector, std::is_same_v<LeftDataType, DataTypeFixedString>>(
-                in_vec.data(),
-                n_or_in_offsets,
-                col_right->getData().data(),
-                out_vec,
-                out_offsets,
-                col_left->size());
+            if constexpr (std::is_same_v<LeftDataType, DataTypeFixedString>)
+            {
+                OpImpl::template processFixedString<OpCase::Vector>(in_vec.data(), col_left->getN(), col_right->getData().data(), out_vec, col_left->size());
+            }
+            else
+            {
+                ColumnString::Offsets & out_offsets = col_res->getOffsets();
+                out_offsets.reserve(col_left->size());
+                OpImpl::template processString<OpCase::Vector>(
+                    in_vec.data(), col_left->getOffsets().data(), col_right->getData().data(), out_vec, out_offsets, col_left->size());
+            }
         }
         else if (col_left_const && col_right)
         {
-            out_offsets.reserve(col_right->size());
-            OpImpl::template process<OpCase::LeftConstant, std::is_same_v<LeftDataType, DataTypeFixedString>>(
-                in_vec.data(),
-                n_or_in_offsets,
-                col_right->getData().data(),
-                out_vec,
-                out_offsets,
-                col_right->size());
+            if constexpr (std::is_same_v<LeftDataType, DataTypeFixedString>)
+            {
+                OpImpl::template processFixedString<OpCase::LeftConstant>(
+                    in_vec.data(), col_left->getN(), col_right->getData().data(), out_vec, col_right->size());
+            }
+            else
+            {
+                ColumnString::Offsets & out_offsets = col_res->getOffsets();
+                out_offsets.reserve(col_right->size());
+                OpImpl::template processString<OpCase::LeftConstant>(
+                    in_vec.data(), col_left->getOffsets().data(), col_right->getData().data(), out_vec, out_offsets, col_right->size());
+            }
         }
         else if (col_left && col_right_const)
         {
             const T1 value = col_right_const->template getValue<T1>();
-
-            OpImpl::template process<OpCase::RightConstant, std::is_same_v<LeftDataType, DataTypeFixedString>>(
-                in_vec.data(),
-                n_or_in_offsets,
-                &value,
-                out_vec,
-                out_offsets,
-                col_left->size());
+            if constexpr (std::is_same_v<LeftDataType, DataTypeFixedString>)
+            {
+                OpImpl::template processFixedString<OpCase::RightConstant>(in_vec.data(), col_left->getN(), &value, out_vec, col_left->size());
+            }
+            else
+            {
+                ColumnString::Offsets & out_offsets = col_res->getOffsets();
+                out_offsets.reserve(col_left->size());
+                OpImpl::template processString<OpCase::RightConstant>(
+                    in_vec.data(), col_left->getOffsets().data(), &value, out_vec, out_offsets, col_left->size());
+            }
         }
         else
             return nullptr;
diff --git a/src/Functions/bitShiftRight.cpp b/src/Functions/bitShiftRight.cpp
index 58e8f580c5e..fe39344b7b7 100644
--- a/src/Functions/bitShiftRight.cpp
+++ b/src/Functions/bitShiftRight.cpp
@@ -31,7 +31,23 @@ struct BitShiftRightImpl
             return static_cast<Result>(a) >> static_cast<Result>(b);
     }
 
-    static inline NO_SANITIZE_UNDEFINED void apply(const UInt8 * pos [[maybe_unused]], const UInt8 * end [[maybe_unused]], const B & b [[maybe_unused]], ColumnString::Chars & out_vec, ColumnString::Offsets & out_offsets)
+    static inline NO_SANITIZE_UNDEFINED void bitShiftRightForBytes(UInt8 * op_pointer, const UInt8 * begin, UInt8 * out, const size_t shift_right_bits)
+    {
+        while (op_pointer > begin)
+        {
+            op_pointer--;
+            out--;
+            *out = *op_pointer >> shift_right_bits;
+            if (op_pointer - 1 >= begin)
+            {
+                /// The right 8-b bit of the left byte is moved to the left 8-b bit of this byte
+                *out = UInt8(UInt8(*(op_pointer - 1) << (8 - shift_right_bits)) | *out);
+            }
+        }
+    }
+
+    /// For String
+    static ALWAYS_INLINE NO_SANITIZE_UNDEFINED void apply(const UInt8 * pos [[maybe_unused]], const UInt8 * end [[maybe_unused]], const B & b [[maybe_unused]], ColumnString::Chars & out_vec, ColumnString::Offsets & out_offsets)
     {
         if constexpr (is_big_int_v<B>)
             throw Exception("BitShiftRight is not implemented for big integers as second argument", ErrorCodes::NOT_IMPLEMENTED);
@@ -56,26 +72,52 @@ struct BitShiftRightImpl
             size_t length = shift_right_end - begin;
             const size_t new_size = old_size + length + 1;
             out_vec.resize(new_size);
-
-            UInt8 * op_pointer = const_cast<UInt8 *>(shift_right_end);
             out_vec[old_size + length] = 0;
+
+            /// We start from the byte on the right and shift right shift_right_bits bit by byte
+            UInt8 * op_pointer = const_cast<UInt8 *>(shift_right_end);
             UInt8 * out = out_vec.data() + old_size + length;
-            while (op_pointer > begin)
-            {
-                op_pointer--;
-                out--;
-                UInt8 temp_value = *op_pointer >> shift_right_bits;
-                if (op_pointer - 1 >= begin)
-                {
-                    *out = UInt8(UInt8(*(op_pointer - 1) << (8 - shift_right_bits)) | temp_value);
-                }
-                else
-                    *out = temp_value;
-            }
+            bitShiftRightForBytes(op_pointer, begin, out, shift_right_bits);
             out_offsets.push_back(new_size);
         }
     }
 
+    /// For FixedString
+    static ALWAYS_INLINE NO_SANITIZE_UNDEFINED void apply(const UInt8 * pos [[maybe_unused]], const UInt8 * end [[maybe_unused]], const B & b [[maybe_unused]], ColumnFixedString::Chars & out_vec)
+    {
+        if constexpr (is_big_int_v<B>)
+            throw Exception("BitShiftRight is not implemented for big integers as second argument", ErrorCodes::NOT_IMPLEMENTED);
+        else
+        {
+            UInt8 word_size = 8;
+            size_t n = end - pos;
+            if (b >= static_cast<B>(n * word_size) || b < 0)
+            {
+                // insert default value
+                out_vec.resize_fill(out_vec.size() + n);
+                return;
+            }
+
+            size_t shift_right_bytes = b / word_size;
+            size_t shift_right_bits = b % word_size;
+
+            const UInt8 * begin = pos;
+            const UInt8 * shift_right_end = end - shift_right_bytes;
+
+            const size_t old_size = out_vec.size();
+            const size_t new_size = old_size + n;
+
+            /// Fill 0 to the left
+            out_vec.resize_fill(out_vec.size() + old_size + shift_right_bytes);
+            out_vec.resize(new_size);
+
+            /// We start from the byte on the right and shift right shift_right_bits bit by byte
+            UInt8 * op_pointer = const_cast<UInt8 *>(shift_right_end);
+            UInt8 * out = out_vec.data() + new_size;
+            bitShiftRightForBytes(op_pointer, begin, out, shift_right_bits);
+        }
+    }
+
 #if USE_EMBEDDED_COMPILER
     static constexpr bool compilable = true;
 
diff --git a/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.reference b/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.reference
index b381832c771..e6a2b2b6aaf 100644
--- a/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.reference
+++ b/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.reference
@@ -1,44 +1,339 @@
+String ConstConst
 1
-0100100001100101011011000110110001101111
-0010010000110010101101100011011000110111
-0001001000011001010110110001101100011011
-0000100100001100101011011000110110001101
-0000010010000110010101101100011011000110
-0000001001000011001010110110001101100011
-0000000100100001100101011011000110110001
-0000000010010000110010101101100011011000
-01001000011001010110110001101100
-00100100001100101011011000110110
-00010010000110010101101100011011
-00001001000011001010110110001101
-00000100100001100101011011000110
-00000010010000110010101101100011
-00000001001000011001010110110001
-00000000100100001100101011011000
-010010000110010101101100
-001001000011001010110110
-000100100001100101011011
-000010010000110010101101
-000001001000011001010110
-000000100100001100101011
-000000010010000110010101
-000000001001000011001010
-0100100001100101
-0010010000110010
-0001001000011001
-0000100100001100
-0000010010000110
-0000001001000011
-0000000100100001
-0000000010010000
-01001000
-00100100
-00010010
-00001001
-00000100
-00000010
-00000001
-00000000
+0	Hello	0100100001100101011011000110110001101111
+1	Hello	0010010000110010101101100011011000110111
+2	Hello	0001001000011001010110110001101100011011
+3	Hello	0000100100001100101011011000110110001101
+4	Hello	0000010010000110010101101100011011000110
+5	Hello	0000001001000011001010110110001101100011
+6	Hello	0000000100100001100101011011000110110001
+7	Hello	0000000010010000110010101101100011011000
+8	Hello	01001000011001010110110001101100
+9	Hello	00100100001100101011011000110110
+10	Hello	00010010000110010101101100011011
+11	Hello	00001001000011001010110110001101
+12	Hello	00000100100001100101011011000110
+13	Hello	00000010010000110010101101100011
+14	Hello	00000001001000011001010110110001
+15	Hello	00000000100100001100101011011000
+16	Hello	010010000110010101101100
+17	Hello	001001000011001010110110
+18	Hello	000100100001100101011011
+19	Hello	000010010000110010101101
+20	Hello	000001001000011001010110
+21	Hello	000000100100001100101011
+22	Hello	000000010010000110010101
+23	Hello	000000001001000011001010
+24	Hello	0100100001100101
+25	Hello	0010010000110010
+26	Hello	0001001000011001
+27	Hello	0000100100001100
+28	Hello	0000010010000110
+29	Hello	0000001001000011
+30	Hello	0000000100100001
+31	Hello	0000000010010000
+32	Hello	01001000
+33	Hello	00100100
+34	Hello	00010010
+35	Hello	00001001
+36	Hello	00000100
+37	Hello	00000010
+38	Hello	00000001
+39	Hello	00000000
+40	Hello	
+41	Hello	
+42	Hello	
+FixedString ConstConst
+1
+0	Hello\0\0\0\0\0	01001000011001010110110001101100011011110000000000000000000000000000000000000000
+1	Hello\0\0\0\0\0	00100100001100101011011000110110001101111000000000000000000000000000000000000000
+2	Hello\0\0\0\0\0	00010010000110010101101100011011000110111100000000000000000000000000000000000000
+3	Hello\0\0\0\0\0	00001001000011001010110110001101100011011110000000000000000000000000000000000000
+4	Hello\0\0\0\0\0	00000100100001100101011011000110110001101111000000000000000000000000000000000000
+5	Hello\0\0\0\0\0	00000010010000110010101101100011011000110111100000000000000000000000000000000000
+6	Hello\0\0\0\0\0	00000001001000011001010110110001101100011011110000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+9	Hello\0\0\0\0\0	00000000001001000011001010110110001101100011011110000000000000000000000000000000
+10	Hello\0\0\0\0\0	00000000000100100001100101011011000110110001101111000000000000000000000000000000
+11	Hello\0\0\0\0\0	00000000000010010000110010101101100011011000110111100000000000000000000000000000
+12	Hello\0\0\0\0\0	00000000000001001000011001010110110001101100011011110000000000000000000000000000
+13	Hello\0\0\0\0\0	00000000000000100100001100101011011000110110001101111000000000000000000000000000
+14	Hello\0\0\0\0\0	00000000000000010010000110010101101100011011000110111100000000000000000000000000
+15	Hello\0\0\0\0\0	00000000000000001001000011001010110110001101100011011110000000000000000000000000
+16	Hello\0\0\0\0\0	00000000000000000100100001100101011011000110110001101111000000000000000000000000
+17	Hello\0\0\0\0\0	00000000000000000010010000110010101101100011011000110111100000000000000000000000
+18	Hello\0\0\0\0\0	00000000000000000001001000011001010110110001101100011011110000000000000000000000
+19	Hello\0\0\0\0\0	00000000000000000000100100001100101011011000110110001101111000000000000000000000
+20	Hello\0\0\0\0\0	00000000000000000000010010000110010101101100011011000110111100000000000000000000
+21	Hello\0\0\0\0\0	00000000000000000000001001000011001010110110001101100011011110000000000000000000
+22	Hello\0\0\0\0\0	00000000000000000000000100100001100101011011000110110001101111000000000000000000
+23	Hello\0\0\0\0\0	00000000000000000000000010010000110010101101100011011000110111100000000000000000
+24	Hello\0\0\0\0\0	00000000000000000000000001001000011001010110110001101100011011110000000000000000
+25	Hello\0\0\0\0\0	00000000000000000000000000100100001100101011011000110110001101111000000000000000
+26	Hello\0\0\0\0\0	00000000000000000000000000010010000110010101101100011011000110111100000000000000
+27	Hello\0\0\0\0\0	00000000000000000000000000001001000011001010110110001101100011011110000000000000
+28	Hello\0\0\0\0\0	00000000000000000000000000000100100001100101011011000110110001101111000000000000
+29	Hello\0\0\0\0\0	00000000000000000000000000000010010000110010101101100011011000110111100000000000
+30	Hello\0\0\0\0\0	00000000000000000000000000000001001000011001010110110001101100011011110000000000
+31	Hello\0\0\0\0\0	00000000000000000000000000000000100100001100101011011000110110001101111000000000
+32	Hello\0\0\0\0\0	00000000000000000000000000000000010010000110010101101100011011000110111100000000
+33	Hello\0\0\0\0\0	00000000000000000000000000000000001001000011001010110110001101100011011110000000
+34	Hello\0\0\0\0\0	00000000000000000000000000000000000100100001100101011011000110110001101111000000
+35	Hello\0\0\0\0\0	00000000000000000000000000000000000010010000110010101101100011011000110111100000
+36	Hello\0\0\0\0\0	00000000000000000000000000000000000001001000011001010110110001101100011011110000
+37	Hello\0\0\0\0\0	00000000000000000000000000000000000000100100001100101011011000110110001101111000
+38	Hello\0\0\0\0\0	00000000000000000000000000000000000000010010000110010101101100011011000110111100
+39	Hello\0\0\0\0\0	00000000000000000000000000000000000000001001000011001010110110001101100011011110
+40	Hello\0\0\0\0\0	00000000000000000000000000000000000000000100100001100101011011000110110001101111
+41	Hello\0\0\0\0\0	00000000000000000000000000000000000000000010010000110010101101100011011000110111
+42	Hello\0\0\0\0\0	00000000000000000000000000000000000000000001001000011001010110110001101100011011
+77	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000010
+78	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000001
+79	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+80	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+81	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
 
+String VectorVector
+-1	Hello	
+0	Hello	0100100001100101011011000110110001101111
+1	Hello	0010010000110010101101100011011000110111
+7	Hello	0000000010010000110010101101100011011000
+8	Hello	01001000011001010110110001101100
+9	Hello	00100100001100101011011000110110
+15	Hello	00000000100100001100101011011000
+16	Hello	010010000110010101101100
+17	Hello	001001000011001010110110
+23	Hello	000000001001000011001010
+24	Hello	0100100001100101
+25	Hello	0010010000110010
+31	Hello	0000000010010000
+32	Hello	01001000
+33	Hello	00100100
+39	Hello	00000000
+40	Hello	
+41	Hello	
+42	Hello	
+7	Hel	000000001001000011001010
+8	Hel	0100100001100101
+9	Hel	0010010000110010
+23	Hello	000000001001000011001010
+24	Hello	0100100001100101
+25	Hello	0010010000110010
+7	Hel	000000001001000011001010
+8	Hel	0100100001100101
+9	Hel	0010010000110010
 
+FixedString VectorVector
+-1	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+0	Hello\0\0\0\0\0	01001000011001010110110001101100011011110000000000000000000000000000000000000000
+1	Hello\0\0\0\0\0	00100100001100101011011000110110001101111000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+9	Hello\0\0\0\0\0	00000000001001000011001010110110001101100011011110000000000000000000000000000000
+15	Hello\0\0\0\0\0	00000000000000001001000011001010110110001101100011011110000000000000000000000000
+16	Hello\0\0\0\0\0	00000000000000000100100001100101011011000110110001101111000000000000000000000000
+17	Hello\0\0\0\0\0	00000000000000000010010000110010101101100011011000110111100000000000000000000000
+23	Hello\0\0\0\0\0	00000000000000000000000010010000110010101101100011011000110111100000000000000000
+24	Hello\0\0\0\0\0	00000000000000000000000001001000011001010110110001101100011011110000000000000000
+25	Hello\0\0\0\0\0	00000000000000000000000000100100001100101011011000110110001101111000000000000000
+31	Hello\0\0\0\0\0	00000000000000000000000000000000100100001100101011011000110110001101111000000000
+32	Hello\0\0\0\0\0	00000000000000000000000000000000010010000110010101101100011011000110111100000000
+33	Hello\0\0\0\0\0	00000000000000000000000000000000001001000011001010110110001101100011011110000000
+39	Hello\0\0\0\0\0	00000000000000000000000000000000000000001001000011001010110110001101100011011110
+40	Hello\0\0\0\0\0	00000000000000000000000000000000000000000100100001100101011011000110110001101111
+41	Hello\0\0\0\0\0	00000000000000000000000000000000000000000010010000110010101101100011011000110111
+42	Hello\0\0\0\0\0	00000000000000000000000000000000000000000001001000011001010110110001101100011011
+7	Hel\0\0\0\0\0\0\0	00000000100100001100101011011000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	00000000010010000110010101101100000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	00000000001001000011001010110110000000000000000000000000000000000000000000000000
+23	Hello\0\0\0\0\0	00000000000000000000000010010000110010101101100011011000110111100000000000000000
+24	Hello\0\0\0\0\0	00000000000000000000000001001000011001010110110001101100011011110000000000000000
+25	Hello\0\0\0\0\0	00000000000000000000000000100100001100101011011000110110001101111000000000000000
+7	Hel\0\0\0\0\0\0\0	00000000100100001100101011011000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	00000000010010000110010101101100000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	00000000001001000011001010110110000000000000000000000000000000000000000000000000
 
+String VectorConst
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hel	000000001001000011001010
+7	Hel	000000001001000011001010
+7	Hel	000000001001000011001010
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hel	0100100001100101
+8	Hel	0100100001100101
+8	Hel	0100100001100101
+
+FixedString VectorConst
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00000000100100001100101011011000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00000000100100001100101011011000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00000000100100001100101011011000000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	00000000010010000110010101101100000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	00000000010010000110010101101100000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	00000000010010000110010101101100000000000000000000000000000000000000000000000000
+
+String ConstVector
+-1	Hello	
+0	Hello	0100100001100101011011000110110001101111
+1	Hello	0010010000110010101101100011011000110111
+7	Hello	0000000010010000110010101101100011011000
+8	Hello	01001000011001010110110001101100
+9	Hello	00100100001100101011011000110110
+15	Hello	00000000100100001100101011011000
+16	Hello	010010000110010101101100
+17	Hello	001001000011001010110110
+23	Hello	000000001001000011001010
+24	Hello	0100100001100101
+25	Hello	0010010000110010
+31	Hello	0000000010010000
+32	Hello	01001000
+33	Hello	00100100
+39	Hello	00000000
+40	Hello	
+41	Hello	
+42	Hello	
+7	Hello	0000000010010000110010101101100011011000
+8	Hello	01001000011001010110110001101100
+9	Hello	00100100001100101011011000110110
+-1	Hel	
+0	Hel	010010000110010101101100
+1	Hel	001001000011001010110110
+7	Hel	000000001001000011001010
+8	Hel	0100100001100101
+9	Hel	0010010000110010
+15	Hel	0000000010010000
+16	Hel	01001000
+17	Hel	00100100
+23	Hel	00000000
+24	Hel	
+25	Hel	
+31	Hel	
+32	Hel	
+33	Hel	
+39	Hel	
+40	Hel	
+41	Hel	
+42	Hel	
+7	Hel	000000001001000011001010
+8	Hel	0100100001100101
+9	Hel	0010010000110010
+
+FixedString ConstVector
+-1	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+0	Hello\0\0\0\0\0	01001000011001010110110001101100011011110000000000000000000000000000000000000000
+1	Hello\0\0\0\0\0	00100100001100101011011000110110001101111000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+9	Hello\0\0\0\0\0	00000000001001000011001010110110001101100011011110000000000000000000000000000000
+15	Hello\0\0\0\0\0	00000000000000001001000011001010110110001101100011011110000000000000000000000000
+16	Hello\0\0\0\0\0	00000000000000000100100001100101011011000110110001101111000000000000000000000000
+17	Hello\0\0\0\0\0	00000000000000000010010000110010101101100011011000110111100000000000000000000000
+23	Hello\0\0\0\0\0	00000000000000000000000010010000110010101101100011011000110111100000000000000000
+24	Hello\0\0\0\0\0	00000000000000000000000001001000011001010110110001101100011011110000000000000000
+25	Hello\0\0\0\0\0	00000000000000000000000000100100001100101011011000110110001101111000000000000000
+31	Hello\0\0\0\0\0	00000000000000000000000000000000100100001100101011011000110110001101111000000000
+32	Hello\0\0\0\0\0	00000000000000000000000000000000010010000110010101101100011011000110111100000000
+33	Hello\0\0\0\0\0	00000000000000000000000000000000001001000011001010110110001101100011011110000000
+39	Hello\0\0\0\0\0	00000000000000000000000000000000000000001001000011001010110110001101100011011110
+40	Hello\0\0\0\0\0	00000000000000000000000000000000000000000100100001100101011011000110110001101111
+41	Hello\0\0\0\0\0	00000000000000000000000000000000000000000010010000110010101101100011011000110111
+42	Hello\0\0\0\0\0	00000000000000000000000000000000000000000001001000011001010110110001101100011011
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+9	Hello\0\0\0\0\0	00000000001001000011001010110110001101100011011110000000000000000000000000000000
+-1	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+0	Hel\0\0\0\0\0\0\0	01001000011001010110110000000000000000000000000000000000000000000000000000000000
+1	Hel\0\0\0\0\0\0\0	00100100001100101011011000000000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00000000100100001100101011011000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	00000000010010000110010101101100000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	00000000001001000011001010110110000000000000000000000000000000000000000000000000
+15	Hel\0\0\0\0\0\0\0	00000000000000001001000011001010110110000000000000000000000000000000000000000000
+16	Hel\0\0\0\0\0\0\0	00000000000000000100100001100101011011000000000000000000000000000000000000000000
+17	Hel\0\0\0\0\0\0\0	00000000000000000010010000110010101101100000000000000000000000000000000000000000
+23	Hel\0\0\0\0\0\0\0	00000000000000000000000010010000110010101101100000000000000000000000000000000000
+24	Hel\0\0\0\0\0\0\0	00000000000000000000000001001000011001010110110000000000000000000000000000000000
+25	Hel\0\0\0\0\0\0\0	00000000000000000000000000100100001100101011011000000000000000000000000000000000
+31	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000100100001100101011011000000000000000000000000000
+32	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000010010000110010101101100000000000000000000000000
+33	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000001001000011001010110110000000000000000000000000
+39	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000001001000011001010110110000000000000000000
+40	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000100100001100101011011000000000000000000
+41	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000010010000110010101101100000000000000000
+42	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000001001000011001010110110000000000000000
+7	Hel\0\0\0\0\0\0\0	00000000100100001100101011011000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	00000000010010000110010101101100000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	00000000001001000011001010110110000000000000000000000000000000000000000000000000
diff --git a/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.sql b/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.sql
index ea1ad4ca4b7..96d6a5d5672 100644
--- a/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.sql
+++ b/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.sql
@@ -1,44 +1,132 @@
+SELECT 'String ConstConst';
 SELECT bin('Hello') == bin(bitShiftRight('Hello', 0));
-SELECT bin(bitShiftRight('Hello', 0));
-SELECT bin(bitShiftRight('Hello', 1));
-SELECT bin(bitShiftRight('Hello', 2));
-SELECT bin(bitShiftRight('Hello', 3));
-SELECT bin(bitShiftRight('Hello', 4));
-SELECT bin(bitShiftRight('Hello', 5));
-SELECT bin(bitShiftRight('Hello', 6));
-SELECT bin(bitShiftRight('Hello', 7));
-SELECT bin(bitShiftRight('Hello', 8));
-SELECT bin(bitShiftRight('Hello', 9));
-SELECT bin(bitShiftRight('Hello', 10));
-SELECT bin(bitShiftRight('Hello', 11));
-SELECT bin(bitShiftRight('Hello', 12));
-SELECT bin(bitShiftRight('Hello', 13));
-SELECT bin(bitShiftRight('Hello', 14));
-SELECT bin(bitShiftRight('Hello', 15));
-SELECT bin(bitShiftRight('Hello', 16));
-SELECT bin(bitShiftRight('Hello', 17));
-SELECT bin(bitShiftRight('Hello', 18));
-SELECT bin(bitShiftRight('Hello', 19));
-SELECT bin(bitShiftRight('Hello', 20));
-SELECT bin(bitShiftRight('Hello', 21));
-SELECT bin(bitShiftRight('Hello', 22));
-SELECT bin(bitShiftRight('Hello', 23));
-SELECT bin(bitShiftRight('Hello', 24));
-SELECT bin(bitShiftRight('Hello', 25));
-SELECT bin(bitShiftRight('Hello', 26));
-SELECT bin(bitShiftRight('Hello', 27));
-SELECT bin(bitShiftRight('Hello', 28));
-SELECT bin(bitShiftRight('Hello', 29));
-SELECT bin(bitShiftRight('Hello', 30));
-SELECT bin(bitShiftRight('Hello', 31));
-SELECT bin(bitShiftRight('Hello', 32));
-SELECT bin(bitShiftRight('Hello', 33));
-SELECT bin(bitShiftRight('Hello', 34));
-SELECT bin(bitShiftRight('Hello', 35));
-SELECT bin(bitShiftRight('Hello', 36));
-SELECT bin(bitShiftRight('Hello', 37));
-SELECT bin(bitShiftRight('Hello', 38));
-SELECT bin(bitShiftRight('Hello', 39));
-SELECT bin(bitShiftRight('Hello', 40));
-SELECT bin(bitShiftRight('Hello', 41));
+SELECT 0, 'Hello',bin(bitShiftRight('Hello', 0));
+SELECT 1, 'Hello',bin(bitShiftRight('Hello', 1));
+SELECT 2, 'Hello',bin(bitShiftRight('Hello', 2));
+SELECT 3, 'Hello',bin(bitShiftRight('Hello', 3));
+SELECT 4, 'Hello',bin(bitShiftRight('Hello', 4));
+SELECT 5, 'Hello',bin(bitShiftRight('Hello', 5));
+SELECT 6, 'Hello',bin(bitShiftRight('Hello', 6));
+SELECT 7, 'Hello',bin(bitShiftRight('Hello', 7));
+SELECT 8, 'Hello',bin(bitShiftRight('Hello', 8));
+SELECT 9, 'Hello',bin(bitShiftRight('Hello', 9));
+SELECT 10,'Hello',bin(bitShiftRight('Hello', 10));
+SELECT 11,'Hello',bin(bitShiftRight('Hello', 11));
+SELECT 12,'Hello',bin(bitShiftRight('Hello', 12));
+SELECT 13,'Hello',bin(bitShiftRight('Hello', 13));
+SELECT 14,'Hello',bin(bitShiftRight('Hello', 14));
+SELECT 15,'Hello',bin(bitShiftRight('Hello', 15));
+SELECT 16,'Hello',bin(bitShiftRight('Hello', 16));
+SELECT 17,'Hello',bin(bitShiftRight('Hello', 17));
+SELECT 18,'Hello',bin(bitShiftRight('Hello', 18));
+SELECT 19,'Hello',bin(bitShiftRight('Hello', 19));
+SELECT 20,'Hello',bin(bitShiftRight('Hello', 20));
+SELECT 21,'Hello',bin(bitShiftRight('Hello', 21));
+SELECT 22,'Hello',bin(bitShiftRight('Hello', 22));
+SELECT 23,'Hello',bin(bitShiftRight('Hello', 23));
+SELECT 24,'Hello',bin(bitShiftRight('Hello', 24));
+SELECT 25,'Hello',bin(bitShiftRight('Hello', 25));
+SELECT 26,'Hello',bin(bitShiftRight('Hello', 26));
+SELECT 27,'Hello',bin(bitShiftRight('Hello', 27));
+SELECT 28,'Hello',bin(bitShiftRight('Hello', 28));
+SELECT 29,'Hello',bin(bitShiftRight('Hello', 29));
+SELECT 30,'Hello',bin(bitShiftRight('Hello', 30));
+SELECT 31,'Hello',bin(bitShiftRight('Hello', 31));
+SELECT 32,'Hello',bin(bitShiftRight('Hello', 32));
+SELECT 33,'Hello',bin(bitShiftRight('Hello', 33));
+SELECT 34,'Hello',bin(bitShiftRight('Hello', 34));
+SELECT 35,'Hello',bin(bitShiftRight('Hello', 35));
+SELECT 36,'Hello',bin(bitShiftRight('Hello', 36));
+SELECT 37,'Hello',bin(bitShiftRight('Hello', 37));
+SELECT 38,'Hello',bin(bitShiftRight('Hello', 38));
+SELECT 39,'Hello',bin(bitShiftRight('Hello', 39));
+SELECT 40,'Hello',bin(bitShiftRight('Hello', 40));
+SELECT 41,'Hello',bin(bitShiftRight('Hello', 41));
+SELECT 42,'Hello',bin(bitShiftRight('Hello', 42));
+
+SELECT 'FixedString ConstConst';
+SELECT bin(toFixedString('Hello', 10)) == bin(bitShiftRight(toFixedString('Hello', 10), 0));
+SELECT 0, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 0));
+SELECT 1, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 1));
+SELECT 2, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 2));
+SELECT 3, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 3));
+SELECT 4, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 4));
+SELECT 5, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 5));
+SELECT 6, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 6));
+SELECT 7, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 7));
+SELECT 8, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 8));
+SELECT 9, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 9));
+SELECT 10,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 10));
+SELECT 11,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 11));
+SELECT 12,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 12));
+SELECT 13,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 13));
+SELECT 14,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 14));
+SELECT 15,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 15));
+SELECT 16,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 16));
+SELECT 17,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 17));
+SELECT 18,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 18));
+SELECT 19,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 19));
+SELECT 20,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 20));
+SELECT 21,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 21));
+SELECT 22,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 22));
+SELECT 23,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 23));
+SELECT 24,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 24));
+SELECT 25,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 25));
+SELECT 26,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 26));
+SELECT 27,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 27));
+SELECT 28,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 28));
+SELECT 29,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 29));
+SELECT 30,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 30));
+SELECT 31,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 31));
+SELECT 32,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 32));
+SELECT 33,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 33));
+SELECT 34,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 34));
+SELECT 35,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 35));
+SELECT 36,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 36));
+SELECT 37,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 37));
+SELECT 38,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 38));
+SELECT 39,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 39));
+SELECT 40,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 40));
+SELECT 41,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 41));
+SELECT 42,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 42));
+SELECT 77,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 77));
+SELECT 78,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 78));
+SELECT 79,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 79));
+SELECT 80,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 80));
+SELECT 81,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 81));
+
+DROP TABLE IF EXISTS test_bit_shift_right_string_integer;
+
+CREATE TABLE test_bit_shift_right_string_integer (str String, fixedStr FixedString(10), id Int64) engine=Log;
+
+INSERT INTO test_bit_shift_right_string_integer VALUES('Hello','Hello',-1)('Hello','Hello',0),('Hello','Hello',1),('Hello','Hello',7),('Hello','Hello',8),('Hello','Hello',9),('Hello','Hello',15),('Hello','Hello',16),('Hello','Hello',17),('Hello','Hello',23),('Hello','Hello',24),('Hello','Hello',25),('Hello','Hello',31),('Hello','Hello',32),('Hello','Hello',33),('Hello','Hello',39),('Hello','Hello',40),('Hello','Hello',41),('Hello','Hello',42),('Hel','Hel',7),('Hel','Hel',8),('Hel','Hel',9);
+
+SELECT bin(bitShiftRight('Hello', 42));  --A blank line
+SELECT 'String VectorVector';
+SELECT id as shift_right_bit,str as arg,bin(bitShiftRight(str, id)) as string_res FROM test_bit_shift_right_string_integer;
+SELECT id as shift_right_bit,str as arg,bin(bitShiftRight(str, id)) as string_res FROM test_bit_shift_right_string_integer WHERE (str='Hello' AND (id=23 OR id=24 OR id=25)) OR (str='Hel' AND (id=7 OR id=8 OR id=9));
+
 SELECT bin(bitShiftRight('Hello', 42));
+SELECT 'FixedString VectorVector';
+SELECT id as shift_right_bit,fixedStr as arg,bin(bitShiftRight(fixedStr, id)) as fixed_string_res FROM test_bit_shift_right_string_integer;
+SELECT id as shift_right_bit,fixedStr as arg,bin(bitShiftRight(fixedStr, id)) as fixed_string_res FROM test_bit_shift_right_string_integer WHERE (str='Hello' AND (id=23 OR id=24 OR id=25)) OR (str='Hel' AND (id=7 OR id=8 OR id=9));
+
+SELECT bin(bitShiftRight('Hello', 42));  --A blank line
+SELECT 'String VectorConst';
+SELECT 7 as shift_right_bit,str as arg,bin(bitShiftRight(str, 7)) as string_res FROM test_bit_shift_right_string_integer;
+SELECT 8 as shift_right_bit,str as arg,bin(bitShiftRight(str, 8)) as string_res FROM test_bit_shift_right_string_integer;
+
+SELECT bin(bitShiftRight('Hello', 42));  --A blank line
+SELECT 'FixedString VectorConst';
+SELECT 7 as shift_right_bit,fixedStr as arg,bin(bitShiftRight(fixedStr, 7)) as fixed_string_res FROM test_bit_shift_right_string_integer;
+SELECT 8 as shift_right_bit,fixedStr as arg,bin(bitShiftRight(fixedStr, 8)) as fixed_string_res FROM test_bit_shift_right_string_integer;
+
+SELECT bin(bitShiftRight('Hello', 42));  --A blank line
+SELECT 'String ConstVector';
+SELECT id as shift_right_bit,'Hello' as arg,bin(bitShiftRight('Hello', id)) as string_res FROM test_bit_shift_right_string_integer;
+SELECT id as shift_right_bit,'Hel' as arg,bin(bitShiftRight('Hel', id)) as string_res FROM test_bit_shift_right_string_integer;
+
+SELECT bin(bitShiftRight('Hello', 42));  --A blank line
+SELECT 'FixedString ConstVector';
+SELECT id as shift_right_bit,toFixedString('Hello', 10) as arg,bin(bitShiftRight(toFixedString('Hello', 10), id)) as fixed_string_res FROM test_bit_shift_right_string_integer;
+SELECT id as shift_right_bit,toFixedString('Hel', 10) as arg,bin(bitShiftRight(toFixedString('Hel', 10), id)) as fixed_string_res FROM test_bit_shift_right_string_integer;

From 309d1d899ef7f7fbc787291500c8b306f03a5657 Mon Sep 17 00:00:00 2001
From: gyuton <40863448+gyuton@users.noreply.github.com>
Date: Sat, 4 Sep 2021 21:36:17 +0300
Subject: [PATCH 069/273] Apply suggestions from code review

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
---
 .../operations/settings/merge-tree-settings.md |  8 ++++----
 .../operations/settings/merge-tree-settings.md | 18 +++++++++---------
 docs/ru/operations/settings/settings.md        | 16 ++++++++--------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/docs/en/operations/settings/merge-tree-settings.md b/docs/en/operations/settings/merge-tree-settings.md
index dc90df52183..a3a258234e1 100644
--- a/docs/en/operations/settings/merge-tree-settings.md
+++ b/docs/en/operations/settings/merge-tree-settings.md
@@ -185,7 +185,7 @@ Default value: 0.
 
 Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) fetches. This setting is applied to a particular table, unlike the [max_replicated_fetches_network_bandwidth_for_server](settings.md#max_replicated_fetches_network_bandwidth_for_server) setting, which is applied to the server.
 
-You can limit both the server network and a network for a particular table, but for this the value of the table-level setting should be less than server-level one. Otherwise the server considers only the `max_replicated_fetches_network_bandwidth_for_server` setting.
+You can limit both server network and network for a particular table, but for this the value of the table-level setting should be less than server-level one. Otherwise the server considers only the `max_replicated_fetches_network_bandwidth_for_server` setting.
 
 The setting isn't followed perfectly accurately.
 
@@ -198,13 +198,13 @@ Default value: `0`.
 
 **Usage**
 
-Could be used for throttling speed when replicating the data to add or replace new nodes.
+Could be used for throttling speed when replicating data to add or replace new nodes.
 
 ## max_replicated_sends_network_bandwidth {#max_replicated_sends_network_bandwidth}
 
 Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) sends. This setting is applied to a particular table, unlike the [max_replicated_sends_network_bandwidth_for_server](settings.md#max_replicated_sends_network_bandwidth_for_server) setting, which is applied to the server.
 
-You can limit both the server network and a network for a particular table, but for this the value of the table-level setting should be less than server-level one. Otherwise the server considers only the `max_replicated_sends_network_bandwidth_for_server` setting.
+You can limit both server network and network for a particular table, but for this the value of the table-level setting should be less than server-level one. Otherwise the server considers only the `max_replicated_sends_network_bandwidth_for_server` setting.
 
 The setting isn't followed perfectly accurately.
 
@@ -217,7 +217,7 @@ Default value: `0`.
 
 **Usage**
 
-Could be used for throttling speed when replicating the data to add or replace new nodes.
+Could be used for throttling speed when replicating data to add or replace new nodes.
 
 ## old_parts_lifetime {#old-parts-lifetime}
 
diff --git a/docs/ru/operations/settings/merge-tree-settings.md b/docs/ru/operations/settings/merge-tree-settings.md
index afe828cafa0..3d1217996fb 100644
--- a/docs/ru/operations/settings/merge-tree-settings.md
+++ b/docs/ru/operations/settings/merge-tree-settings.md
@@ -203,41 +203,41 @@ Eсли суммарное число активных кусков во все
 
 ## max_replicated_fetches_network_bandwidth {#max_replicated_fetches_network_bandwidth}
 
-Ограничивает максимальную скорость обмена данными в сети в байтах в секунду для [репликационных](../../engines/table-engines/mergetree-family/replication.md) синхронизаций. Настройка применяется к конкретной таблице, в отличие от [max_replicated_fetches_network_bandwidth_for_server](settings.md#max_replicated_fetches_network_bandwidth_for_server), которая применяется к серверу.
+Ограничивает максимальную скорость обмена данными в сети (в байтах в секунду) для синхронизаций между [репликами](../../engines/table-engines/mergetree-family/replication.md). Настройка применяется к конкретной таблице, в отличие от [max_replicated_fetches_network_bandwidth_for_server](settings.md#max_replicated_fetches_network_bandwidth_for_server), которая применяется к серверу.
 
-Можно ограничить как сеть сервера, так и сеть для конкретной таблицы, но для этого значение табличной настройки должно быть меньше серверной. Иначе сервер будет учитывать только настройку `max_replicated_fetches_network_bandwidth_for_server`.
+Можно ограничить скорость обмена данными как для всего сервера, так и для конкретной таблицы, но для этого значение табличной настройки должно быть меньше серверной. Иначе сервер будет учитывать только настройку `max_replicated_fetches_network_bandwidth_for_server`.
 
-Настройка следуется неточно.
+Настройка соблюдается неточно.
 
 Возможные значения:
 
 -   Любое целое положительное число.
--   0 — Скорость неограничена.
+-   0 — Скорость не ограничена.
 
 Значение по умолчанию: `0`.
 
 **Использование**
 
-Может быть использована для тротлинга скорости при репликации данных для добавления или замены новых узлов.
+Может быть использована для ограничения скорости передачи данных при репликации данных для добавления или замены новых узлов.
 
 ## max_replicated_sends_network_bandwidth {#max_replicated_sends_network_bandwidth}
 
-Ограничивает максимальную скорость обмена данными в сети в байтах в секунду для [репликационных](../../engines/table-engines/mergetree-family/replication.md) отправок. Настройка применяется к конкретной таблице, в отличие от [max_replicated_sends_network_bandwidth_for_server](settings.md#max_replicated_sends_network_bandwidth_for_server), которая применяется к серверу.
+Ограничивает максимальную скорость обмена данными в сети (в байтах в секунду) для синхронизации между [репликами](../../engines/table-engines/mergetree-family/replication.md). Настройка применяется к конкретной таблице, в отличие от [max_replicated_sends_network_bandwidth_for_server](settings.md#max_replicated_sends_network_bandwidth_for_server), которая применяется к серверу.
 
-Можно ограничить как сеть сервера, так и сеть для конкретной таблицы, но для этого значение табличной настройки должно быть меньше серверной. Иначе сервер будет учитывать только настройку `max_replicated_sends_network_bandwidth_for_server`.
+Можно ограничить скорость обмена данными как для всего сервера, так и для конкретной таблицы, но для этого значение табличной настройки должно быть меньше серверной. Иначе сервер будет учитывать только настройку `max_replicated_sends_network_bandwidth_for_server`.
 
 Настройка следуется неточно.
 
 Возможные значения:
 
 -   Любое целое положительное число.
--   0 — Скорость неограничена.
+-   0 — Скорость не ограничена.
 
 Значение по умолчанию: `0`.
 
 **Использование**
 
-Может быть использована для тротлинга скорости при репликации данных для добавления или замены новых узлов.
+Может быть использована для ограничения скорости сети при репликации данных для добавления или замены новых узлов.
 
 ## max_bytes_to_merge_at_max_space_in_pool {#max-bytes-to-merge-at-max-space-in-pool}
 
diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index 186238c33b3..aacdd02c624 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -1067,37 +1067,37 @@ SELECT type, query FROM system.query_log WHERE log_comment = 'log_comment test'
 
 ## max_replicated_fetches_network_bandwidth_for_server {#max_replicated_fetches_network_bandwidth_for_server}
 
-Ограничивает максимальную скорость обмена данными в сети в байтах в секунду для [репликационных](../../engines/table-engines/mergetree-family/replication.md) синхронизаций. Применяется на старте сервера. Возможно также ограничить скорость для конкретной таблицы с помощью настройки [max_replicated_fetches_network_bandwidth](../../operations/settings/merge-tree-settings.md#max_replicated_fetches_network_bandwidth).
+Ограничивает максимальную скорость обмена данными в сети (в байтах в секунду) для синхронизации между [репликами](../../engines/table-engines/mergetree-family/replication.md). Применяется только при запуске сервера. Можно также ограничить скорость для конкретной таблицы с помощью настройки [max_replicated_fetches_network_bandwidth](../../operations/settings/merge-tree-settings.md#max_replicated_fetches_network_bandwidth).
 
-Значение настройки следуется неточно.
+Значение настройки соблюдается неточно.
 
 Возможные значения:
 
 -   Любое целое положительное число.
--   0 — Скорость неограничена.
+-   0 — Скорость не ограничена.
 
 Значение по умолчанию: `0`.
 
 **Использование**
 
-Может быть использована для тротлинга скорости при репликации данных для добавления или замены новых узлов.
+Может быть использована для ограничения скорости сети при репликации данных для добавления или замены новых узлов.
 
 ## max_replicated_sends_network_bandwidth_for_server {#max_replicated_sends_network_bandwidth_for_server}
 
-Ограничивает максимальную скорость обмена данными в сети в байтах в секунду для [репликационных](../../engines/table-engines/mergetree-family/replication.md) отправок. Применяется на старте сервера. Возможно также ограничить скорость для конкретной таблицы с помощью настройки [max_replicated_sends_network_bandwidth](../../operations/settings/merge-tree-settings.md#max_replicated_sends_network_bandwidth).
+Ограничивает максимальную скорость обмена данными в сети (в байтах в секунду) для [репликационных](../../engines/table-engines/mergetree-family/replication.md) отправок. Применяется только при запуске сервера. Можно также ограничить скорость для конкретной таблицы с помощью настройки [max_replicated_sends_network_bandwidth](../../operations/settings/merge-tree-settings.md#max_replicated_sends_network_bandwidth).
 
-Значение настройки следуется неточно.
+Значение настройки соблюдается неточно.
 
 Возможные значения:
 
 -   Любое целое положительное число.
--   0 — Скорость неограничена.
+-   0 — Скорость не ограничена.
 
 Значение по умолчанию: `0`.
 
 **Использование**
 
-Может быть использована для тротлинга скорости при репликации данных для добавления или замены новых узлов.
+Может быть использована для ограничения скорости сети при репликации данных для добавления или замены новых узлов.
 
 ## connect_timeout_with_failover_ms {#connect-timeout-with-failover-ms}
 

From e73719ab806510d1f6e1573f0804b7b35bdb57a8 Mon Sep 17 00:00:00 2001
From: zhangxiao871 <zhangxiao871@jd.com>
Date: Sun, 5 Sep 2021 13:21:06 +0800
Subject: [PATCH 070/273] Fix FixedString type ConstConst.

---
 src/Functions/FunctionBinaryArithmetic.h                    | 6 ++++--
 .../02016_bit_shift_right_for_string_integer.sql            | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index 8dcce31ea9a..955eb6f0d99 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -1251,7 +1251,6 @@ public:
     {
         using LeftDataType = std::decay_t<decltype(left)>;
         using RightDataType = std::decay_t<decltype(right)>;
-        using ResultDataType = DataTypeString;
 
         const auto * const col_left_raw = arguments[0].column.get();
         const auto * const col_right_raw = arguments[1].column.get();
@@ -1268,6 +1267,9 @@ public:
         const auto * col_left = col_left_const ? checkAndGetColumn<LeftColumnType>(col_left_const->getDataColumn())
                                                : checkAndGetColumn<LeftColumnType>(col_left_raw);
 
+        if (!col_left)
+            return nullptr;
+
         const typename LeftColumnType::Chars & in_vec = col_left->getChars();
 
         typename LeftColumnType::MutablePtr col_res;
@@ -1291,7 +1293,7 @@ public:
                 OpImpl::template processString<OpCase::Vector>(in_vec.data(), col_left->getOffsets().data(), &value, out_vec, out_offsets, 1);
             }
 
-            return ResultDataType().createColumnConst(col_left_const->size(), col_res->size() ? (*col_res)[0] : Field(""));
+            return ColumnConst::create(std::move(col_res), col_left->size());
         }
         else if (!col_left_const && !col_right_const && col_left && col_right)
         {
diff --git a/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.sql b/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.sql
index 96d6a5d5672..0ee04e408ba 100644
--- a/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.sql
+++ b/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.sql
@@ -130,3 +130,5 @@ SELECT bin(bitShiftRight('Hello', 42));  --A blank line
 SELECT 'FixedString ConstVector';
 SELECT id as shift_right_bit,toFixedString('Hello', 10) as arg,bin(bitShiftRight(toFixedString('Hello', 10), id)) as fixed_string_res FROM test_bit_shift_right_string_integer;
 SELECT id as shift_right_bit,toFixedString('Hel', 10) as arg,bin(bitShiftRight(toFixedString('Hel', 10), id)) as fixed_string_res FROM test_bit_shift_right_string_integer;
+
+DROP TABLE IF EXISTS test_bit_shift_right_string_integer;

From 8c30f09a00a88d588cb8717261855aa4e585da35 Mon Sep 17 00:00:00 2001
From: zhangxiao871 <zhangxiao871@jd.com>
Date: Sun, 5 Sep 2021 22:08:24 +0800
Subject: [PATCH 071/273] Fix PVS check.

---
 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 955eb6f0d99..afe7a525c39 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -1295,7 +1295,7 @@ public:
 
             return ColumnConst::create(std::move(col_res), col_left->size());
         }
-        else if (!col_left_const && !col_right_const && col_left && col_right)
+        else if (!col_left_const && !col_right_const && col_right)
         {
             if constexpr (std::is_same_v<LeftDataType, DataTypeFixedString>)
             {
@@ -1324,7 +1324,7 @@ public:
                     in_vec.data(), col_left->getOffsets().data(), col_right->getData().data(), out_vec, out_offsets, col_right->size());
             }
         }
-        else if (col_left && col_right_const)
+        else if (col_right_const)
         {
             const T1 value = col_right_const->template getValue<T1>();
             if constexpr (std::is_same_v<LeftDataType, DataTypeFixedString>)

From e7ed98fa58806b83d7d0bcb18d798c8584635e34 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Tue, 31 Aug 2021 23:16:03 +0300
Subject: [PATCH 072/273] Do not allow ThreadFromGlobalPool::join() from the
 spawned/occupated thread

v2: wrap with shared_ptr
    https://clickhouse-test-reports.s3.yandex.net/28431/f7b3a3e952038923b1347b3d461061326d0ffc27/functional_stateless_tests_(address).html#fail1
---
 src/Common/ThreadPool.h | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Common/ThreadPool.h b/src/Common/ThreadPool.h
index 1da5d25eef0..e7bd509d75a 100644
--- a/src/Common/ThreadPool.h
+++ b/src/Common/ThreadPool.h
@@ -8,6 +8,7 @@
 #include <queue>
 #include <list>
 #include <optional>
+#include <atomic>
 
 #include <Poco/Event.h>
 #include <Common/ThreadStatus.h>
@@ -156,14 +157,16 @@ public:
 class ThreadFromGlobalPool
 {
 public:
-    ThreadFromGlobalPool() {}
+    ThreadFromGlobalPool() = default;
 
     template <typename Function, typename... Args>
     explicit ThreadFromGlobalPool(Function && func, Args &&... args)
         : state(std::make_shared<Poco::Event>())
+        , thread_id(std::make_shared<std::thread::id>())
     {
         /// NOTE: If this will throw an exception, the destructor won't be called.
         GlobalThreadPool::instance().scheduleOrThrow([
+            thread_id = thread_id,
             state = state,
             func = std::forward<Function>(func),
             args = std::make_tuple(std::forward<Args>(args)...)]() mutable /// mutable is needed to destroy capture
@@ -171,6 +174,8 @@ public:
             auto event = std::move(state);
             SCOPE_EXIT(event->set());
 
+            thread_id = std::make_shared<std::thread::id>(std::this_thread::get_id());
+
             /// This moves are needed to destroy function and arguments before exit.
             /// It will guarantee that after ThreadFromGlobalPool::join all captured params are destroyed.
             auto function = std::move(func);
@@ -193,6 +198,7 @@ public:
         if (joinable())
             abort();
         state = std::move(rhs.state);
+        thread_id = std::move(rhs.thread_id);
         return *this;
     }
 
@@ -220,12 +226,18 @@ public:
 
     bool joinable() const
     {
-        return state != nullptr;
+        if (!state)
+            return false;
+        /// Thread cannot join itself.
+        if (*thread_id == std::this_thread::get_id())
+            return false;
+        return true;
     }
 
 private:
     /// The state used in this object and inside the thread job.
     std::shared_ptr<Poco::Event> state;
+    std::shared_ptr<std::thread::id> thread_id;
 };
 
 

From 66efe4202c72625c955f5defaa09410c2a5d13e3 Mon Sep 17 00:00:00 2001
From: George <gyuton@yandex-team.ru>
Date: Mon, 6 Sep 2021 02:34:09 +0300
Subject: [PATCH 073/273] Fixed and updated

---
 .../functions/tuple-map-functions.md          |  2 +-
 .../functions/tuple-map-functions.md          | 22 +++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/docs/en/sql-reference/functions/tuple-map-functions.md b/docs/en/sql-reference/functions/tuple-map-functions.md
index ef5f5814017..04f02c3ead4 100644
--- a/docs/en/sql-reference/functions/tuple-map-functions.md
+++ b/docs/en/sql-reference/functions/tuple-map-functions.md
@@ -78,7 +78,7 @@ mapAdd(arg1, arg2 [, ...])
 
 **Arguments**
 
-Arguments are [maps](../../sql-reference/data-types/map.md) or [tuples](../../sql-reference/data-types/tuple.md#tuplet1-t2) of two [arrays](../../sql-reference/data-types/array.md#data-type-array), where items in the first array represent keys, and the second array contains values for the each key. All key arrays should have same type, and all value arrays should contain items which are promote to the one type ([Int64](../../sql-reference/data-types/int-uint.md#int-ranges), [UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges) or [Float64](../../sql-reference/data-types/float.md#float32-float64)). The common promoted type is used as a type for the result array.
+Arguments are [maps](../../sql-reference/data-types/map.md) or [tuples](../../sql-reference/data-types/tuple.md#tuplet1-t2) of two [arrays](../../sql-reference/data-types/array.md#data-type-array), where items in the first array represent keys, and the second array contains values for the each key. All key arrays should have same type, and all value arrays should contain items which are promoted to the one type ([Int64](../../sql-reference/data-types/int-uint.md#int-ranges), [UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges) or [Float64](../../sql-reference/data-types/float.md#float32-float64)). The common promoted type is used as a type for the result array.
 
 **Returned value**
 
diff --git a/docs/ru/sql-reference/functions/tuple-map-functions.md b/docs/ru/sql-reference/functions/tuple-map-functions.md
index 4775152fb54..1cea3ca42c7 100644
--- a/docs/ru/sql-reference/functions/tuple-map-functions.md
+++ b/docs/ru/sql-reference/functions/tuple-map-functions.md
@@ -73,22 +73,22 @@ SELECT a['key2'] FROM table_map;
 **Синтаксис**
 
 ``` sql
-mapAdd(Tuple(Array, Array), Tuple(Array, Array) [, ...])
+mapAdd(arg1, arg2 [, ...])
 ```
 
 **Аргументы**
 
-Аргументами являются [кортежи](../../sql-reference/data-types/tuple.md#tuplet1-t2) из двух [массивов](../../sql-reference/data-types/array.md#data-type-array), где элементы в первом массиве представляют ключи, а второй массив содержит значения для каждого ключа.
+Аргументами являются контейнеры [Map](../../sql-reference/data-types/map.md) или [кортежи](../../sql-reference/data-types/tuple.md#tuplet1-t2) из двух [массивов](../../sql-reference/data-types/array.md#data-type-array), где элементы в первом массиве представляют ключи, а второй массив содержит значения для каждого ключа.
 Все массивы ключей должны иметь один и тот же тип, а все массивы значений должны содержать элементы, которые можно приводить к одному типу ([Int64](../../sql-reference/data-types/int-uint.md#int-ranges), [UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges) или [Float64](../../sql-reference/data-types/float.md#float32-float64)).
 Общий приведенный тип используется в качестве типа для результирующего массива.
 
 **Возвращаемое значение**
 
--   Возвращает один [кортеж](../../sql-reference/data-types/tuple.md#tuplet1-t2), в котором первый массив содержит отсортированные ключи, а второй — значения.
+-   В зависимости от аргументов возвращает один [Map](../../sql-reference/data-types/map.md) или [кортеж](../../sql-reference/data-types/tuple.md#tuplet1-t2), в котором первый массив содержит отсортированные ключи, а второй — значения.
 
 **Пример**
 
-Запрос:
+Запрос с кортежем:
 
 ``` sql
 SELECT mapAdd(([toUInt8(1), 2], [1, 1]), ([toUInt8(1), 2], [1, 1])) as res, toTypeName(res) as type;
@@ -102,6 +102,20 @@ SELECT mapAdd(([toUInt8(1), 2], [1, 1]), ([toUInt8(1), 2], [1, 1])) as res, toTy
 └───────────────┴────────────────────────────────────┘
 ```
 
+Запрос с типом `Map`:
+
+```sql
+SELECT mapAdd(map(1,1), map(1,1));
+```
+
+Result:
+
+```text
+┌─mapAdd(map(1, 1), map(1, 1))─┐
+│ {1:2}                        │
+└──────────────────────────────┘
+```
+
 ## mapSubtract {#function-mapsubtract}
 
 Собирает все ключи и вычитает соответствующие значения.

From 17a74d2188cf9abcd6dd1b6769329ac8802af482 Mon Sep 17 00:00:00 2001
From: Evgeniia Sudarikova <evgsudarikova@yandex-team.ru>
Date: Mon, 6 Sep 2021 11:48:51 +0300
Subject: [PATCH 074/273] edited after review

---
 docs/en/operations/clickhouse-keeper.md | 70 +++++++++++------------
 docs/ru/operations/clickhouse-keeper.md | 74 ++++++++++++-------------
 2 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/docs/en/operations/clickhouse-keeper.md b/docs/en/operations/clickhouse-keeper.md
index 65ad04a93d5..ad217d88275 100644
--- a/docs/en/operations/clickhouse-keeper.md
+++ b/docs/en/operations/clickhouse-keeper.md
@@ -3,7 +3,7 @@ toc_priority: 66
 toc_title: ClickHouse Keeper
 ---
 
-# Clickhouse-keeper
+# [pre-production] ClickHouse Keeper
 
 ClickHouse server use [ZooKeeper](https://zookeeper.apache.org/) coordination system for data [replication](../engines/table-engines/mergetree-family/replication.md) and [distributed DDL](../sql-reference/distributed-ddl.md) queries execution. ClickHouse Keeper is an alternative coordination system compatible with ZooKeeper.
 
@@ -12,49 +12,49 @@ ClickHouse server use [ZooKeeper](https://zookeeper.apache.org/) coordination sy
 
 ## Implementation details
 
-ZooKeeper is one of the first well-known open-source coordination systems. It's implemented in Java, has quite a simple and powerful data model. ZooKeeper's coordination algorithm called ZAB (ZooKeeper Atomic Broadcast) doesn't provide linearizability guarantees for reads, because each ZooKeeper node serves reads locally. Unlike ZooKeeper `clickhouse-keeper` written in C++ and use [RAFT algorithm](https://raft.github.io/) [implementation](https://github.com/eBay/NuRaft). This algorithm allows to have linearizability for reads and writes, has several open-source implementations in different languages.
+ZooKeeper is one of the first well-known open-source coordination systems. It's implemented in Java, has quite a simple and powerful data model. ZooKeeper's coordination algorithm called ZAB (ZooKeeper Atomic Broadcast) doesn't provide linearizability guarantees for reads, because each ZooKeeper node serves reads locally. Unlike ZooKeeper ClickHouse Keeper written in C++ and use [RAFT algorithm](https://raft.github.io/) [implementation](https://github.com/eBay/NuRaft). This algorithm allows to have linearizability for reads and writes, has several open-source implementations in different languages.
 
-By default, `clickhouse-keeper` provides the same guarantees as ZooKeeper (linearizable writes, non-linearizable reads). It has a compatible client-server protocol, so any standard ZooKeeper client can be used to interact with `clickhouse-keeper`. Snapshots and logs have an incompatible format with ZooKeeper, but `clickhouse-keeper-converter` tool allows to convert ZooKeeper data to `clickhouse-keeper` snapshot. Interserver protocol in `clickhouse-keeper`is also incompatible with ZooKeeper so mixed ZooKeeper/clickhouse-keeper cluster is impossible.
+By default, ClickHouse Keeper provides the same guarantees as ZooKeeper (linearizable writes, non-linearizable reads). It has a compatible client-server protocol, so any standard ZooKeeper client can be used to interact with ClickHouse Keeper. Snapshots and logs have an incompatible format with ZooKeeper, but `clickhouse-keeper-converter` tool allows to convert ZooKeeper data to ClickHouse Keeper snapshot. Interserver protocol in ClickHouse Keeper is also incompatible with ZooKeeper so mixed ZooKeeper / ClickHouse Keeper cluster is impossible.
 
 ## Configuration
 
-`clickhouse-keeper` can be used as a standalone replacement for ZooKeeper or as an internal part of the ClickHouse Server, but in both cases configuration is almost the same `.xml` file. The main `clickhouse-keeper` configuration tag is `<keeper_server>`. Keeper configuration has the following parameters:
+ClickHouse Keeper can be used as a standalone replacement for ZooKeeper or as an internal part of the ClickHouse server, but in both cases configuration is almost the same `.xml` file. The main ClickHouse Keeper configuration tag is `<keeper_server>`. Keeper configuration has the following parameters:
 
--    `tcp_port` — the port for a client to connect (default for ZooKeeper is `2181`)
--    `tcp_port_secure` — the secure port for a client to connect
--    `server_id` — unique server id, each participant of the clickhouse-keeper cluster must have a unique number (1, 2, 3, and so on)
--    `log_storage_path` — path to coordination logs, better to store logs on the non-busy device (same for ZooKeeper)
--    `snapshot_storage_path` — path to coordination snapshots
+-    `tcp_port` — Port for a client to connect (default for ZooKeeper is `2181`).
+-    `tcp_port_secure` — Secure port for a client to connect.
+-    `server_id` — Unique server id, each participant of the ClickHouse Keeper cluster must have a unique number (1, 2, 3, and so on).
+-    `log_storage_path` — Path to coordination logs, better to store logs on the non-busy device (same for ZooKeeper).
+-    `snapshot_storage_path` — Path to coordination snapshots.
 
-Other common parameters are inherited from clickhouse-server config (`listen_host`, `logger`, and so on).
+Other common parameters are inherited from ClickHouse server config (`listen_host`, `logger`, and so on).
 
 Internal coordination settings are located in `<keeper_server>.<coordination_settings>` section:
 
--    `operation_timeout_ms` — timeout for a single client operation (default: 10000)
--    `session_timeout_ms` — timeout for client session (default: 30000)
--    `dead_session_check_period_ms` — how often clickhouse-keeper check dead sessions and remove them (default: 500)
--    `heart_beat_interval_ms` — how often a clickhouse-keeper leader will send heartbeats to followers (default: 500)
--    `election_timeout_lower_bound_ms` — if follower didn't receive heartbeats from the leader in this interval, then it can initiate leader election (default: 1000)
--    `election_timeout_upper_bound_ms` — if follower didn't receive heartbeats from the leader in this interval, then it must initiate leader election (default: 2000)
--    `rotate_log_storage_interval` — how many log records to store in a single file (default: 100000)
--    `reserved_log_items` — how many coordination log records to store before compaction (default: 100000)
--    `snapshot_distance` — how often clickhouse-keeper will create new snapshots (in the number of records in logs) (default: 100000)
--    `snapshots_to_keep` — how many snapshots to keep (default: 3)
--    `stale_log_gap` — the threshold when leader consider follower as stale and send snapshot to it instead of logs (default: 10000)
--    `fresh_log_gap` - when node became fresh (default: 200)
--    `max_requests_batch_size` - max size of batch in requests count before it will be sent to RAFT (default: 100)
--    `force_sync` — call `fsync` on each write to coordination log (default: true)
--    `quorum_reads` - execute read requests as writes through whole RAFT consesus with similar speed (default: false)
--    `raft_logs_level` — text logging level about coordination (trace, debug, and so on) (default: system default)
--    `auto_forwarding` - allow to forward write requests from followers to leader (default: true)
--    `shutdown_timeout` — wait to finish internal connections and shutdown (ms) (default: 5000)
--    `startup_timeout` — if the server doesn't connect to other quorum participants in the specified timeout it will terminate (ms) (default: 30000)
+-    `operation_timeout_ms` — Timeout for a single client operation (ms) (default: 10000).
+-    `session_timeout_ms` — Timeout for client session (ms) (default: 30000).
+-    `dead_session_check_period_ms` — How often ClickHouse Keeper check dead sessions and remove them (ms) (default: 500).
+-    `heart_beat_interval_ms` — How often a ClickHouse Keeper leader will send heartbeats to followers (ms) (default: 500).
+-    `election_timeout_lower_bound_ms` — If follower didn't receive heartbeats from the leader in this interval, then it can initiate leader election (default: 1000).
+-    `election_timeout_upper_bound_ms` — If follower didn't receive heartbeats from the leader in this interval, then it must initiate leader election (default: 2000).
+-    `rotate_log_storage_interval` — How many log records to store in a single file (default: 100000).
+-    `reserved_log_items` — How many coordination log records to store before compaction (default: 100000).
+-    `snapshot_distance` — How often ClickHouse Keeper will create new snapshots (in the number of records in logs) (default: 100000).
+-    `snapshots_to_keep` — How many snapshots to keep (default: 3).
+-    `stale_log_gap` — Threshold when leader consider follower as stale and send snapshot to it instead of logs (default: 10000).
+-    `fresh_log_gap` — When node became fresh (default: 200).
+-    `max_requests_batch_size` - Max size of batch in requests count before it will be sent to RAFT (default: 100).
+-    `force_sync` — Call `fsync` on each write to coordination log (default: true).
+-    `quorum_reads` — Execute read requests as writes through whole RAFT consesus with similar speed (default: false).
+-    `raft_logs_level` — Text logging level about coordination (trace, debug, and so on) (default: system default).
+-    `auto_forwarding` — Allow to forward write requests from followers to leader (default: true).
+-    `shutdown_timeout` — Wait to finish internal connections and shutdown (ms) (default: 5000).
+-    `startup_timeout` — If the server doesn't connect to other quorum participants in the specified timeout it will terminate (ms) (default: 30000).
 
 Quorum configuration is located in `<keeper_server>.<raft_configuration>` section and contain servers description. The only parameter for the whole quorum is `secure`, which enables encrypted connection for communication between quorum participants. The main parameters for each `<server>` are:
 
--    `id` — server_id in quorum
--    `hostname` — hostname where this server placed
--    `port` — port where this server listens for connections
+-    `id` — Server_id in quorum.
+-    `hostname` — Hostname where this server placed.
+-    `port` — Port where this server listens for connections.
 
 
 Examples of configuration for quorum with three nodes can be found in [integration tests](https://github.com/ClickHouse/ClickHouse/tree/master/tests/integration) with `test_keeper_` prefix. Example configuration for server #1:
@@ -94,7 +94,7 @@ Examples of configuration for quorum with three nodes can be found in [integrati
 
 ## How to run
 
-`clickhouse-keeper` is bundled into `clickhouse-server` package, just add configuration of `<keeper_server>` and start ClickHouse Server as always. If you want to run standalone `clickhouse-keeper` you can start it in a similar way with:
+ClickHouse Keeper is bundled into `clickhouse-server` package, just add configuration of `<keeper_server>` and start ClickHouse server as always. If you want to run standalone ClickHouse Keeper you can start it in a similar way with:
 
 ```bash
 clickhouse-keeper --config /etc/your_path_to_config/config.xml --daemon
@@ -102,7 +102,7 @@ clickhouse-keeper --config /etc/your_path_to_config/config.xml --daemon
 
 ## [experimental] Migration from ZooKeeper
 
-Seamlessly migration from ZooKeeper to `clickhouse-keeper` is impossible you have to stop your ZooKeeper cluster, convert data and start `clickhouse-keeper`. `clickhouse-keeper-converter` tool allows to convert ZooKeeper logs and snapshots to `clickhouse-keeper` snapshot. It works only with ZooKeeper > 3.4. Steps for migration:
+Seamlessly migration from ZooKeeper to ClickHouse Keeper is impossible you have to stop your ZooKeeper cluster, convert data and start ClickHouse Keeper. `clickhouse-keeper-converter` tool allows to convert ZooKeeper logs and snapshots to ClickHouse Keeper snapshot. It works only with ZooKeeper > 3.4. Steps for migration:
 
 1. Stop all ZooKeeper nodes.
 
@@ -114,6 +114,6 @@ Seamlessly migration from ZooKeeper to `clickhouse-keeper` is impossible you hav
 clickhouse-keeper-converter --zookeeper-logs-dir /var/lib/zookeeper/version-2 --zookeeper-snapshots-dir /var/lib/zookeeper/version-2 --output-dir /path/to/clickhouse/keeper/snapshots
 ```
 
-4. Copy snapshot to ClickHouse server nodes with configured `keeper` or start `clickhouse-keeper` instead of ZooKeeper. The snapshot must persist on all nodes, otherwise, empty nodes can be faster and one of them can become leader.
+4. Copy snapshot to ClickHouse server nodes with configured `keeper` or start ClickHouse Keeper instead of ZooKeeper. The snapshot must persist on all nodes, otherwise, empty nodes can be faster and one of them can become a leader.
 
 [Original article](https://clickhouse.tech/docs/en/operations/clickhouse-keeper/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index a941154f292..ec4159adfe2 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -3,58 +3,58 @@ toc_priority: 66
 toc_title: ClickHouse Keeper
 ---
 
-# [препродакшн] Clickhouse-keeper
+# [пре-продакшн] ClickHouse Keeper
 
 Сервер ClickHouse использует сервис координации [ZooKeeper](https://zookeeper.apache.org/) для [репликации](../engines/table-engines/mergetree-family/replication.md) данных и выполнения [распределенных DDL запросов](../sql-reference/distributed-ddl.md). ClickHouse Keeper — это альтернативный сервис координации, совместимый с ZooKeeper.
 
-!!! warning "Внимание"
-    Эта функция сейчас в стадии препродакшн, тестируется в непрерывной интеграции (CI) на нескольких внутренних установках.
+!!! warning "Предупреждение"
+    Эта функция находится в стадии пре-продакшн и тестируется в непрерывной интеграции (CI) на нескольких внутренних установках.
 
 ## Детали реализации
 
-ZooKeeper — один из первых широко известных сервисов координации с открытым исходным кодом: реализован на Java, имеет достаточно простую и мощную модель данных. Алгоритм координации Zookeeper называется ZAB (ZooKeeper Atomic Broadcast). Он не гарантирует линеаризуемость операций чтения, поскольку каждый узел ZooKeeper обслуживает чтения локально. В отличие от ZooKeeper, `clickhouse-keeper` реализован на C++ и использует алгоритм [RAFT](https://raft.github.io/), [реализация](https://github.com/eBay/NuRaft). Этот алгоритм обеспечивает линеаризуемость чтения и записи, имеет несколько реализаций с открытым исходным кодом на разных языках.
+ZooKeeper — один из первых широко известных сервисов координации с открытым исходным кодом. Он реализован на Java, имеет достаточно простую и мощную модель данных. Алгоритм координации Zookeeper называется ZAB (ZooKeeper Atomic Broadcast). Он не гарантирует линеаризуемость операций чтения, поскольку каждый узел ZooKeeper обслуживает чтения локально. В отличие от ZooKeeper, ClickHouse Keeper реализован на C++ и использует алгоритм [RAFT](https://raft.github.io/), [реализация](https://github.com/eBay/NuRaft). Этот алгоритм обеспечивает линеаризуемость чтения и записи, имеет несколько реализаций с открытым исходным кодом на разных языках.
 
-По умолчанию `clickhouse-keeper` предоставляет те же гарантии, что и ZooKeeper (линеаризуемость записи, нелинеаризуемость чтения). У него есть совместимый протокол клиент-сервер, поэтому любой стандартный клиент ZooKeeper может использоваться для взаимодействия с `clickhouse-keeper`. Снэпшоты и журналы имеют несовместимый с ZooKeeper формат, однако можно конвертировать данные Zookeeper в снэпшот `clickhouse-keeper` с помощью `clickhouse-keeper-converter`. Межсерверный протокол `clickhouse-keeper` также несовместим с ZooKeeper, поэтому смешанный кластер ZooKeeper / clickhouse-keeper невозможен.
+По умолчанию ClickHouse Keeper предоставляет те же гарантии, что и ZooKeeper (линеаризуемость записи, нелинеаризуемость чтения). У него есть совместимый протокол клиент-сервер, поэтому любой стандартный клиент ZooKeeper может использоваться для взаимодействия с ClickHouse Keeper. Снэпшоты и журналы имеют несовместимый с ZooKeeper формат, однако можно конвертировать данные Zookeeper в снэпшот ClickHouse Keeper` с помощью `clickhouse-keeper-converter`. Межсерверный протокол `clickhouse-keeper` также несовместим с ZooKeeper, поэтому создание смешанного кластера ZooKeeper / ClickHouse Keeper невозможно.
 
 ## Конфигурация
 
-`clickhouse-keeper` может использоваться как равноценная замена ZooKeeper или как внутренняя часть сервера ClickHouse, но в обоих случаях конфигурация представлена файлом `.xml`. Главный тег конфигурации `clickhouse-keeper` — это `<keeper_server>`. Параметры конфигурации:
+ClickHouse Keeper может использоваться как равноценная замена ZooKeeper или как внутренняя часть сервера ClickHouse, но в обоих случаях конфигурация представлена файлом `.xml`. Главный тег конфигурации ClickHouse Keeper — это `<keeper_server>`. Параметры конфигурации:
 
--    `tcp_port` — порт для подключения клиента (по умолчанию для ZooKeeper: `2181`)
--    `tcp_port_secure` — зашифрованный порт для подключения клиента
--    `server_id` — уникальный идентификатор сервера, каждый участник кластера должен иметь уникальный номер (1, 2, 3 и т. д.)
--    `log_storage_path` — путь к журналам координации, лучше хранить их на незанятом устройстве (актуально и для ZooKeeper)
--    `snapshot_storage_path` — путь к снэпшотам координации
+-    `tcp_port` — порт для подключения клиента (по умолчанию для ZooKeeper: `2181`).
+-    `tcp_port_secure` — зашифрованный порт для подключения клиента.
+-    `server_id` — уникальный идентификатор сервера, каждый участник кластера должен иметь уникальный номер (1, 2, 3 и т. д.).
+-    `log_storage_path` — путь к журналам координации, лучше хранить их на незанятом устройстве (актуально и для ZooKeeper).
+-    `snapshot_storage_path` — путь к снэпшотам координации.
 
-Другие общие параметры наследуются из конфигурации `clickhouse server` (`listen_host`, `logger`, и т. д.)
+Другие общие параметры наследуются из конфигурации сервера ClickHouse (`listen_host`, `logger`, и т. д.).
 
 Настройки внутренней координации находятся в `<keeper_server>.<coordination_settings>`:
 
--    `operation_timeout_ms` — интервал одной клиентской операции (по умолчанию: 10000)
--    `session_timeout_ms` — интервал одной клиентской сессии (по умолчанию: 30000)
--    `dead_session_check_period_ms` — как часто `clickhouse-keeper` проверяет мертвые сессии и удаляет их (по умолчанию: 500)
--    `heart_beat_interval_ms` — как часто узел-лидер `clickhouse-keeper` отправляет сердцебиение узлам-последователям (по умолчанию: 500)
--    `election_timeout_lower_bound_ms` — если последователь не получил сердцебиения от лидера в этом интервале, он может инициировать выборы лидера (по умолчанию: 1000)
--    `election_timeout_upper_bound_ms` — если последователь не получил сердцебиения от лидера в этом интервале, он должен инициировать выборы лидера (по умолчанию: 2000)
--    `rotate_log_storage_interval` — сколько записей журнала хранить в одном файле (по умолчанию: 100000)
--    `reserved_log_items` — сколько записей журнала координации хранить перед сжатием (по умолчанию: 100000)
--    `snapshot_distance` — как часто `clickhouse-keeper` делает новые снэпшоты (по количеству записей в журналах) (по умолчанию: 100000)
--    `snapshots_to_keep` — сколько снэпшотов хранить (по умолчанию: 3)
--    `stale_log_gap` — порог, после которого лидер считает последователя устаревшим и отправляет ему снэпшот вместо журналов (по умолчанию: 10000)
--    `fresh_log_gap` - когда узел обновляется (по умолчанию: 200)
--    `max_requests_batch_size` - максимальный размер пакета в серии запросов, прежде чем он будет отправлен в RAFT (по умолчанию: 100)
--    `force_sync` — вызывать `fsync` при каждой записи в журнал координации (по умолчанию: true)
--    `quorum_reads` - выполнять запросы чтения аналогично запросам записи через весь консенсус RAFT с одинаковой скоростью (по умолчанию: false)
--    `raft_logs_level` — уровень, на котором ведется текстовый журнал координации (трассировка, отладка и т. д.) (по умолчанию: значение системы по умолчанию)
--    `auto_forwarding` - разрешить пересылку запросов на запись от последователей лидеру (по умолчанию: true)
--    `shutdown_timeout` — ждать завершения внутренних подключений и выключения (мс) (по умолчанию: 5000)
--    `startup_timeout` — если сервер не подключается к другим участникам кворума в течение указанного интервала, он будет отключен (мс) (по умолчанию: 30000)
+-    `operation_timeout_ms` — время ожидания для одной клиентской операции в миллисекундах (по умолчанию: 10000).
+-    `session_timeout_ms` — время ожидания для клиентской сессии в миллисекундах (по умолчанию: 30000).
+-    `dead_session_check_period_ms` — частота, с которой ClickHouse Keeper проверяет мертвые сессии и удаляет их, в миллисекундах (по умолчанию: 500).
+-    `heart_beat_interval_ms` — частота, с которой узел-лидер ClickHouse Keeper отправляет сердцебиение узлам-последователям, в миллисекундах (по умолчанию: 500).
+-    `election_timeout_lower_bound_ms` — время, после которого последователь может инициировать выборы лидера, если не получил от него сердцебиения (по умолчанию: 1000).
+-    `election_timeout_upper_bound_ms` — время, после которого последователь должен инициировать выборы лидера, если не получил от него сердцебиения (по умолчанию: 2000).
+-    `rotate_log_storage_interval` — количество записей журнала для хранения в одном файле (по умолчанию: 100000).
+-    `reserved_log_items` — количество записей журнала координации для хранения перед сжатием (по умолчанию: 100000).
+-    `snapshot_distance` — частота, с которой ClickHouse Keeper делает новые снэпшоты (по количеству записей в журналах), в миллисекундах (по умолчанию: 100000).
+-    `snapshots_to_keep` — количество снэпшотов для сохранения (по умолчанию: 3).
+-    `stale_log_gap` — время, после которого лидер считает последователя устаревшим и отправляет ему снэпшот вместо журналов (по умолчанию: 10000).
+-    `fresh_log_gap` — время обновления узла (по умолчанию: 200).
+-    `max_requests_batch_size` — максимальный размер пакета в серии запросов, прежде чем он будет отправлен в RAFT (по умолчанию: 100).
+-    `force_sync` — вызывать `fsync` при каждой записи в журнал координации (по умолчанию: true).
+-    `quorum_reads` — выполнять запросы чтения аналогично запросам записи через весь консенсус RAFT с одинаковой скоростью (по умолчанию: false).
+-    `raft_logs_level` — уровень, на котором ведется текстовый журнал координации (трассировка, отладка и т. д.) (по умолчанию: значение системы по умолчанию).
+-    `auto_forwarding` — разрешить пересылку запросов на запись от последователей лидеру (по умолчанию: true).
+-    `shutdown_timeout` — время ожидания завершения внутренних подключений и выключения, в миллисекундах (по умолчанию: 5000).
+-    `startup_timeout` — время отключения сервера, если он не подключается к другим участникам кворума, в миллисекундах (по умолчанию: 30000).
 
 Конфигурация кворума находится в `<keeper_server>.<raft_configuration>` и содержит описание серверов. Единственный параметр для всего кворума — `secure`, который разрешает зашифрованное соединение для связи между участниками кворума. Параметры для каждого `<server>`:
 
--    `id` — идентификатор сервера в кворуме
--    `hostname` — имя хоста, на котором размещен сервер
--    `port` — порт, на котором серверу доступны соединения
+-    `id` — идентификатор сервера в кворуме.
+-    `hostname` — имя хоста, на котором размещен сервер.
+-    `port` — порт, на котором серверу доступны соединения.
 
 
 Примеры конфигурации кворума с тремя узлами можно найти в [интеграционных тестах](https://github.com/ClickHouse/ClickHouse/tree/master/tests/integration) с префиксом `test_keeper_`. Пример конфигурации для сервера №1:
@@ -94,7 +94,7 @@ ZooKeeper — один из первых широко известных сер
 
 ## Как запустить
 
-`clickhouse-keeper` входит в пакет сервера ClickHouse, просто добавьте кофигурацию `<keeper_server>` и запустите сервер ClickHouse как обычно. Если вы хотите запустить `clickhouse-keeper` автономно, сделайте это аналогичным способом:
+ClickHouse Keeper входит в пакет сервера ClickHouse, просто добавьте кофигурацию `<keeper_server>` и запустите сервер ClickHouse как обычно. Если вы хотите запустить ClickHouse Keeper автономно, сделайте это аналогичным способом:
 
 ```bash
 clickhouse-keeper --config /etc/your_path_to_config/config.xml --daemon
@@ -102,7 +102,7 @@ clickhouse-keeper --config /etc/your_path_to_config/config.xml --daemon
 
 ## [экспериментально] Переход с ZooKeeper
 
-Плавный переход с ZooKeeper на `clickhouse-keeper` невозможен, необходимо остановить кластер ZooKeeper, преобразовать данные и запустить `clickhouse-keeper`. `clickhouse-keeper-converter` конвертирует журналы и снэпшоты ZooKeeper в снэпшот `clickhouse-keeper`. Это работает только для версии ZooKeeper выше 3.4. Шаги перехода:
+Плавный переход с ZooKeeper на ClickHouse Keeper невозможен, необходимо остановить кластер ZooKeeper, преобразовать данные и запустить ClickHouse Keeper. `clickhouse-keeper-converter` конвертирует журналы и снэпшоты ZooKeeper в снэпшот ClickHouse Keeper. Это работает только для версии ZooKeeper выше 3.4. Для перехода выполните следующие шаги:
 
 1. Остановите все узлы ZooKeeper.
 
@@ -114,6 +114,6 @@ clickhouse-keeper --config /etc/your_path_to_config/config.xml --daemon
 clickhouse-keeper-converter --zookeeper-logs-dir /var/lib/zookeeper/version-2 --zookeeper-snapshots-dir /var/lib/zookeeper/version-2 --output-dir /path/to/clickhouse/keeper/snapshots
 ```
 
-4. Скопируйте снэпшот на узлы сервера ClickHouse с настроенным `keeper` или запустите `clickhouse-keeper` вместо ZooKeeper. Снэпшот должен сохраняться на всех узлах: в противном случае пустые узлы будут быстрее, и один из них может стать лидером.
+4. Скопируйте снэпшот на узлы сервера ClickHouse с настроенным `keeper` или запустите ClickHouse Keeper вместо ZooKeeper. Снэпшот должен сохраняться на всех узлах: в противном случае пустые узлы будут быстрее, и один из них может стать лидером.
 
 [Original article](https://clickhouse.tech/docs/en/operations/clickhouse-keeper/) <!--hide-->
\ No newline at end of file

From a6e8f3fa01f624e9b326853bba5a5b997e3dba7c Mon Sep 17 00:00:00 2001
From: gyuton <40863448+gyuton@users.noreply.github.com>
Date: Mon, 6 Sep 2021 13:58:34 +0300
Subject: [PATCH 075/273] Apply suggestions from code review

Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
---
 docs/ru/sql-reference/functions/tuple-map-functions.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/ru/sql-reference/functions/tuple-map-functions.md b/docs/ru/sql-reference/functions/tuple-map-functions.md
index 1cea3ca42c7..e4cc1fefab4 100644
--- a/docs/ru/sql-reference/functions/tuple-map-functions.md
+++ b/docs/ru/sql-reference/functions/tuple-map-functions.md
@@ -84,7 +84,7 @@ mapAdd(arg1, arg2 [, ...])
 
 **Возвращаемое значение**
 
--   В зависимости от аргументов возвращает один [Map](../../sql-reference/data-types/map.md) или [кортеж](../../sql-reference/data-types/tuple.md#tuplet1-t2), в котором первый массив содержит отсортированные ключи, а второй — значения.
+-   В зависимости от типа аргументов возвращает один [Map](../../sql-reference/data-types/map.md) или [кортеж](../../sql-reference/data-types/tuple.md#tuplet1-t2), в котором первый массив содержит отсортированные ключи, а второй — значения.
 
 **Пример**
 
@@ -102,7 +102,7 @@ SELECT mapAdd(([toUInt8(1), 2], [1, 1]), ([toUInt8(1), 2], [1, 1])) as res, toTy
 └───────────────┴────────────────────────────────────┘
 ```
 
-Запрос с типом `Map`:
+Запрос с контейнером `Map`:
 
 ```sql
 SELECT mapAdd(map(1,1), map(1,1));

From 0eac4529e0c82f1232b711e92052a1944acfaa36 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Mon, 6 Sep 2021 14:33:39 +0300
Subject: [PATCH 076/273] Preparation

---
 docker/images.json                            | 38 +++++++++++++++++--
 docker/packager/binary/Dockerfile             |  2 +-
 docker/packager/deb/Dockerfile                |  2 +-
 docker/packager/packager                      |  6 +--
 docker/packager/unbundled/Dockerfile          |  4 +-
 docker/test/base/Dockerfile                   |  2 +-
 docker/test/codebrowser/Dockerfile            |  6 +--
 docker/test/compatibility/centos/Dockerfile   |  2 +-
 docker/test/compatibility/ubuntu/Dockerfile   |  2 +-
 docker/test/coverage/Dockerfile               |  4 +-
 docker/test/fasttest/Dockerfile               |  2 +-
 docker/test/fuzzer/Dockerfile                 |  6 +--
 docker/test/integration/base/Dockerfile       |  4 +-
 .../integration/helper_container/Dockerfile   |  2 +-
 .../integration/kerberized_hadoop/Dockerfile  |  2 +-
 .../test/integration/kerberos_kdc/Dockerfile  |  2 +-
 .../mysql_golang_client/Dockerfile            |  2 +-
 .../integration/mysql_java_client/Dockerfile  |  2 +-
 .../integration/mysql_js_client/Dockerfile    |  2 +-
 .../integration/mysql_php_client/Dockerfile   |  2 +-
 .../postgresql_java_client/Dockerfile         |  2 +-
 docker/test/integration/resolver/Dockerfile   |  2 +-
 docker/test/integration/runner/Dockerfile     |  2 +-
 .../compose/docker_compose_jdbc_bridge.yml    |  2 +-
 .../runner/compose/docker_compose_keeper.yml  |  6 +--
 .../docker_compose_kerberized_hdfs.yml        |  4 +-
 .../docker_compose_kerberized_kafka.yml       |  2 +-
 .../runner/compose/docker_compose_minio.yml   |  6 +--
 .../docker_compose_mysql_golang_client.yml    |  2 +-
 .../docker_compose_mysql_java_client.yml      |  2 +-
 .../docker_compose_mysql_js_client.yml        |  2 +-
 .../docker_compose_mysql_php_client.yml       |  2 +-
 .../docker_compose_postgresql_java_client.yml |  2 +-
 docker/test/integration/s3_proxy/Dockerfile   |  2 +-
 docker/test/keeper-jepsen/Dockerfile          |  4 +-
 docker/test/performance-comparison/Dockerfile |  4 +-
 docker/test/performance-comparison/README.md  |  2 +-
 docker/test/pvs/Dockerfile                    |  4 +-
 docker/test/split_build_smoke_test/Dockerfile |  4 +-
 docker/test/sqlancer/Dockerfile               |  2 +-
 docker/test/stateful/Dockerfile               |  4 +-
 docker/test/stateless/Dockerfile              |  4 +-
 docker/test/stateless_pytest/Dockerfile       |  4 +-
 docker/test/stateless_unbundled/Dockerfile    |  4 +-
 docker/test/stress/Dockerfile                 |  4 +-
 docker/test/stress/README.md                  |  2 +-
 docker/test/style/Dockerfile                  |  2 +-
 docker/test/test_runner.sh                    |  2 +-
 docker/test/testflows/runner/Dockerfile       |  2 +-
 docker/test/unit/Dockerfile                   |  4 +-
 50 files changed, 107 insertions(+), 77 deletions(-)

diff --git a/docker/images.json b/docker/images.json
index e2e22468596..d072438688d 100644
--- a/docker/images.json
+++ b/docker/images.json
@@ -1,12 +1,14 @@
 {
     "docker/packager/deb": {
         "name": "yandex/clickhouse-deb-builder",
+        "symlink_name": "clickhouse/deb-builder",
         "dependent": [
             "docker/packager/unbundled"
         ]
     },
     "docker/packager/binary": {
         "name": "yandex/clickhouse-binary-builder",
+        "symlink_name": "clickhouse/binary-builder",
         "dependent": [
             "docker/test/split_build_smoke_test",
             "docker/test/pvs",
@@ -15,26 +17,32 @@
     },
     "docker/packager/unbundled": {
         "name": "yandex/clickhouse-unbundled-builder",
+        "symlink_name": "clickhouse/unbundled-builder",
         "dependent": []
     },
     "docker/test/compatibility/centos": {
         "name": "yandex/clickhouse-test-old-centos",
+        "symlink_name": "clickhouse/test-old-centos",
         "dependent": []
     },
     "docker/test/compatibility/ubuntu": {
         "name": "yandex/clickhouse-test-old-ubuntu",
+        "symlink_name": "clickhouse/test-old-ubuntu",
         "dependent": []
     },
     "docker/test/integration/base": {
         "name": "yandex/clickhouse-integration-test",
+        "symlink_name": "clickhouse/integration-test",
         "dependent": []
     },
     "docker/test/fuzzer": {
         "name": "yandex/clickhouse-fuzzer",
+        "symlink_name": "clickhouse/fuzzer",
         "dependent": []
     },
     "docker/test/performance-comparison": {
         "name": "yandex/clickhouse-performance-comparison",
+        "symlink_name": "clickhouse/performance-comparison",
         "dependent": []
     },
     "docker/test/pvs": {
@@ -43,96 +51,113 @@
     },
     "docker/test/stateless": {
         "name": "yandex/clickhouse-stateless-test",
+        "symlink_name": "clickhouse/stateless-test",
         "dependent": [
             "docker/test/stateful",
             "docker/test/coverage",
             "docker/test/unit"
         ]
     },
-    "docker/test/stateless_pytest": {
-        "name": "yandex/clickhouse-stateless-pytest",
-        "dependent": []
-    },
     "docker/test/stateful": {
         "name": "yandex/clickhouse-stateful-test",
+        "symlink_name": "clickhouse/stateful-test",
         "dependent": [
             "docker/test/stress"
         ]
     },
     "docker/test/coverage": {
         "name": "yandex/clickhouse-test-coverage",
+        "symlink_name": "clickhouse/test-coverage",
         "dependent": []
     },
     "docker/test/unit": {
         "name": "yandex/clickhouse-unit-test",
+        "symlink_name": "clickhouse/unit-test",
         "dependent": []
     },
     "docker/test/stress": {
         "name": "yandex/clickhouse-stress-test",
+        "symlink_name": "clickhouse/stress-test",
         "dependent": []
     },
     "docker/test/split_build_smoke_test": {
         "name": "yandex/clickhouse-split-build-smoke-test",
+        "symlink_name": "clickhouse/split-build-smoke-test",
         "dependent": []
     },
     "docker/test/codebrowser": {
         "name": "yandex/clickhouse-codebrowser",
+        "symlink_name": "clickhouse/codebrowser",
         "dependent": []
     },
     "docker/test/integration/runner": {
         "name": "yandex/clickhouse-integration-tests-runner",
+        "symlink_name": "clickhouse/integration-tests-runner",
         "dependent": []
     },
     "docker/test/testflows/runner": {
         "name": "yandex/clickhouse-testflows-runner",
+        "symlink_name": "clickhouse/testflows-runner",
         "dependent": []
     },
     "docker/test/fasttest": {
         "name": "yandex/clickhouse-fasttest",
+        "symlink_name": "clickhouse/fasttest",
         "dependent": []
     },
     "docker/test/style": {
         "name": "yandex/clickhouse-style-test",
+        "symlink_name": "clickhouse/style-test",
         "dependent": []
     },
     "docker/test/integration/s3_proxy": {
         "name": "yandex/clickhouse-s3-proxy",
+        "symlink_name": "clickhouse/s3-proxy",
         "dependent": []
     },
     "docker/test/integration/resolver": {
         "name": "yandex/clickhouse-python-bottle",
+        "symlink_name": "clickhouse/python-bottle",
         "dependent": []
     },
     "docker/test/integration/helper_container": {
         "name": "yandex/clickhouse-integration-helper",
+        "symlink_name": "clickhouse/integration-helper",
         "dependent": []
     },
     "docker/test/integration/mysql_golang_client": {
         "name": "yandex/clickhouse-mysql-golang-client",
+        "symlink_name": "clickhouse/mysql-golang-client",
         "dependent": []
     },
     "docker/test/integration/mysql_java_client": {
         "name": "yandex/clickhouse-mysql-java-client",
+        "symlink_name": "clickhouse/mysql-golang-client",
         "dependent": []
     },
     "docker/test/integration/mysql_js_client": {
         "name": "yandex/clickhouse-mysql-js-client",
+        "symlink_name": "clickhouse/mysql-js-client",
         "dependent": []
     },
     "docker/test/integration/mysql_php_client": {
         "name": "yandex/clickhouse-mysql-php-client",
+        "symlink_name": "clickhouse/mysql-php-client",
         "dependent": []
     },
     "docker/test/integration/postgresql_java_client": {
         "name": "yandex/clickhouse-postgresql-java-client",
+        "symlink_name": "clickhouse/postgresql-java-client",
         "dependent": []
     },
     "docker/test/integration/kerberos_kdc": {
         "name": "yandex/clickhouse-kerberos-kdc",
+        "symlink_name": "clickhouse/kerberos-kdc",
         "dependent": []
     },
     "docker/test/base": {
          "name": "yandex/clickhouse-test-base",
+         "symlink_name": "clickhouse/test-base",
          "dependent": [
             "docker/test/stateless",
             "docker/test/stateless_unbundled",
@@ -144,25 +169,30 @@
     },
     "docker/packager/unbundled": {
          "name": "yandex/clickhouse-unbundled-builder",
+         "symlink_name": "clickhouse/unbundled-builder",
          "dependent": [
             "docker/test/stateless_unbundled"
          ]
     },
     "docker/test/stateless_unbundled": {
          "name": "yandex/clickhouse-stateless-unbundled-test",
+         "symlink_name": "clickhouse/stateless-unbundled-test",
          "dependent": [
          ]
     },
     "docker/test/integration/kerberized_hadoop": {
         "name": "yandex/clickhouse-kerberized-hadoop",
+        "symlink_name": "clickhouse/kerberized-hadoop",
         "dependent": []
     },
     "docker/test/sqlancer": {
         "name": "yandex/clickhouse-sqlancer-test",
+        "symlink_name": "clickhouse/sqlancer-test",
         "dependent": []
     },
     "docker/test/keeper-jepsen": {
         "name": "yandex/clickhouse-keeper-jepsen-test",
+        "symlink_name": "clickhouse/keeper-jepsen-test",
         "dependent": []
     }
 }
diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index 0393669df48..605f1a853ff 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -1,4 +1,4 @@
-#  docker build -t yandex/clickhouse-binary-builder .
+#  docker build -t clickhouse/binary-builder .
 FROM ubuntu:20.04
 
 ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=11
diff --git a/docker/packager/deb/Dockerfile b/docker/packager/deb/Dockerfile
index 294c8645455..74f3a4635b3 100644
--- a/docker/packager/deb/Dockerfile
+++ b/docker/packager/deb/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-deb-builder .
+# docker build -t clickhouse/deb-builder .
 FROM ubuntu:20.04
 
 ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=11
diff --git a/docker/packager/packager b/docker/packager/packager
index 673878bce43..93737add301 100755
--- a/docker/packager/packager
+++ b/docker/packager/packager
@@ -9,9 +9,9 @@ import sys
 SCRIPT_PATH = os.path.realpath(__file__)
 
 IMAGE_MAP = {
-    "deb": "yandex/clickhouse-deb-builder",
-    "binary": "yandex/clickhouse-binary-builder",
-    "unbundled": "yandex/clickhouse-unbundled-builder"
+    "deb": "clickhouse/deb-builder",
+    "binary": "clickhouse/binary-builder",
+    "unbundled": "clickhouse/unbundled-builder"
 }
 
 def check_image_exists_locally(image_name):
diff --git a/docker/packager/unbundled/Dockerfile b/docker/packager/unbundled/Dockerfile
index b2d9f555f19..3527c105783 100644
--- a/docker/packager/unbundled/Dockerfile
+++ b/docker/packager/unbundled/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-unbundled-builder .
-FROM yandex/clickhouse-deb-builder
+# docker build -t clickhouse/unbundled-builder .
+FROM clickhouse/deb-builder
 
 RUN export CODENAME="$(lsb_release --codename --short | tr 'A-Z' 'a-z')" \
     && wget -nv -O /tmp/arrow-keyring.deb "https://apache.jfrog.io/artifactory/arrow/ubuntu/apache-arrow-apt-source-latest-${CODENAME}.deb" \
diff --git a/docker/test/base/Dockerfile b/docker/test/base/Dockerfile
index 611ef6b7702..fbbc902f6b6 100644
--- a/docker/test/base/Dockerfile
+++ b/docker/test/base/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-test-base .
+# docker build -t clickhouse/test-base .
 FROM ubuntu:20.04
 
 ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=11
diff --git a/docker/test/codebrowser/Dockerfile b/docker/test/codebrowser/Dockerfile
index 33173ab90f9..6ca5c891388 100644
--- a/docker/test/codebrowser/Dockerfile
+++ b/docker/test/codebrowser/Dockerfile
@@ -1,6 +1,6 @@
-# docker build --network=host -t yandex/clickhouse-codebrowser .
-# docker run --volume=path_to_repo:/repo_folder --volume=path_to_result:/test_output yandex/clickhouse-codebrowser
-FROM yandex/clickhouse-binary-builder
+# docker build --network=host -t clickhouse/codebrowser .
+# docker run --volume=path_to_repo:/repo_folder --volume=path_to_result:/test_output clickhouse/codebrowser
+FROM clickhouse/binary-builder
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
diff --git a/docker/test/compatibility/centos/Dockerfile b/docker/test/compatibility/centos/Dockerfile
index 0ef119d1bb1..628609e374f 100644
--- a/docker/test/compatibility/centos/Dockerfile
+++ b/docker/test/compatibility/centos/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-test-old-centos .
+# docker build -t clickhouse/test-old-centos .
 FROM centos:5
 
 CMD /bin/sh -c "/clickhouse server --config /config/config.xml > /var/log/clickhouse-server/stderr.log 2>&1 & \
diff --git a/docker/test/compatibility/ubuntu/Dockerfile b/docker/test/compatibility/ubuntu/Dockerfile
index 28f89e47b95..ddd0a76bd44 100644
--- a/docker/test/compatibility/ubuntu/Dockerfile
+++ b/docker/test/compatibility/ubuntu/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-test-old-ubuntu .
+# docker build -t clickhouse/test-old-ubuntu .
 FROM ubuntu:12.04
 
 CMD /bin/sh -c "/clickhouse server --config /config/config.xml > /var/log/clickhouse-server/stderr.log 2>&1 & \
diff --git a/docker/test/coverage/Dockerfile b/docker/test/coverage/Dockerfile
index 681f65e0f6f..ccf0bbc7c83 100644
--- a/docker/test/coverage/Dockerfile
+++ b/docker/test/coverage/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-test-coverage .
-FROM yandex/clickhouse-stateless-test
+# docker build -t clickhouse/test-coverage .
+FROM clickhouse/stateless-test
 
 RUN apt-get update -y \
     && env DEBIAN_FRONTEND=noninteractive \
diff --git a/docker/test/fasttest/Dockerfile b/docker/test/fasttest/Dockerfile
index 2e0bbcd350f..ab62ceeb2c0 100644
--- a/docker/test/fasttest/Dockerfile
+++ b/docker/test/fasttest/Dockerfile
@@ -1,4 +1,4 @@
-#  docker build -t yandex/clickhouse-fasttest .
+#  docker build -t clickhouse/fasttest .
 FROM ubuntu:20.04
 
 ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=11
diff --git a/docker/test/fuzzer/Dockerfile b/docker/test/fuzzer/Dockerfile
index 9a96ac1dfa7..6444e745c47 100644
--- a/docker/test/fuzzer/Dockerfile
+++ b/docker/test/fuzzer/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-fuzzer .
-FROM yandex/clickhouse-test-base
+# docker build -t clickhouse/fuzzer .
+FROM clickhouse/test-base
 
 ENV LANG=C.UTF-8
 ENV TZ=Europe/Moscow
@@ -36,5 +36,5 @@ CMD set -o pipefail \
     && cd /workspace \
     && /run-fuzzer.sh 2>&1 | ts "$(printf '%%Y-%%m-%%d %%H:%%M:%%S\t')" | tee main.log
 
-# docker run --network=host --volume <workspace>:/workspace -e PR_TO_TEST=<> -e SHA_TO_TEST=<> yandex/clickhouse-fuzzer
+# docker run --network=host --volume <workspace>:/workspace -e PR_TO_TEST=<> -e SHA_TO_TEST=<> clickhouse/fuzzer
 
diff --git a/docker/test/integration/base/Dockerfile b/docker/test/integration/base/Dockerfile
index 344c1b9a698..519c64297e5 100644
--- a/docker/test/integration/base/Dockerfile
+++ b/docker/test/integration/base/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-integration-test .
-FROM yandex/clickhouse-test-base
+# docker build -t clickhouse/integration-test .
+FROM clickhouse/test-base
 
 SHELL ["/bin/bash", "-c"]
 
diff --git a/docker/test/integration/helper_container/Dockerfile b/docker/test/integration/helper_container/Dockerfile
index 922eb2c6f22..6a093081bf2 100644
--- a/docker/test/integration/helper_container/Dockerfile
+++ b/docker/test/integration/helper_container/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-integration-helper .
+# docker build -t clickhouse/integration-helper .
 # Helper docker container to run iptables without sudo
 
 FROM alpine
diff --git a/docker/test/integration/kerberized_hadoop/Dockerfile b/docker/test/integration/kerberized_hadoop/Dockerfile
index 6a2fd96e7a7..11da590f901 100644
--- a/docker/test/integration/kerberized_hadoop/Dockerfile
+++ b/docker/test/integration/kerberized_hadoop/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-kerberized-hadoop .
+# docker build -t clickhouse/kerberized-hadoop .
 
 FROM sequenceiq/hadoop-docker:2.7.0
 RUN sed -i -e 's/^\#baseurl/baseurl/' /etc/yum.repos.d/CentOS-Base.repo
diff --git a/docker/test/integration/kerberos_kdc/Dockerfile b/docker/test/integration/kerberos_kdc/Dockerfile
index ea231b1191d..a33d1d24568 100644
--- a/docker/test/integration/kerberos_kdc/Dockerfile
+++ b/docker/test/integration/kerberos_kdc/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-kerberos-kdc .
+# docker build -t clickhouse/kerberos-kdc .
 
 FROM centos:6.6
 # old OS to make is faster and smaller
diff --git a/docker/test/integration/mysql_golang_client/Dockerfile b/docker/test/integration/mysql_golang_client/Dockerfile
index 4380383d1fb..6e448b4c66a 100644
--- a/docker/test/integration/mysql_golang_client/Dockerfile
+++ b/docker/test/integration/mysql_golang_client/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-mysql-golang-client .
+# docker build -t clickhouse/mysql-golang-client .
 # MySQL golang client docker container
 
 FROM golang:1.12.2
diff --git a/docker/test/integration/mysql_java_client/Dockerfile b/docker/test/integration/mysql_java_client/Dockerfile
index fcb6a39f33b..0abf50cd493 100644
--- a/docker/test/integration/mysql_java_client/Dockerfile
+++ b/docker/test/integration/mysql_java_client/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-mysql-java-client .
+# docker build -t clickhouse/mysql-java-client .
 # MySQL Java client docker container
 
 FROM ubuntu:18.04
diff --git a/docker/test/integration/mysql_js_client/Dockerfile b/docker/test/integration/mysql_js_client/Dockerfile
index 4f12de004ac..b1397b40d38 100644
--- a/docker/test/integration/mysql_js_client/Dockerfile
+++ b/docker/test/integration/mysql_js_client/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-mysql-js-client .
+# docker build -t clickhouse/mysql-js-client .
 # MySQL JavaScript client docker container
 
 FROM node:8
diff --git a/docker/test/integration/mysql_php_client/Dockerfile b/docker/test/integration/mysql_php_client/Dockerfile
index e2ceb62f44f..0fb77bf8ffb 100644
--- a/docker/test/integration/mysql_php_client/Dockerfile
+++ b/docker/test/integration/mysql_php_client/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-mysql-php-client .
+# docker build -t clickhouse/mysql-php-client .
 # MySQL PHP client docker container
 
 FROM php:7.3-cli
diff --git a/docker/test/integration/postgresql_java_client/Dockerfile b/docker/test/integration/postgresql_java_client/Dockerfile
index eab236c9590..f5484028ec9 100644
--- a/docker/test/integration/postgresql_java_client/Dockerfile
+++ b/docker/test/integration/postgresql_java_client/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-postgresql-java-client .
+# docker build -t clickhouse/postgresql-java-client .
 # PostgreSQL Java client docker container
 
 FROM ubuntu:18.04
diff --git a/docker/test/integration/resolver/Dockerfile b/docker/test/integration/resolver/Dockerfile
index b0efb4b46d5..01b9b777614 100644
--- a/docker/test/integration/resolver/Dockerfile
+++ b/docker/test/integration/resolver/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-python-bottle .
+# docker build -t clickhouse/python-bottle .
 # Helper docker container to run python bottle apps
 
 FROM python:3
diff --git a/docker/test/integration/runner/Dockerfile b/docker/test/integration/runner/Dockerfile
index ef333e461c5..06e1f64ced2 100644
--- a/docker/test/integration/runner/Dockerfile
+++ b/docker/test/integration/runner/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-integration-tests-runner .
+# docker build -t clickhouse/integration-tests-runner .
 FROM ubuntu:20.04
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
diff --git a/docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml b/docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml
index a65ef629df6..b3686adc21c 100644
--- a/docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml
+++ b/docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml
@@ -1,7 +1,7 @@
 version: '2.3'
 services:
   bridge1:
-    image: yandex/clickhouse-jdbc-bridge
+    image: clickhouse/jdbc-bridge
     command: |
       /bin/bash -c 'cat << EOF > config/datasources/self.json
       {
diff --git a/docker/test/integration/runner/compose/docker_compose_keeper.yml b/docker/test/integration/runner/compose/docker_compose_keeper.yml
index e11a13e6eab..134ffbff1f7 100644
--- a/docker/test/integration/runner/compose/docker_compose_keeper.yml
+++ b/docker/test/integration/runner/compose/docker_compose_keeper.yml
@@ -1,7 +1,7 @@
 version: '2.3'
 services:
     zoo1:
-        image: ${image:-yandex/clickhouse-integration-test}
+        image: ${image:-clickhouse/integration-test}
         restart: always
         user: ${user:-}
         volumes:
@@ -31,7 +31,7 @@ services:
             - inet6
             - rotate
     zoo2:
-        image: ${image:-yandex/clickhouse-integration-test}
+        image: ${image:-clickhouse/integration-test}
         restart: always
         user: ${user:-}
         volumes:
@@ -61,7 +61,7 @@ services:
             - inet6
             - rotate
     zoo3:
-        image: ${image:-yandex/clickhouse-integration-test}
+        image: ${image:-clickhouse/integration-test}
         restart: always
         user: ${user:-}
         volumes:
diff --git a/docker/test/integration/runner/compose/docker_compose_kerberized_hdfs.yml b/docker/test/integration/runner/compose/docker_compose_kerberized_hdfs.yml
index b09e75a8515..236c4f10b01 100644
--- a/docker/test/integration/runner/compose/docker_compose_kerberized_hdfs.yml
+++ b/docker/test/integration/runner/compose/docker_compose_kerberized_hdfs.yml
@@ -4,7 +4,7 @@ services:
   kerberizedhdfs1:
     cap_add:
       - DAC_READ_SEARCH
-    image: yandex/clickhouse-kerberized-hadoop:16621
+    image: clickhouse/kerberized-hadoop:16621
     hostname: kerberizedhdfs1
     restart: always
     volumes:
@@ -22,7 +22,7 @@ services:
     entrypoint: /etc/bootstrap.sh -d
 
   hdfskerberos:
-    image: yandex/clickhouse-kerberos-kdc:${DOCKER_KERBEROS_KDC_TAG:-latest}
+    image: clickhouse/kerberos-kdc:${DOCKER_KERBEROS_KDC_TAG:-latest}
     hostname: hdfskerberos
     volumes:
       - ${KERBERIZED_HDFS_DIR}/secrets:/tmp/keytab
diff --git a/docker/test/integration/runner/compose/docker_compose_kerberized_kafka.yml b/docker/test/integration/runner/compose/docker_compose_kerberized_kafka.yml
index 081b90c4f27..d57e4e4d5be 100644
--- a/docker/test/integration/runner/compose/docker_compose_kerberized_kafka.yml
+++ b/docker/test/integration/runner/compose/docker_compose_kerberized_kafka.yml
@@ -50,7 +50,7 @@ services:
       - label:disable
 
   kafka_kerberos:
-    image: yandex/clickhouse-kerberos-kdc:${DOCKER_KERBEROS_KDC_TAG:-latest}
+    image: clickhouse/kerberos-kdc:${DOCKER_KERBEROS_KDC_TAG:-latest}
     hostname: kafka_kerberos
     volumes:
       - ${KERBERIZED_KAFKA_DIR}/secrets:/tmp/keytab
diff --git a/docker/test/integration/runner/compose/docker_compose_minio.yml b/docker/test/integration/runner/compose/docker_compose_minio.yml
index 96a5f8bdc31..4384c0868a5 100644
--- a/docker/test/integration/runner/compose/docker_compose_minio.yml
+++ b/docker/test/integration/runner/compose/docker_compose_minio.yml
@@ -19,14 +19,14 @@ services:
 
   # HTTP proxies for Minio.
   proxy1:
-    image: yandex/clickhouse-s3-proxy
+    image: clickhouse/s3-proxy
     expose:
       - "8080" # Redirect proxy port
       - "80"   # Reverse proxy port
       - "443"  # Reverse proxy port (secure)
 
   proxy2:
-    image: yandex/clickhouse-s3-proxy
+    image: clickhouse/s3-proxy
     expose:
       - "8080"
       - "80"
@@ -34,7 +34,7 @@ services:
 
   # Empty container to run proxy resolver.
   resolver:
-    image: yandex/clickhouse-python-bottle
+    image: clickhouse/python-bottle
     expose:
       - "8080"
     tty: true
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_golang_client.yml b/docker/test/integration/runner/compose/docker_compose_mysql_golang_client.yml
index a6a338eb6a8..56cc0410574 100644
--- a/docker/test/integration/runner/compose/docker_compose_mysql_golang_client.yml
+++ b/docker/test/integration/runner/compose/docker_compose_mysql_golang_client.yml
@@ -1,6 +1,6 @@
 version: '2.3'
 services:
   golang1:
-    image: yandex/clickhouse-mysql-golang-client:${DOCKER_MYSQL_GOLANG_CLIENT_TAG:-latest}
+    image: clickhouse/mysql-golang-client:${DOCKER_MYSQL_GOLANG_CLIENT_TAG:-latest}
     # to keep container running
     command: sleep infinity
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_java_client.yml b/docker/test/integration/runner/compose/docker_compose_mysql_java_client.yml
index 21d927df82c..eb5ffb01baa 100644
--- a/docker/test/integration/runner/compose/docker_compose_mysql_java_client.yml
+++ b/docker/test/integration/runner/compose/docker_compose_mysql_java_client.yml
@@ -1,6 +1,6 @@
 version: '2.3'
 services:
   java1:
-    image: yandex/clickhouse-mysql-java-client:${DOCKER_MYSQL_JAVA_CLIENT_TAG:-latest}
+    image: clickhouse/mysql-java-client:${DOCKER_MYSQL_JAVA_CLIENT_TAG:-latest}
     # to keep container running
     command: sleep infinity
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_js_client.yml b/docker/test/integration/runner/compose/docker_compose_mysql_js_client.yml
index dbd85cf2382..90939449c5f 100644
--- a/docker/test/integration/runner/compose/docker_compose_mysql_js_client.yml
+++ b/docker/test/integration/runner/compose/docker_compose_mysql_js_client.yml
@@ -1,6 +1,6 @@
 version: '2.3'
 services:
   mysqljs1:
-    image: yandex/clickhouse-mysql-js-client:${DOCKER_MYSQL_JS_CLIENT_TAG:-latest}
+    image: clickhouse/mysql-js-client:${DOCKER_MYSQL_JS_CLIENT_TAG:-latest}
     # to keep container running
     command: sleep infinity
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_php_client.yml b/docker/test/integration/runner/compose/docker_compose_mysql_php_client.yml
index f24f5337a7e..408b8ff089a 100644
--- a/docker/test/integration/runner/compose/docker_compose_mysql_php_client.yml
+++ b/docker/test/integration/runner/compose/docker_compose_mysql_php_client.yml
@@ -1,6 +1,6 @@
 version: '2.3'
 services:
   php1:
-    image: yandex/clickhouse-mysql-php-client:${DOCKER_MYSQL_PHP_CLIENT_TAG:-latest}
+    image: clickhouse/mysql-php-client:${DOCKER_MYSQL_PHP_CLIENT_TAG:-latest}
     # to keep container running
     command: sleep infinity
diff --git a/docker/test/integration/runner/compose/docker_compose_postgresql_java_client.yml b/docker/test/integration/runner/compose/docker_compose_postgresql_java_client.yml
index 38191f1bdd6..904bfffdfd5 100644
--- a/docker/test/integration/runner/compose/docker_compose_postgresql_java_client.yml
+++ b/docker/test/integration/runner/compose/docker_compose_postgresql_java_client.yml
@@ -1,6 +1,6 @@
 version: '2.2'
 services:
   java:
-    image: yandex/clickhouse-postgresql-java-client:${DOCKER_POSTGRESQL_JAVA_CLIENT_TAG:-latest}
+    image: clickhouse/postgresql-java-client:${DOCKER_POSTGRESQL_JAVA_CLIENT_TAG:-latest}
     # to keep container running
     command: sleep infinity
diff --git a/docker/test/integration/s3_proxy/Dockerfile b/docker/test/integration/s3_proxy/Dockerfile
index d8b1754fa71..5858218e4e4 100644
--- a/docker/test/integration/s3_proxy/Dockerfile
+++ b/docker/test/integration/s3_proxy/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-s3-proxy .
+# docker build -t clickhouse/s3-proxy .
 FROM nginx:alpine
 
 COPY run.sh /run.sh
diff --git a/docker/test/keeper-jepsen/Dockerfile b/docker/test/keeper-jepsen/Dockerfile
index 1a62d5e793f..5bb7f9433c2 100644
--- a/docker/test/keeper-jepsen/Dockerfile
+++ b/docker/test/keeper-jepsen/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-keeper-jepsen-test .
-FROM yandex/clickhouse-test-base
+# docker build -t clickhouse/keeper-jepsen-test .
+FROM clickhouse/test-base
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV CLOJURE_VERSION=1.10.3.814
diff --git a/docker/test/performance-comparison/Dockerfile b/docker/test/performance-comparison/Dockerfile
index 1a61c4b274a..88b66d42ecb 100644
--- a/docker/test/performance-comparison/Dockerfile
+++ b/docker/test/performance-comparison/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-performance-comparison .
+# docker build -t clickhouse/performance-comparison .
 FROM ubuntu:18.04
 
 ENV LANG=C.UTF-8
@@ -54,4 +54,4 @@ COPY * /
 # it gives '/bin/sh: 1: [bash,: not found' otherwise.
 CMD ["bash", "-c", "node=$((RANDOM % $(numactl --hardware | sed -n 's/^.*available:\\(.*\\)nodes.*$/\\1/p'))); echo Will bind to NUMA node $node; numactl --cpunodebind=$node --membind=$node /entrypoint.sh"]
 
-# docker run --network=host --volume <workspace>:/workspace --volume=<output>:/output -e PR_TO_TEST=<> -e SHA_TO_TEST=<> yandex/clickhouse-performance-comparison
+# docker run --network=host --volume <workspace>:/workspace --volume=<output>:/output -e PR_TO_TEST=<> -e SHA_TO_TEST=<> clickhouse/performance-comparison
diff --git a/docker/test/performance-comparison/README.md b/docker/test/performance-comparison/README.md
index 782644a81dd..75213fad077 100644
--- a/docker/test/performance-comparison/README.md
+++ b/docker/test/performance-comparison/README.md
@@ -116,7 +116,7 @@ pull requests (0 for master) manually.
 docker run --network=host --volume=$(pwd)/workspace:/workspace --volume=$(pwd)/output:/output
     [-e REF_PR={} -e REF_SHA={}]
     -e PR_TO_TEST={} -e SHA_TO_TEST={}
-    yandex/clickhouse-performance-comparison
+    clickhouse/performance-comparison
 ```
 
 Then see the `report.html` in the `output` directory.
diff --git a/docker/test/pvs/Dockerfile b/docker/test/pvs/Dockerfile
index 7bd45ba4018..4ef0f7c1475 100644
--- a/docker/test/pvs/Dockerfile
+++ b/docker/test/pvs/Dockerfile
@@ -1,6 +1,6 @@
-# docker build -t yandex/clickhouse-pvs-test .
+# docker build -t clickhouse/pvs-test .
 
-FROM yandex/clickhouse-binary-builder
+FROM clickhouse/binary-builder
 
 RUN apt-get update --yes \
     && apt-get install \
diff --git a/docker/test/split_build_smoke_test/Dockerfile b/docker/test/split_build_smoke_test/Dockerfile
index 54a9eb17868..3cc2f26a507 100644
--- a/docker/test/split_build_smoke_test/Dockerfile
+++ b/docker/test/split_build_smoke_test/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-split-build-smoke-test .
-FROM yandex/clickhouse-binary-builder
+# docker build -t clickhouse/split-build-smoke-test .
+FROM clickhouse/binary-builder
 
 COPY run.sh /run.sh
 COPY process_split_build_smoke_test_result.py /
diff --git a/docker/test/sqlancer/Dockerfile b/docker/test/sqlancer/Dockerfile
index 67236402352..f603b812408 100644
--- a/docker/test/sqlancer/Dockerfile
+++ b/docker/test/sqlancer/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-sqlancer-test .
+# docker build -t clickhouse/sqlancer-test .
 FROM ubuntu:20.04
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
diff --git a/docker/test/stateful/Dockerfile b/docker/test/stateful/Dockerfile
index 07aad75a2ea..c237a712f52 100644
--- a/docker/test/stateful/Dockerfile
+++ b/docker/test/stateful/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-stateful-test .
-FROM yandex/clickhouse-stateless-test
+# docker build -t clickhouse/stateful-test .
+FROM clickhouse/stateless-test
 
 RUN apt-get update -y \
     && env DEBIAN_FRONTEND=noninteractive \
diff --git a/docker/test/stateless/Dockerfile b/docker/test/stateless/Dockerfile
index b66fa055e7b..3b5edb2c869 100644
--- a/docker/test/stateless/Dockerfile
+++ b/docker/test/stateless/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-stateless-test .
-FROM yandex/clickhouse-test-base
+# docker build -t clickhouse/stateless-test .
+FROM clickhouse/test-base
 
 ARG odbc_driver_url="https://github.com/ClickHouse/clickhouse-odbc/releases/download/v1.1.4.20200302/clickhouse-odbc-1.1.4-Linux.tar.gz"
 
diff --git a/docker/test/stateless_pytest/Dockerfile b/docker/test/stateless_pytest/Dockerfile
index 947a70426d6..c1e47523f6d 100644
--- a/docker/test/stateless_pytest/Dockerfile
+++ b/docker/test/stateless_pytest/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-stateless-pytest .
-FROM yandex/clickhouse-test-base
+# docker build -t clickhouse/stateless-pytest .
+FROM clickhouse/test-base
 
 RUN apt-get update -y && \
     apt-get install -y --no-install-recommends \
diff --git a/docker/test/stateless_unbundled/Dockerfile b/docker/test/stateless_unbundled/Dockerfile
index 53857a90ac7..dfe441e08a6 100644
--- a/docker/test/stateless_unbundled/Dockerfile
+++ b/docker/test/stateless_unbundled/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-stateless-unbundled-test .
-FROM yandex/clickhouse-test-base
+# docker build -t clickhouse/stateless-unbundled-test .
+FROM clickhouse/test-base
 
 ARG odbc_driver_url="https://github.com/ClickHouse/clickhouse-odbc/releases/download/v1.1.4.20200302/clickhouse-odbc-1.1.4-Linux.tar.gz"
 
diff --git a/docker/test/stress/Dockerfile b/docker/test/stress/Dockerfile
index e1df32ec3d7..3fe1b790d5a 100644
--- a/docker/test/stress/Dockerfile
+++ b/docker/test/stress/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-stress-test .
-FROM yandex/clickhouse-stateful-test
+# docker build -t clickhouse/stress-test .
+FROM clickhouse/stateful-test
 
 RUN apt-get update -y \
     && env DEBIAN_FRONTEND=noninteractive \
diff --git a/docker/test/stress/README.md b/docker/test/stress/README.md
index f747996fa2d..b1519e7968d 100644
--- a/docker/test/stress/README.md
+++ b/docker/test/stress/README.md
@@ -6,7 +6,7 @@ Usage:
 ```
 $ ls $HOME/someclickhouse
 clickhouse-client_18.14.9_all.deb clickhouse-common-static_18.14.9_amd64.deb clickhouse-server_18.14.9_all.deb clickhouse-test_18.14.9_all.deb
-$ docker run --volume=$HOME/someclickhouse:/package_folder --volume=$HOME/test_output:/test_output yandex/clickhouse-stress-test
+$ docker run --volume=$HOME/someclickhouse:/package_folder --volume=$HOME/test_output:/test_output clickhouse/stress-test
 Selecting previously unselected package clickhouse-common-static.
 (Reading database ... 14442 files and directories currently installed.)
 ...
diff --git a/docker/test/style/Dockerfile b/docker/test/style/Dockerfile
index c0b3b0102cf..33cdb9db57a 100644
--- a/docker/test/style/Dockerfile
+++ b/docker/test/style/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-style-test .
+# docker build -t clickhouse/style-test .
 FROM ubuntu:20.04
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
diff --git a/docker/test/test_runner.sh b/docker/test/test_runner.sh
index cd6367b2964..0c99c8c2b32 100755
--- a/docker/test/test_runner.sh
+++ b/docker/test/test_runner.sh
@@ -49,7 +49,7 @@ fi
 
 # Build server image (optional) from local packages
 if [ -z "${CLICKHOUSE_SERVER_IMAGE}" ]; then
-    CLICKHOUSE_SERVER_IMAGE="yandex/clickhouse-server:local"
+    CLICKHOUSE_SERVER_IMAGE="clickhouse/server:local"
 
     if [ "${CLICKHOUSE_PACKAGES_ARG}" != "${NO_REBUILD_FLAG}" ]; then
         docker build --network=host \
diff --git a/docker/test/testflows/runner/Dockerfile b/docker/test/testflows/runner/Dockerfile
index 81d431635b7..91d0eb844d9 100644
--- a/docker/test/testflows/runner/Dockerfile
+++ b/docker/test/testflows/runner/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-testflows-runner .
+# docker build -t clickhouse/testflows-runner .
 FROM ubuntu:20.04
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
diff --git a/docker/test/unit/Dockerfile b/docker/test/unit/Dockerfile
index e111611eecd..20d67773363 100644
--- a/docker/test/unit/Dockerfile
+++ b/docker/test/unit/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-unit-test .
-FROM yandex/clickhouse-stateless-test
+# docker build -t clickhouse/unit-test .
+FROM clickhouse/stateless-test
 
 RUN apt-get install gdb
 

From 714b2a3c19c722cffc0f6cd7ba2aec7cc7099da5 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Mon, 6 Sep 2021 14:33:49 +0300
Subject: [PATCH 077/273] More

---
 docker/images.json | 140 ++++++++++++++++++++++-----------------------
 1 file changed, 70 insertions(+), 70 deletions(-)

diff --git a/docker/images.json b/docker/images.json
index d072438688d..ea410848871 100644
--- a/docker/images.json
+++ b/docker/images.json
@@ -1,14 +1,14 @@
 {
     "docker/packager/deb": {
-        "name": "yandex/clickhouse-deb-builder",
-        "symlink_name": "clickhouse/deb-builder",
+        "name": "clickhouse/deb-builder",
+        "symlink_name": "yandex/clickhouse-deb-builder",
         "dependent": [
             "docker/packager/unbundled"
         ]
     },
     "docker/packager/binary": {
-        "name": "yandex/clickhouse-binary-builder",
-        "symlink_name": "clickhouse/binary-builder",
+        "name": "clickhouse/binary-builder",
+        "symlink_name": "yandex/clickhouse-binary-builder",
         "dependent": [
             "docker/test/split_build_smoke_test",
             "docker/test/pvs",
@@ -16,42 +16,43 @@
         ]
     },
     "docker/packager/unbundled": {
-        "name": "yandex/clickhouse-unbundled-builder",
-        "symlink_name": "clickhouse/unbundled-builder",
+        "name": "clickhouse/unbundled-builder",
+        "symlink_name": "yandex/clickhouse-unbundled-builder",
         "dependent": []
     },
     "docker/test/compatibility/centos": {
-        "name": "yandex/clickhouse-test-old-centos",
-        "symlink_name": "clickhouse/test-old-centos",
+        "name": "clickhouse/test-old-centos",
+        "symlink_name": "yandex/clickhouse-test-old-centos",
         "dependent": []
     },
     "docker/test/compatibility/ubuntu": {
-        "name": "yandex/clickhouse-test-old-ubuntu",
-        "symlink_name": "clickhouse/test-old-ubuntu",
+        "name": "clickhouse/test-old-ubuntu",
+        "symlink_name": "yandex/clickhouse-test-old-ubuntu",
         "dependent": []
     },
     "docker/test/integration/base": {
-        "name": "yandex/clickhouse-integration-test",
-        "symlink_name": "clickhouse/integration-test",
+        "name": "clickhouse/integration-test",
+        "symlink_name": "yandex/clickhouse-integration-test",
         "dependent": []
     },
     "docker/test/fuzzer": {
-        "name": "yandex/clickhouse-fuzzer",
-        "symlink_name": "clickhouse/fuzzer",
+        "name": "clickhouse/fuzzer",
+        "symlink_name": "yandex/clickhouse-fuzzer",
         "dependent": []
     },
     "docker/test/performance-comparison": {
-        "name": "yandex/clickhouse-performance-comparison",
-        "symlink_name": "clickhouse/performance-comparison",
+        "name": "clickhouse/performance-comparison",
+        "symlink_name": "yandex/clickhouse-performance-comparison",
         "dependent": []
     },
     "docker/test/pvs": {
-        "name": "yandex/clickhouse-pvs-test",
+        "name": "clickhouse/pvs-test",
+        "symlink_name": "yandex/clickhouse-pvs-test",
         "dependent": []
     },
     "docker/test/stateless": {
-        "name": "yandex/clickhouse-stateless-test",
-        "symlink_name": "clickhouse/stateless-test",
+        "name": "clickhouse/stateless-test",
+        "symlink_name": "yandex/clickhouse-stateless-test",
         "dependent": [
             "docker/test/stateful",
             "docker/test/coverage",
@@ -59,140 +60,139 @@
         ]
     },
     "docker/test/stateful": {
-        "name": "yandex/clickhouse-stateful-test",
-        "symlink_name": "clickhouse/stateful-test",
+        "name": "clickhouse/stateful-test",
+        "symlink_name": "yandex/clickhouse-stateful-test",
         "dependent": [
             "docker/test/stress"
         ]
     },
     "docker/test/coverage": {
-        "name": "yandex/clickhouse-test-coverage",
-        "symlink_name": "clickhouse/test-coverage",
+        "name": "clickhouse/test-coverage",
+        "symlink_name": "yandex/clickhouse-test-coverage",
         "dependent": []
     },
     "docker/test/unit": {
-        "name": "yandex/clickhouse-unit-test",
-        "symlink_name": "clickhouse/unit-test",
+        "name": "clickhouse/unit-test",
+        "symlink_name": "yandex/clickhouse-unit-test",
         "dependent": []
     },
     "docker/test/stress": {
-        "name": "yandex/clickhouse-stress-test",
-        "symlink_name": "clickhouse/stress-test",
+        "name": "clickhouse/stress-test",
+        "symlink_name": "yandex/clickhouse-stress-test",
         "dependent": []
     },
     "docker/test/split_build_smoke_test": {
-        "name": "yandex/clickhouse-split-build-smoke-test",
-        "symlink_name": "clickhouse/split-build-smoke-test",
+        "symlink_name": "yandex/clickhouse-split-build-smoke-test",
+        "name": "clickhouse/split-build-smoke-test",
         "dependent": []
     },
     "docker/test/codebrowser": {
-        "name": "yandex/clickhouse-codebrowser",
-        "symlink_name": "clickhouse/codebrowser",
+        "name": "clickhouse/codebrowser",
+        "symlink_name": "yandex/clickhouse-codebrowser",
         "dependent": []
     },
     "docker/test/integration/runner": {
-        "name": "yandex/clickhouse-integration-tests-runner",
-        "symlink_name": "clickhouse/integration-tests-runner",
+        "name": "clickhouse/integration-tests-runner",
+        "symlink_name": "yandex/clickhouse-integration-tests-runner",
         "dependent": []
     },
     "docker/test/testflows/runner": {
-        "name": "yandex/clickhouse-testflows-runner",
-        "symlink_name": "clickhouse/testflows-runner",
+        "name": "clickhouse/testflows-runner",
+        "symlink_name": "yandex/clickhouse-testflows-runner",
         "dependent": []
     },
     "docker/test/fasttest": {
-        "name": "yandex/clickhouse-fasttest",
-        "symlink_name": "clickhouse/fasttest",
+        "name": "clickhouse/fasttest",
+        "symlink_name": "yandex/clickhouse-fasttest",
         "dependent": []
     },
     "docker/test/style": {
-        "name": "yandex/clickhouse-style-test",
-        "symlink_name": "clickhouse/style-test",
+        "name": "clickhouse/style-test",
+        "symlink_name": "yandex/clickhouse-style-test",
         "dependent": []
     },
     "docker/test/integration/s3_proxy": {
-        "name": "yandex/clickhouse-s3-proxy",
-        "symlink_name": "clickhouse/s3-proxy",
+        "symlink_name": "yandex/clickhouse-s3-proxy",
+        "name": "clickhouse/s3-proxy",
         "dependent": []
     },
     "docker/test/integration/resolver": {
-        "name": "yandex/clickhouse-python-bottle",
-        "symlink_name": "clickhouse/python-bottle",
+        "name": "clickhouse/python-bottle",
+        "symlink_name": "yandex/clickhouse-python-bottle",
         "dependent": []
     },
     "docker/test/integration/helper_container": {
-        "name": "yandex/clickhouse-integration-helper",
-        "symlink_name": "clickhouse/integration-helper",
+        "name": "clickhouse/integration-helper",
+        "symlink_name": "yandex/clickhouse-integration-helper",
         "dependent": []
     },
     "docker/test/integration/mysql_golang_client": {
-        "name": "yandex/clickhouse-mysql-golang-client",
-        "symlink_name": "clickhouse/mysql-golang-client",
+        "name": "clickhouse/mysql-golang-client",
+        "symlink_name": "yandex/clickhouse-mysql-golang-client",
         "dependent": []
     },
     "docker/test/integration/mysql_java_client": {
-        "name": "yandex/clickhouse-mysql-java-client",
-        "symlink_name": "clickhouse/mysql-golang-client",
+        "name": "clickhouse/clickhouse-mysql-java-client",
+        "symlink_name": "yandex/clickhouse-mysql-java-client",
         "dependent": []
     },
     "docker/test/integration/mysql_js_client": {
-        "name": "yandex/clickhouse-mysql-js-client",
-        "symlink_name": "clickhouse/mysql-js-client",
+        "name": "clickhouse/mysql-js-client",
+        "symlink_name": "yandex/clickhouse-mysql-js-client",
         "dependent": []
     },
     "docker/test/integration/mysql_php_client": {
-        "name": "yandex/clickhouse-mysql-php-client",
-        "symlink_name": "clickhouse/mysql-php-client",
+        "name": "clickhouse/mysql-php-client",
+        "symlink_name": "yandex/clickhouse-mysql-php-client",
         "dependent": []
     },
     "docker/test/integration/postgresql_java_client": {
-        "name": "yandex/clickhouse-postgresql-java-client",
-        "symlink_name": "clickhouse/postgresql-java-client",
+        "name": "clickhouse/postgresql-java-client",
+        "symlink_name": "yandex/clickhouse-postgresql-java-client",
         "dependent": []
     },
     "docker/test/integration/kerberos_kdc": {
-        "name": "yandex/clickhouse-kerberos-kdc",
-        "symlink_name": "clickhouse/kerberos-kdc",
+        "name": "clickhouse/kerberos-kdc",
+        "symlink_name": "yandex/clickhouse-kerberos-kdc",
         "dependent": []
     },
     "docker/test/base": {
-         "name": "yandex/clickhouse-test-base",
-         "symlink_name": "clickhouse/test-base",
+         "name": "clickhouse/test-base",
+         "symlink_name": "yandex/clickhouse-test-base",
          "dependent": [
             "docker/test/stateless",
             "docker/test/stateless_unbundled",
-            "docker/test/stateless_pytest",
             "docker/test/integration/base",
             "docker/test/fuzzer",
             "docker/test/keeper-jepsen"
          ]
     },
     "docker/packager/unbundled": {
-         "name": "yandex/clickhouse-unbundled-builder",
-         "symlink_name": "clickhouse/unbundled-builder",
+         "name": "clickhouse/unbundled-builder",
+         "symlink_name": "yandex/clickhouse-unbundled-builder",
          "dependent": [
             "docker/test/stateless_unbundled"
          ]
     },
     "docker/test/stateless_unbundled": {
-         "name": "yandex/clickhouse-stateless-unbundled-test",
-         "symlink_name": "clickhouse/stateless-unbundled-test",
+         "name": "clickhouse/stateless-unbundled-test",
+         "symlink_name": "yandex/clickhouse-stateless-unbundled-test",
          "dependent": [
          ]
     },
     "docker/test/integration/kerberized_hadoop": {
-        "name": "yandex/clickhouse-kerberized-hadoop",
-        "symlink_name": "clickhouse/kerberized-hadoop",
+        "name": "clickhouse/kerberized-hadoop",
+        "symlink_name": "yandex/clickhouse-kerberized-hadoop",
         "dependent": []
     },
     "docker/test/sqlancer": {
-        "name": "yandex/clickhouse-sqlancer-test",
-        "symlink_name": "clickhouse/sqlancer-test",
+        "name": "clickhouse/sqlancer-test",
+        "symlink_name": "yandex/clickhouse-sqlancer-test",
         "dependent": []
     },
     "docker/test/keeper-jepsen": {
-        "name": "yandex/clickhouse-keeper-jepsen-test",
-        "symlink_name": "clickhouse/keeper-jepsen-test",
+        "name": "clickhouse/keeper-jepsen-test",
+        "symlink_name": "yandex/clickhouse-keeper-jepsen-test",
         "dependent": []
     }
 }

From 348dec14a41031066c764ec2a2bad05321eb7c0c Mon Sep 17 00:00:00 2001
From: adevyatova <annaconda@bk.ru>
Date: Mon, 6 Sep 2021 11:50:52 +0000
Subject: [PATCH 078/273] Add desc for MsgPack

---
 docs/en/interfaces/formats.md | 21 ++++++++++++++++++++-
 docs/ru/interfaces/formats.md | 21 +++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/docs/en/interfaces/formats.md b/docs/en/interfaces/formats.md
index bac67ecf140..af4fbfbd067 100644
--- a/docs/en/interfaces/formats.md
+++ b/docs/en/interfaces/formats.md
@@ -60,6 +60,7 @@ The supported formats are:
 | [LineAsString](#lineasstring)                                                           | ✔     | ✗      |
 | [Regexp](#data-format-regexp)                                                           | ✔     | ✗      |
 | [RawBLOB](#rawblob)                                                                     | ✔     | ✔      |
+| [MsgPack](#msgpack)                                                                     | ✔     | ✔      |
 
 You can control some format processing parameters with the ClickHouse settings. For more information read the [Settings](../operations/settings/settings.md) section.
 
@@ -1545,4 +1546,22 @@ Result:
 f9725a22f9191e064120d718e26862a9  -
 ```
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/formats/) <!--hide-->
+## MsgPack {#msgpack}
+
+ClickHouse supports reading and writing [MessagePack](https://msgpack.org/) data files.
+
+### Data Types Matching {#data-types-matching-msgpack}
+
+| MsgPack data type               | ClickHouse data type                                                             |
+|---------------------------------|----------------------------------------------------------------------------------|
+| `uint N`, `positive fixint`     | [UIntN](../sql-reference/data-types/int-uint.md)                                 |
+| `int N`                         | [IntN](../sql-reference/data-types/int-uint.md)                                  |
+| `fixstr`, `str 8`, `str 16`, `str 32`   | [String](../sql-reference/data-types/string.md), [FixedString](../sql-reference/data-types/fixedstring.md)                   |
+| `float 32`                        | [Float32](../sql-reference/data-types/float.md)                                  |
+| `float 64`                        | [Float64](../sql-reference/data-types/float.md)                                  |
+| `uint 16`                         | [Date](../sql-reference/data-types/date.md)                                      |
+| `uint 32`                         | [DateTime](../sql-reference/data-types/datetime.md)                              |
+| `uint 64`                         | [DateTime64](../sql-reference/data-types/datetime.md)                            |
+| `fixarray`, `array 16`, `array 32`| [Array](../sql-reference/data-types/array.md)                                    |
+	
+Unsupported MsgPack data type: `nil`.
diff --git a/docs/ru/interfaces/formats.md b/docs/ru/interfaces/formats.md
index 1dd10e1f76d..6a3c85d6df4 100644
--- a/docs/ru/interfaces/formats.md
+++ b/docs/ru/interfaces/formats.md
@@ -59,6 +59,7 @@ ClickHouse может принимать (`INSERT`) и отдавать (`SELECT
 | [LineAsString](#lineasstring)                                                           | ✔     | ✗      |
 | [Regexp](#data-format-regexp)                                                           | ✔     | ✗      |
 | [RawBLOB](#rawblob)                                                                     | ✔     | ✔      |
+| [MsgPack](#msgpack)                                                                     | ✔     | ✔      |
 
 Вы можете регулировать некоторые параметры работы с форматами с помощью настроек ClickHouse. За дополнительной информацией обращайтесь к разделу [Настройки](../operations/settings/settings.md).
 
@@ -1458,3 +1459,23 @@ $ clickhouse-client --query "SELECT * FROM {some_table} FORMAT RawBLOB" | md5sum
 ``` text
 f9725a22f9191e064120d718e26862a9  -
 ```
+
+## MsgPack {#msgpack}
+
+ClickHouse поддерживает запись и чтение из файлов в формате [MessagePack](https://msgpack.org/).
+
+### Соответствие типов данных {#data-types-matching-msgpack}
+
+| Тип данных MsgPack              | Тип данных ClickHouse                                                              |
+|---------------------------------|------------------------------------------------------------------------------------|
+| `uint N`, `positive fixint`         | [UIntN](../sql-reference/data-types/int-uint.md)                               |
+| `int N`                           | [IntN](../sql-reference/data-types/int-uint.md)                                  |
+| `fixstr`, `str 8`, `str 16`, `str 32`   | [String](../sql-reference/data-types/string.md), [FixedString](../sql-reference/data-types/fixedstring.md)                   |
+| `float 32`                        | [Float32](../sql-reference/data-types/float.md)                                  |
+| `float 64`                        | [Float64](../sql-reference/data-types/float.md)                                  |
+| `uint 16`                         | [Date](../sql-reference/data-types/date.md)                                      |
+| `uint 32`                         | [DateTime](../sql-reference/data-types/datetime.md)                              |
+| `uint 64`                         | [DateTime64](../sql-reference/data-types/datetime.md)                            |
+| `fixarray`, `array 16`, `array 32`| [Array](../sql-reference/data-types/array.md)                                    |
+	
+Неподдерживаемый тип данных: `nil`.
\ No newline at end of file

From c8c02b5e5b6dbda49da602cedb7a5d07b35a392a Mon Sep 17 00:00:00 2001
From: Evgeniia Sudarikova <evgsudarikova@yandex-team.ru>
Date: Mon, 6 Sep 2021 14:56:58 +0300
Subject: [PATCH 079/273] minor changes (articles, misprints)

---
 docs/en/operations/clickhouse-keeper.md | 26 ++++++++++++-------------
 docs/ru/operations/clickhouse-keeper.md |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/docs/en/operations/clickhouse-keeper.md b/docs/en/operations/clickhouse-keeper.md
index ad217d88275..8e2ee9ab098 100644
--- a/docs/en/operations/clickhouse-keeper.md
+++ b/docs/en/operations/clickhouse-keeper.md
@@ -5,14 +5,14 @@ toc_title: ClickHouse Keeper
 
 # [pre-production] ClickHouse Keeper
 
-ClickHouse server use [ZooKeeper](https://zookeeper.apache.org/) coordination system for data [replication](../engines/table-engines/mergetree-family/replication.md) and [distributed DDL](../sql-reference/distributed-ddl.md) queries execution. ClickHouse Keeper is an alternative coordination system compatible with ZooKeeper.
+ClickHouse server uses [ZooKeeper](https://zookeeper.apache.org/) coordination system for data [replication](../engines/table-engines/mergetree-family/replication.md) and [distributed DDL](../sql-reference/distributed-ddl.md) queries execution. ClickHouse Keeper is an alternative coordination system compatible with ZooKeeper.
 
 !!! warning "Warning"
     This feature is currently in the pre-production stage. We test it in our CI and on small internal installations.
 
 ## Implementation details
 
-ZooKeeper is one of the first well-known open-source coordination systems. It's implemented in Java, has quite a simple and powerful data model. ZooKeeper's coordination algorithm called ZAB (ZooKeeper Atomic Broadcast) doesn't provide linearizability guarantees for reads, because each ZooKeeper node serves reads locally. Unlike ZooKeeper ClickHouse Keeper written in C++ and use [RAFT algorithm](https://raft.github.io/) [implementation](https://github.com/eBay/NuRaft). This algorithm allows to have linearizability for reads and writes, has several open-source implementations in different languages.
+ZooKeeper is one of the first well-known open-source coordination systems. It's implemented in Java, has quite a simple and powerful data model. ZooKeeper's coordination algorithm called ZAB (ZooKeeper Atomic Broadcast) doesn't provide linearizability guarantees for reads, because each ZooKeeper node serves reads locally. Unlike ZooKeeper ClickHouse Keeper is written in C++ and uses [RAFT algorithm](https://raft.github.io/) [implementation](https://github.com/eBay/NuRaft). This algorithm allows to have linearizability for reads and writes, has several open-source implementations in different languages.
 
 By default, ClickHouse Keeper provides the same guarantees as ZooKeeper (linearizable writes, non-linearizable reads). It has a compatible client-server protocol, so any standard ZooKeeper client can be used to interact with ClickHouse Keeper. Snapshots and logs have an incompatible format with ZooKeeper, but `clickhouse-keeper-converter` tool allows to convert ZooKeeper data to ClickHouse Keeper snapshot. Interserver protocol in ClickHouse Keeper is also incompatible with ZooKeeper so mixed ZooKeeper / ClickHouse Keeper cluster is impossible.
 
@@ -26,7 +26,7 @@ ClickHouse Keeper can be used as a standalone replacement for ZooKeeper or as an
 -    `log_storage_path` — Path to coordination logs, better to store logs on the non-busy device (same for ZooKeeper).
 -    `snapshot_storage_path` — Path to coordination snapshots.
 
-Other common parameters are inherited from ClickHouse server config (`listen_host`, `logger`, and so on).
+Other common parameters are inherited from the ClickHouse server config (`listen_host`, `logger`, and so on).
 
 Internal coordination settings are located in `<keeper_server>.<coordination_settings>` section:
 
@@ -34,26 +34,26 @@ Internal coordination settings are located in `<keeper_server>.<coordination_set
 -    `session_timeout_ms` — Timeout for client session (ms) (default: 30000).
 -    `dead_session_check_period_ms` — How often ClickHouse Keeper check dead sessions and remove them (ms) (default: 500).
 -    `heart_beat_interval_ms` — How often a ClickHouse Keeper leader will send heartbeats to followers (ms) (default: 500).
--    `election_timeout_lower_bound_ms` — If follower didn't receive heartbeats from the leader in this interval, then it can initiate leader election (default: 1000).
--    `election_timeout_upper_bound_ms` — If follower didn't receive heartbeats from the leader in this interval, then it must initiate leader election (default: 2000).
+-    `election_timeout_lower_bound_ms` — If the follower didn't receive heartbeats from the leader in this interval, then it can initiate leader election (default: 1000).
+-    `election_timeout_upper_bound_ms` — If the follower didn't receive heartbeats from the leader in this interval, then it must initiate leader election (default: 2000).
 -    `rotate_log_storage_interval` — How many log records to store in a single file (default: 100000).
 -    `reserved_log_items` — How many coordination log records to store before compaction (default: 100000).
 -    `snapshot_distance` — How often ClickHouse Keeper will create new snapshots (in the number of records in logs) (default: 100000).
 -    `snapshots_to_keep` — How many snapshots to keep (default: 3).
--    `stale_log_gap` — Threshold when leader consider follower as stale and send snapshot to it instead of logs (default: 10000).
+-    `stale_log_gap` — Threshold when leader considers follower as stale and sends the snapshot to it instead of logs (default: 10000).
 -    `fresh_log_gap` — When node became fresh (default: 200).
 -    `max_requests_batch_size` - Max size of batch in requests count before it will be sent to RAFT (default: 100).
 -    `force_sync` — Call `fsync` on each write to coordination log (default: true).
--    `quorum_reads` — Execute read requests as writes through whole RAFT consesus with similar speed (default: false).
+-    `quorum_reads` — Execute read requests as writes through whole RAFT consensus with similar speed (default: false).
 -    `raft_logs_level` — Text logging level about coordination (trace, debug, and so on) (default: system default).
--    `auto_forwarding` — Allow to forward write requests from followers to leader (default: true).
+-    `auto_forwarding` — Allow to forward write requests from followers to the leader (default: true).
 -    `shutdown_timeout` — Wait to finish internal connections and shutdown (ms) (default: 5000).
 -    `startup_timeout` — If the server doesn't connect to other quorum participants in the specified timeout it will terminate (ms) (default: 30000).
 
 Quorum configuration is located in `<keeper_server>.<raft_configuration>` section and contain servers description. The only parameter for the whole quorum is `secure`, which enables encrypted connection for communication between quorum participants. The main parameters for each `<server>` are:
 
--    `id` — Server_id in quorum.
--    `hostname` — Hostname where this server placed.
+-    `id` — Server_id in a quorum.
+-    `hostname` — Hostname where this server is placed.
 -    `port` — Port where this server listens for connections.
 
 
@@ -94,7 +94,7 @@ Examples of configuration for quorum with three nodes can be found in [integrati
 
 ## How to run
 
-ClickHouse Keeper is bundled into `clickhouse-server` package, just add configuration of `<keeper_server>` and start ClickHouse server as always. If you want to run standalone ClickHouse Keeper you can start it in a similar way with:
+ClickHouse Keeper is bundled into the ClickHouse server package, just add configuration of `<keeper_server>` and start ClickHouse server as always. If you want to run standalone ClickHouse Keeper you can start it in a similar way with:
 
 ```bash
 clickhouse-keeper --config /etc/your_path_to_config/config.xml --daemon
@@ -102,7 +102,7 @@ clickhouse-keeper --config /etc/your_path_to_config/config.xml --daemon
 
 ## [experimental] Migration from ZooKeeper
 
-Seamlessly migration from ZooKeeper to ClickHouse Keeper is impossible you have to stop your ZooKeeper cluster, convert data and start ClickHouse Keeper. `clickhouse-keeper-converter` tool allows to convert ZooKeeper logs and snapshots to ClickHouse Keeper snapshot. It works only with ZooKeeper > 3.4. Steps for migration:
+Seamlessly migration from ZooKeeper to ClickHouse Keeper is impossible you have to stop your ZooKeeper cluster, convert data and start ClickHouse Keeper. `clickhouse-keeper-converter` tool allows converting ZooKeeper logs and snapshots to ClickHouse Keeper snapshot. It works only with ZooKeeper > 3.4. Steps for migration:
 
 1. Stop all ZooKeeper nodes.
 
@@ -114,6 +114,6 @@ Seamlessly migration from ZooKeeper to ClickHouse Keeper is impossible you have
 clickhouse-keeper-converter --zookeeper-logs-dir /var/lib/zookeeper/version-2 --zookeeper-snapshots-dir /var/lib/zookeeper/version-2 --output-dir /path/to/clickhouse/keeper/snapshots
 ```
 
-4. Copy snapshot to ClickHouse server nodes with configured `keeper` or start ClickHouse Keeper instead of ZooKeeper. The snapshot must persist on all nodes, otherwise, empty nodes can be faster and one of them can become a leader.
+4. Copy snapshot to ClickHouse server nodes with a configured `keeper` or start ClickHouse Keeper instead of ZooKeeper. The snapshot must persist on all nodes, otherwise, empty nodes can be faster and one of them can become a leader.
 
 [Original article](https://clickhouse.tech/docs/en/operations/clickhouse-keeper/) <!--hide-->
\ No newline at end of file
diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index ec4159adfe2..da5ea837214 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -14,7 +14,7 @@ toc_title: ClickHouse Keeper
 
 ZooKeeper — один из первых широко известных сервисов координации с открытым исходным кодом. Он реализован на Java, имеет достаточно простую и мощную модель данных. Алгоритм координации Zookeeper называется ZAB (ZooKeeper Atomic Broadcast). Он не гарантирует линеаризуемость операций чтения, поскольку каждый узел ZooKeeper обслуживает чтения локально. В отличие от ZooKeeper, ClickHouse Keeper реализован на C++ и использует алгоритм [RAFT](https://raft.github.io/), [реализация](https://github.com/eBay/NuRaft). Этот алгоритм обеспечивает линеаризуемость чтения и записи, имеет несколько реализаций с открытым исходным кодом на разных языках.
 
-По умолчанию ClickHouse Keeper предоставляет те же гарантии, что и ZooKeeper (линеаризуемость записи, нелинеаризуемость чтения). У него есть совместимый протокол клиент-сервер, поэтому любой стандартный клиент ZooKeeper может использоваться для взаимодействия с ClickHouse Keeper. Снэпшоты и журналы имеют несовместимый с ZooKeeper формат, однако можно конвертировать данные Zookeeper в снэпшот ClickHouse Keeper` с помощью `clickhouse-keeper-converter`. Межсерверный протокол `clickhouse-keeper` также несовместим с ZooKeeper, поэтому создание смешанного кластера ZooKeeper / ClickHouse Keeper невозможно.
+По умолчанию ClickHouse Keeper предоставляет те же гарантии, что и ZooKeeper (линеаризуемость записи, нелинеаризуемость чтения). У него есть совместимый протокол клиент-сервер, поэтому любой стандартный клиент ZooKeeper может использоваться для взаимодействия с ClickHouse Keeper. Снэпшоты и журналы имеют несовместимый с ZooKeeper формат, однако можно конвертировать данные Zookeeper в снэпшот ClickHouse Keeper с помощью `clickhouse-keeper-converter`. Межсерверный протокол ClickHouse Keeper также несовместим с ZooKeeper, поэтому создание смешанного кластера ZooKeeper / ClickHouse Keeper невозможно.
 
 ## Конфигурация
 
@@ -22,7 +22,7 @@ ClickHouse Keeper может использоваться как равноце
 
 -    `tcp_port` — порт для подключения клиента (по умолчанию для ZooKeeper: `2181`).
 -    `tcp_port_secure` — зашифрованный порт для подключения клиента.
--    `server_id` — уникальный идентификатор сервера, каждый участник кластера должен иметь уникальный номер (1, 2, 3 и т. д.).
+-    `server_id` — уникальный идентификатор сервера, каждый участник кластера должен иметь уникальный номер&nbsp;(1,&nbsp;2,&nbsp;3&nbsp;и&nbsp;т.&nbsp;д.).
 -    `log_storage_path` — путь к журналам координации, лучше хранить их на незанятом устройстве (актуально и для ZooKeeper).
 -    `snapshot_storage_path` — путь к снэпшотам координации.
 

From 861258ecc0afce8940b95c57c4a1335973c3c1f6 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Mon, 6 Sep 2021 15:06:41 +0300
Subject: [PATCH 080/273] Simplier

---
 docker/images.json | 35 -----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/docker/images.json b/docker/images.json
index ea410848871..795ca47be00 100644
--- a/docker/images.json
+++ b/docker/images.json
@@ -1,14 +1,12 @@
 {
     "docker/packager/deb": {
         "name": "clickhouse/deb-builder",
-        "symlink_name": "yandex/clickhouse-deb-builder",
         "dependent": [
             "docker/packager/unbundled"
         ]
     },
     "docker/packager/binary": {
         "name": "clickhouse/binary-builder",
-        "symlink_name": "yandex/clickhouse-binary-builder",
         "dependent": [
             "docker/test/split_build_smoke_test",
             "docker/test/pvs",
@@ -17,42 +15,34 @@
     },
     "docker/packager/unbundled": {
         "name": "clickhouse/unbundled-builder",
-        "symlink_name": "yandex/clickhouse-unbundled-builder",
         "dependent": []
     },
     "docker/test/compatibility/centos": {
         "name": "clickhouse/test-old-centos",
-        "symlink_name": "yandex/clickhouse-test-old-centos",
         "dependent": []
     },
     "docker/test/compatibility/ubuntu": {
         "name": "clickhouse/test-old-ubuntu",
-        "symlink_name": "yandex/clickhouse-test-old-ubuntu",
         "dependent": []
     },
     "docker/test/integration/base": {
         "name": "clickhouse/integration-test",
-        "symlink_name": "yandex/clickhouse-integration-test",
         "dependent": []
     },
     "docker/test/fuzzer": {
         "name": "clickhouse/fuzzer",
-        "symlink_name": "yandex/clickhouse-fuzzer",
         "dependent": []
     },
     "docker/test/performance-comparison": {
         "name": "clickhouse/performance-comparison",
-        "symlink_name": "yandex/clickhouse-performance-comparison",
         "dependent": []
     },
     "docker/test/pvs": {
         "name": "clickhouse/pvs-test",
-        "symlink_name": "yandex/clickhouse-pvs-test",
         "dependent": []
     },
     "docker/test/stateless": {
         "name": "clickhouse/stateless-test",
-        "symlink_name": "yandex/clickhouse-stateless-test",
         "dependent": [
             "docker/test/stateful",
             "docker/test/coverage",
@@ -61,104 +51,84 @@
     },
     "docker/test/stateful": {
         "name": "clickhouse/stateful-test",
-        "symlink_name": "yandex/clickhouse-stateful-test",
         "dependent": [
             "docker/test/stress"
         ]
     },
     "docker/test/coverage": {
         "name": "clickhouse/test-coverage",
-        "symlink_name": "yandex/clickhouse-test-coverage",
         "dependent": []
     },
     "docker/test/unit": {
         "name": "clickhouse/unit-test",
-        "symlink_name": "yandex/clickhouse-unit-test",
         "dependent": []
     },
     "docker/test/stress": {
         "name": "clickhouse/stress-test",
-        "symlink_name": "yandex/clickhouse-stress-test",
         "dependent": []
     },
     "docker/test/split_build_smoke_test": {
-        "symlink_name": "yandex/clickhouse-split-build-smoke-test",
         "name": "clickhouse/split-build-smoke-test",
         "dependent": []
     },
     "docker/test/codebrowser": {
         "name": "clickhouse/codebrowser",
-        "symlink_name": "yandex/clickhouse-codebrowser",
         "dependent": []
     },
     "docker/test/integration/runner": {
         "name": "clickhouse/integration-tests-runner",
-        "symlink_name": "yandex/clickhouse-integration-tests-runner",
         "dependent": []
     },
     "docker/test/testflows/runner": {
         "name": "clickhouse/testflows-runner",
-        "symlink_name": "yandex/clickhouse-testflows-runner",
         "dependent": []
     },
     "docker/test/fasttest": {
         "name": "clickhouse/fasttest",
-        "symlink_name": "yandex/clickhouse-fasttest",
         "dependent": []
     },
     "docker/test/style": {
         "name": "clickhouse/style-test",
-        "symlink_name": "yandex/clickhouse-style-test",
         "dependent": []
     },
     "docker/test/integration/s3_proxy": {
-        "symlink_name": "yandex/clickhouse-s3-proxy",
         "name": "clickhouse/s3-proxy",
         "dependent": []
     },
     "docker/test/integration/resolver": {
         "name": "clickhouse/python-bottle",
-        "symlink_name": "yandex/clickhouse-python-bottle",
         "dependent": []
     },
     "docker/test/integration/helper_container": {
         "name": "clickhouse/integration-helper",
-        "symlink_name": "yandex/clickhouse-integration-helper",
         "dependent": []
     },
     "docker/test/integration/mysql_golang_client": {
         "name": "clickhouse/mysql-golang-client",
-        "symlink_name": "yandex/clickhouse-mysql-golang-client",
         "dependent": []
     },
     "docker/test/integration/mysql_java_client": {
         "name": "clickhouse/clickhouse-mysql-java-client",
-        "symlink_name": "yandex/clickhouse-mysql-java-client",
         "dependent": []
     },
     "docker/test/integration/mysql_js_client": {
         "name": "clickhouse/mysql-js-client",
-        "symlink_name": "yandex/clickhouse-mysql-js-client",
         "dependent": []
     },
     "docker/test/integration/mysql_php_client": {
         "name": "clickhouse/mysql-php-client",
-        "symlink_name": "yandex/clickhouse-mysql-php-client",
         "dependent": []
     },
     "docker/test/integration/postgresql_java_client": {
         "name": "clickhouse/postgresql-java-client",
-        "symlink_name": "yandex/clickhouse-postgresql-java-client",
         "dependent": []
     },
     "docker/test/integration/kerberos_kdc": {
         "name": "clickhouse/kerberos-kdc",
-        "symlink_name": "yandex/clickhouse-kerberos-kdc",
         "dependent": []
     },
     "docker/test/base": {
          "name": "clickhouse/test-base",
-         "symlink_name": "yandex/clickhouse-test-base",
          "dependent": [
             "docker/test/stateless",
             "docker/test/stateless_unbundled",
@@ -169,30 +139,25 @@
     },
     "docker/packager/unbundled": {
          "name": "clickhouse/unbundled-builder",
-         "symlink_name": "yandex/clickhouse-unbundled-builder",
          "dependent": [
             "docker/test/stateless_unbundled"
          ]
     },
     "docker/test/stateless_unbundled": {
          "name": "clickhouse/stateless-unbundled-test",
-         "symlink_name": "yandex/clickhouse-stateless-unbundled-test",
          "dependent": [
          ]
     },
     "docker/test/integration/kerberized_hadoop": {
         "name": "clickhouse/kerberized-hadoop",
-        "symlink_name": "yandex/clickhouse-kerberized-hadoop",
         "dependent": []
     },
     "docker/test/sqlancer": {
         "name": "clickhouse/sqlancer-test",
-        "symlink_name": "yandex/clickhouse-sqlancer-test",
         "dependent": []
     },
     "docker/test/keeper-jepsen": {
         "name": "clickhouse/keeper-jepsen-test",
-        "symlink_name": "yandex/clickhouse-keeper-jepsen-test",
         "dependent": []
     }
 }

From 27876193fc89c5ba5a53e3fe116b9c6129303f46 Mon Sep 17 00:00:00 2001
From: George <gyuton@yandex-team.ru>
Date: Mon, 6 Sep 2021 15:36:20 +0300
Subject: [PATCH 081/273] Small fix

---
 docs/en/sql-reference/functions/tuple-map-functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/functions/tuple-map-functions.md b/docs/en/sql-reference/functions/tuple-map-functions.md
index 04f02c3ead4..8a2be922ec7 100644
--- a/docs/en/sql-reference/functions/tuple-map-functions.md
+++ b/docs/en/sql-reference/functions/tuple-map-functions.md
@@ -86,7 +86,7 @@ Arguments are [maps](../../sql-reference/data-types/map.md) or [tuples](../../sq
 
 **Example**
 
-Query with a tuple map:
+Query with a Tuple:
 
 ```sql
 SELECT mapAdd(([toUInt8(1), 2], [1, 1]), ([toUInt8(1), 2], [1, 1])) as res, toTypeName(res) as type;

From 8e9aacadd1b5b1e8daab267ab9e7a3ae500a4e98 Mon Sep 17 00:00:00 2001
From: Mike Kot <to@myrrc.dev>
Date: Mon, 6 Sep 2021 16:24:03 +0200
Subject: [PATCH 082/273] Initial: replacing hardcoded toString for enums with
 magic_enum

---
 .gitmodules                                   |  3 +
 base/common/EnumReflection.h                  | 32 +++++++
 contrib/CMakeLists.txt                        |  2 +
 contrib/magic_enum                            |  1 +
 src/Columns/ColumnAggregateFunction.cpp       |  5 +-
 src/Common/ExternalLoaderStatus.cpp           | 39 --------
 src/Common/ExternalLoaderStatus.h             | 16 +++-
 src/Common/IntervalKind.cpp                   | 17 ----
 src/Common/IntervalKind.h                     |  4 +-
 src/Common/JSONBuilder.h                      |  3 +-
 src/Core/Field.h                              | 38 ++------
 src/DataTypes/DataTypeInterval.h              |  2 +-
 src/DataTypes/registerDataTypeDateTime.cpp    |  6 +-
 src/Disks/IVolume.cpp                         | 16 ----
 src/Disks/IVolume.h                           |  2 -
 src/Functions/FunctionBinaryArithmetic.h      |  4 +-
 src/Functions/toStartOfInterval.cpp           |  8 +-
 src/IO/Operators.h                            | 50 ++++++++--
 src/IO/WriteHelpers.h                         |  8 +-
 src/Interpreters/ActionsDAG.cpp               | 23 +----
 src/Interpreters/ActionsDAG.h                 |  2 -
 src/Interpreters/ExpressionAnalyzer.cpp       |  2 +-
 src/Interpreters/InterpreterSystemQuery.cpp   |  2 +-
 src/Interpreters/WindowDescription.cpp        | 10 +-
 src/Interpreters/WindowDescription.h          | 34 -------
 src/Interpreters/convertFieldToType.cpp       | 12 +--
 src/Parsers/ASTSystemQuery.cpp                | 93 +------------------
 src/Parsers/ASTSystemQuery.h                  |  2 -
 src/Parsers/ASTWindowDefinition.cpp           |  2 +-
 src/Parsers/CommonParsers.cpp                 | 19 +---
 src/Parsers/CommonParsers.h                   |  6 +-
 src/Parsers/ParserSystemQuery.cpp             | 11 ++-
 src/Processors/Transforms/WindowTransform.cpp |  6 +-
 src/Storages/AlterCommands.cpp                | 47 ----------
 src/Storages/AlterCommands.h                  |  3 -
 src/Storages/IStorage.cpp                     |  5 +-
 src/Storages/MergeTree/IMergeTreeDataPart.cpp | 31 +------
 src/Storages/MergeTree/IMergeTreeDataPart.h   | 17 +---
 .../MergeTree/MergeTreeDataSelectExecutor.cpp |  2 +-
 src/Storages/ProjectionsDescription.cpp       | 14 ---
 src/Storages/ProjectionsDescription.h         |  2 -
 src/Storages/StorageBuffer.cpp                | 12 ++-
 src/Storages/StorageDistributed.cpp           |  5 +-
 src/Storages/StorageMaterializedView.cpp      | 10 +-
 src/Storages/StorageMerge.cpp                 | 12 ++-
 src/Storages/StorageNull.cpp                  | 12 ++-
 src/Storages/StorageReplicatedMergeTree.cpp   |  2 +-
 src/Storages/System/StorageSystemParts.cpp    |  2 +-
 .../System/StorageSystemProjectionParts.cpp   |  2 +-
 .../System/StorageSystemStoragePolicies.cpp   |  3 +-
 50 files changed, 198 insertions(+), 463 deletions(-)
 create mode 100644 base/common/EnumReflection.h
 create mode 160000 contrib/magic_enum
 delete mode 100644 src/Common/ExternalLoaderStatus.cpp

diff --git a/.gitmodules b/.gitmodules
index 37b22527eb4..74d1049ce01 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -246,3 +246,6 @@
 [submodule "contrib/bzip2"]
 	path = contrib/bzip2
 	url = https://github.com/ClickHouse-Extras/bzip2.git
+[submodule "contrib/magic_enum"]
+	path = contrib/magic_enum
+	url = https://github.com/Neargye/magic_enum
diff --git a/base/common/EnumReflection.h b/base/common/EnumReflection.h
new file mode 100644
index 00000000000..f98d49ac351
--- /dev/null
+++ b/base/common/EnumReflection.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <type_traits>
+#include <fmt/format.h>
+#include <../../contrib/magic_enum/include/magic_enum.hpp> //FIXME
+
+// Can't name concept is_enum as is would conflict with type trait
+template <class T> concept type_is_enum = std::is_enum_v<T>;
+
+// Enable printing enum values as strings via fmt + magic_enum
+template <type_is_enum T>
+struct fmt::formatter<T> : fmt::formatter<std::string_view> {
+    constexpr auto format(T enum_value, auto& format_context) {
+        return formatter<string_view>::format(
+            magic_enum::enum_name(enum_value), format_context);
+    }
+};
+
+namespace DB
+{
+
+/**
+ * Some enums have multiple-word values like FLUSH_DICT. However, we should parse user input like FLUSH DICT.
+ * magic_enum::enum_names returns names with underscore, so we have to replace underscore with space.
+ */
+std::string UnderscoreToSpace(std::string_view str)
+{
+    std::string out(str.data(), str.size());
+    std::replace(out.begin(), out.end(), '_', ' ');
+    return out;
+}
+}
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index e6e098a05b3..65f641d8f43 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -32,6 +32,8 @@ endif()
 
 set_property(DIRECTORY PROPERTY EXCLUDE_FROM_ALL 1)
 
+include_directories("${CMAKE_SOURCE_DIR}/contrib/magic_enum/include")
+
 add_subdirectory (abseil-cpp-cmake)
 add_subdirectory (boost-cmake)
 add_subdirectory (cctz-cmake)
diff --git a/contrib/magic_enum b/contrib/magic_enum
new file mode 160000
index 00000000000..38f86e4d093
--- /dev/null
+++ b/contrib/magic_enum
@@ -0,0 +1 @@
+Subproject commit 38f86e4d093cfc9034a140d37de2168e3951bef3
diff --git a/src/Columns/ColumnAggregateFunction.cpp b/src/Columns/ColumnAggregateFunction.cpp
index c8e0de644b3..004615cef6e 100644
--- a/src/Columns/ColumnAggregateFunction.cpp
+++ b/src/Columns/ColumnAggregateFunction.cpp
@@ -506,8 +506,9 @@ static void pushBackAndCreateState(ColumnAggregateFunction::Container & data, Ar
 void ColumnAggregateFunction::insert(const Field & x)
 {
     if (x.getType() != Field::Types::AggregateFunctionState)
-        throw Exception(String("Inserting field of type ") + x.getTypeName() + " into ColumnAggregateFunction. "
-                        "Expected " + Field::Types::toString(Field::Types::AggregateFunctionState), ErrorCodes::LOGICAL_ERROR);
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+            "Inserting field of type {} into ColumnAggregateFunction. Expected {}",
+            x.getTypeName(), Field::Types::AggregateFunctionState);
 
     const auto & field_name = x.get<const AggregateFunctionStateData &>().name;
     if (type_string != field_name)
diff --git a/src/Common/ExternalLoaderStatus.cpp b/src/Common/ExternalLoaderStatus.cpp
deleted file mode 100644
index a31b13eb574..00000000000
--- a/src/Common/ExternalLoaderStatus.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <Common/ExternalLoaderStatus.h>
-
-namespace DB
-{
-    String toString(ExternalLoaderStatus status)
-    {
-        using Status = ExternalLoaderStatus;
-        switch (status)
-        {
-            case Status::NOT_LOADED: return "NOT_LOADED";
-            case Status::LOADED: return "LOADED";
-            case Status::FAILED: return "FAILED";
-            case Status::LOADING: return "LOADING";
-            case Status::FAILED_AND_RELOADING: return "FAILED_AND_RELOADING";
-            case Status::LOADED_AND_RELOADING: return "LOADED_AND_RELOADING";
-            case Status::NOT_EXIST: return "NOT_EXIST";
-        }
-    __builtin_unreachable();
-    }
-
-    std::vector<std::pair<String, Int8>> getStatusEnumAllPossibleValues()
-    {
-        using Status = ExternalLoaderStatus;
-        return std::vector<std::pair<String, Int8>>{
-            {toString(Status::NOT_LOADED), static_cast<Int8>(Status::NOT_LOADED)},
-            {toString(Status::LOADED), static_cast<Int8>(Status::LOADED)},
-            {toString(Status::FAILED), static_cast<Int8>(Status::FAILED)},
-            {toString(Status::LOADING), static_cast<Int8>(Status::LOADING)},
-            {toString(Status::LOADED_AND_RELOADING), static_cast<Int8>(Status::LOADED_AND_RELOADING)},
-            {toString(Status::FAILED_AND_RELOADING), static_cast<Int8>(Status::FAILED_AND_RELOADING)},
-            {toString(Status::NOT_EXIST), static_cast<Int8>(Status::NOT_EXIST)},
-        };
-    }
-
-    std::ostream & operator<<(std::ostream & out, ExternalLoaderStatus status)
-    {
-        return out << toString(status);
-    }
-}
diff --git a/src/Common/ExternalLoaderStatus.h b/src/Common/ExternalLoaderStatus.h
index d8852eb6152..f129e72c9d6 100644
--- a/src/Common/ExternalLoaderStatus.h
+++ b/src/Common/ExternalLoaderStatus.h
@@ -4,10 +4,11 @@
 #include <utility>
 #include <ostream>
 #include <common/types.h>
+#include <common/EnumReflection.h>
 
 namespace DB
 {
-    enum class ExternalLoaderStatus
+    enum class ExternalLoaderStatus : Int8
     {
         NOT_LOADED, /// Object hasn't been tried to load. This is an initial state.
         LOADED, /// Object has been loaded successfully.
@@ -18,7 +19,14 @@ namespace DB
         NOT_EXIST, /// Object with this name wasn't found in the configuration.
     };
 
-    String toString(ExternalLoaderStatus status);
-    std::vector<std::pair<String, Int8>> getStatusEnumAllPossibleValues();
-    std::ostream & operator<<(std::ostream & out, ExternalLoaderStatus status);
+    std::vector<std::pair<String, Int8>> getStatusEnumAllPossibleValues()
+    {
+        std::vector<std::pair<String, Int8>> out;
+        out.reserve(magic_enum::enum_count<ExternalLoaderStatus>());
+
+        for (const auto & [value, str] : magic_enum::enum_entries<ExternalLoaderStatus>())
+            out.emplace_back(str, value);
+
+        return out;
+    }
 }
diff --git a/src/Common/IntervalKind.cpp b/src/Common/IntervalKind.cpp
index b4acbe23ddd..ee4b67469ce 100644
--- a/src/Common/IntervalKind.cpp
+++ b/src/Common/IntervalKind.cpp
@@ -9,23 +9,6 @@ namespace ErrorCodes
     extern const int SYNTAX_ERROR;
 }
 
-const char * IntervalKind::toString() const
-{
-    switch (kind)
-    {
-        case IntervalKind::Second: return "Second";
-        case IntervalKind::Minute: return "Minute";
-        case IntervalKind::Hour: return "Hour";
-        case IntervalKind::Day: return "Day";
-        case IntervalKind::Week: return "Week";
-        case IntervalKind::Month: return "Month";
-        case IntervalKind::Quarter: return "Quarter";
-        case IntervalKind::Year: return "Year";
-    }
-    __builtin_unreachable();
-}
-
-
 Int32 IntervalKind::toAvgSeconds() const
 {
     switch (kind)
diff --git a/src/Common/IntervalKind.h b/src/Common/IntervalKind.h
index a086d0d2b0c..a837836bed7 100644
--- a/src/Common/IntervalKind.h
+++ b/src/Common/IntervalKind.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <common/types.h>
-
+#include <common/EnumReflection.h>
 
 namespace DB
 {
@@ -24,7 +24,7 @@ struct IntervalKind
     IntervalKind(Kind kind_ = Second) : kind(kind_) {}
     operator Kind() const { return kind; }
 
-    const char * toString() const;
+    constexpr std::string_view toString() const { return magic_enum::enum_name(kind); }
 
     /// Returns number of seconds in one interval.
     /// For `Month`, `Quarter` and `Year` the function returns an average number of seconds.
diff --git a/src/Common/JSONBuilder.h b/src/Common/JSONBuilder.h
index be95323de7d..12a2b129645 100644
--- a/src/Common/JSONBuilder.h
+++ b/src/Common/JSONBuilder.h
@@ -33,7 +33,7 @@ using ItemPtr = std::unique_ptr<IItem>;
 class JSONString : public IItem
 {
 public:
-    explicit JSONString(std::string value_) : value(std::move(value_)) {}
+    JSONString(std::string_view value_) : value(value_) {}
     void format(const FormatSettings & settings, FormatContext & context) override;
 
 private:
@@ -97,6 +97,7 @@ public:
     void add(std::string key, ItemPtr value) { values.emplace_back(Pair{.key = std::move(key), .value = std::move(value)}); }
     void add(std::string key, std::string value) { add(std::move(key), std::make_unique<JSONString>(std::move(value))); }
     void add(std::string key, const char * value) { add(std::move(key), std::make_unique<JSONString>(value)); }
+    void add(std::string key, std::string_view value) { add(std::move(key), std::make_unique<JSONString>(value)); }
     void add(std::string key, bool value) { add(std::move(key), std::make_unique<JSONBool>(std::move(value))); }
 
     template <typename T, std::enable_if_t<std::is_arithmetic<T>::value, bool> = true>
diff --git a/src/Core/Field.h b/src/Core/Field.h
index 170c948893a..f2a05ef87e3 100644
--- a/src/Core/Field.h
+++ b/src/Core/Field.h
@@ -15,7 +15,6 @@
 #include <common/DayNum.h>
 #include <common/strong_typedef.h>
 
-
 namespace DB
 {
 
@@ -283,33 +282,6 @@ public:
             Map = 26,
             UUID = 27,
         };
-
-        static const char * toString(Which which)
-        {
-            switch (which)
-            {
-                case Null:    return "Null";
-                case UInt64:  return "UInt64";
-                case UInt128: return "UInt128";
-                case UInt256: return "UInt256";
-                case Int64:   return "Int64";
-                case Int128:  return "Int128";
-                case Int256:  return "Int256";
-                case UUID:    return "UUID";
-                case Float64: return "Float64";
-                case String:  return "String";
-                case Array:   return "Array";
-                case Tuple:   return "Tuple";
-                case Map:     return "Map";
-                case Decimal32:  return "Decimal32";
-                case Decimal64:  return "Decimal64";
-                case Decimal128: return "Decimal128";
-                case Decimal256: return "Decimal256";
-                case AggregateFunctionState: return "AggregateFunctionState";
-            }
-
-            throw Exception("Bad type of Field", ErrorCodes::BAD_TYPE_OF_FIELD);
-        }
     };
 
 
@@ -417,6 +389,8 @@ public:
 
 
     Types::Which getType() const { return which; }
+
+    //static constexpr std::string_view getTypeName() { return Types::toString(which); }
     const char * getTypeName() const { return Types::toString(which); }
 
     bool isNull() const { return which == Types::Null; }
@@ -808,7 +782,8 @@ NearestFieldType<std::decay_t<T>> & Field::get()
     constexpr Field::Types::Which target = TypeToEnum<StoredType>::value;
     if (target != which
            && (!isInt64OrUInt64FieldType(target) || !isInt64OrUInt64FieldType(which)))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Invalid Field get from type {} to type {}", Types::toString(which), Types::toString(target));
+        throw Exception(ErrorCodes::LOGICAL_ERROR, 
+            "Invalid Field get from type {} to type {}", which, target);
 #endif
 
     StoredType * MAY_ALIAS ptr = reinterpret_cast<StoredType *>(&storage);
@@ -821,8 +796,11 @@ template <typename T>
 auto & Field::safeGet()
 {
     const Types::Which requested = TypeToEnum<NearestFieldType<std::decay_t<T>>>::value;
+
     if (which != requested)
-        throw Exception("Bad get: has " + std::string(getTypeName()) + ", requested " + std::string(Types::toString(requested)), ErrorCodes::BAD_GET);
+        throw Exception(ErrorCodes::BAD_GET, 
+            "Bad get: has {}, requested {}", getTypeName(), requested);
+
     return get<T>();
 }
 
diff --git a/src/DataTypes/DataTypeInterval.h b/src/DataTypes/DataTypeInterval.h
index a44fd686b61..9ef6237ec41 100644
--- a/src/DataTypes/DataTypeInterval.h
+++ b/src/DataTypes/DataTypeInterval.h
@@ -27,7 +27,7 @@ public:
 
     DataTypeInterval(IntervalKind kind_) : kind(kind_) {}
 
-    std::string doGetName() const override { return std::string("Interval") + kind.toString(); }
+    std::string doGetName() const override { return fmt::format("Interval{}", kind.toString()); }
     const char * getFamilyName() const override { return "Interval"; }
     TypeIndex getTypeId() const override { return TypeIndex::Interval; }
 
diff --git a/src/DataTypes/registerDataTypeDateTime.cpp b/src/DataTypes/registerDataTypeDateTime.cpp
index 815948c6531..47a6f18cbb3 100644
--- a/src/DataTypes/registerDataTypeDateTime.cpp
+++ b/src/DataTypes/registerDataTypeDateTime.cpp
@@ -26,10 +26,8 @@ String getExceptionMessage(
     const String & message, size_t argument_index, const char * argument_name,
     const std::string & context_data_type_name, Field::Types::Which field_type)
 {
-    return std::string("Parameter #") + std::to_string(argument_index) + " '"
-           + argument_name + "' for " + context_data_type_name
-           + message
-           + ", expected: " + Field::Types::toString(field_type) + " literal.";
+    return fmt::format("Parameter #{} '{}' for {}{}, expected {} literal",
+        argument_index, argument_name, context_data_type_name, message, field_type);
 }
 
 template <typename T, ArgumentKind Kind>
diff --git a/src/Disks/IVolume.cpp b/src/Disks/IVolume.cpp
index ac277d962ed..1b6ee84040b 100644
--- a/src/Disks/IVolume.cpp
+++ b/src/Disks/IVolume.cpp
@@ -15,22 +15,6 @@ namespace ErrorCodes
     extern const int UNKNOWN_VOLUME_TYPE;
 }
 
-String volumeTypeToString(VolumeType type)
-{
-    switch (type)
-    {
-        case VolumeType::JBOD:
-            return "JBOD";
-        case VolumeType::RAID1:
-            return "RAID1";
-        case VolumeType::SINGLE_DISK:
-            return "SINGLE_DISK";
-        case VolumeType::UNKNOWN:
-            return "UNKNOWN";
-    }
-    throw Exception("Unknown volume type, please add it to DB::volumeTypeToString", ErrorCodes::UNKNOWN_VOLUME_TYPE);
-}
-
 IVolume::IVolume(
     String name_,
     const Poco::Util::AbstractConfiguration & config,
diff --git a/src/Disks/IVolume.h b/src/Disks/IVolume.h
index c040d9d58e1..d26ddea787d 100644
--- a/src/Disks/IVolume.h
+++ b/src/Disks/IVolume.h
@@ -16,8 +16,6 @@ enum class VolumeType
     UNKNOWN
 };
 
-String volumeTypeToString(VolumeType t);
-
 class IVolume;
 using VolumePtr = std::shared_ptr<IVolume>;
 using Volumes = std::vector<VolumePtr>;
diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index a30a40cc52b..f16112d8b3b 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -632,7 +632,9 @@ class FunctionBinaryArithmetic : public IFunction
         std::string function_name;
         if (interval_data_type)
         {
-            function_name = String(is_plus ? "add" : "subtract") + interval_data_type->getKind().toString() + 's';
+            function_name = fmt::format("{}{}s",
+                is_plus ? "add" : "subtract",
+                interval_data_type->getKind().toString());
         }
         else
         {
diff --git a/src/Functions/toStartOfInterval.cpp b/src/Functions/toStartOfInterval.cpp
index 5d8d76975a0..2ad7585fad3 100644
--- a/src/Functions/toStartOfInterval.cpp
+++ b/src/Functions/toStartOfInterval.cpp
@@ -261,10 +261,10 @@ public:
                         + ". This argument is optional and must be a constant string with timezone name",
                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
             if (first_argument_is_date && result_type_is_date)
-                throw Exception(
-                    "The timezone argument of function " + getName() + " with interval type " + interval_type->getKind().toString()
-                        + " is allowed only when the 1st argument has the type DateTime",
-                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "The timezone argument of function {} with interval type {} is allowed only when the 1st argument "
+                    "has the type DateTime",
+                        getName(), interval_type->getKind().toString());
         };
 
         if (arguments.size() == 2)
diff --git a/src/IO/Operators.h b/src/IO/Operators.h
index 9f83e656106..a41178a36d9 100644
--- a/src/IO/Operators.h
+++ b/src/IO/Operators.h
@@ -6,6 +6,9 @@
 #include <IO/WriteHelpers.h>
 
 #include <functional>
+#include <type_traits>
+
+#include <common/EnumReflection.h>
 
 
 namespace DB
@@ -41,16 +44,47 @@ struct QuoteManipReadBuffer          : std::reference_wrapper<ReadBuffer> { usin
 struct DoubleQuoteManipReadBuffer    : std::reference_wrapper<ReadBuffer> { using std::reference_wrapper<ReadBuffer>::reference_wrapper; };
 struct BinaryManipReadBuffer         : std::reference_wrapper<ReadBuffer> { using std::reference_wrapper<ReadBuffer>::reference_wrapper; };
 
+inline WriteBuffer & operator<<(WriteBuffer & buf, const auto & x)
+{
+    writeText(x, buf);
+    return buf;
+}
 
-template <typename T>     WriteBuffer & operator<< (WriteBuffer & buf, const T & x)        { writeText(x, buf);     return buf; }
-/// If you do not use the manipulators, the string is displayed without an escape, as is.
-template <> inline        WriteBuffer & operator<< (WriteBuffer & buf, const String & x)   { writeString(x, buf);   return buf; }
-template <> inline        WriteBuffer & operator<< (WriteBuffer & buf, const std::string_view & x)   { writeString(StringRef(x), buf);   return buf; }
-template <> inline WriteBuffer & operator<< (WriteBuffer & buf, const StringRef & x) { writeString(x, buf); return buf; }
-template <> inline        WriteBuffer & operator<< (WriteBuffer & buf, const char & x)     { writeChar(x, buf);     return buf; }
-template <> inline        WriteBuffer & operator<< (WriteBuffer & buf, const pcg32_fast & x) { PcgSerializer::serializePcg32(x, buf); return buf; }
+inline WriteBuffer & operator<<(WriteBuffer & buf, auto x) requires(std::is_enum_v<decltype(x)>)
+{
+    writeString(magic_enum::enum_name(x), buf);   
+    return buf; 
+}
 
-inline WriteBuffer & operator<< (WriteBuffer & buf, const char * x)     { writeCString(x, buf); return buf; }
+inline WriteBuffer & operator<<(WriteBuffer & buf, std::string_view x)
+{
+    writeString(x, buf);
+    return buf;
+}
+
+inline WriteBuffer & operator<<(WriteBuffer & buf, StringRef x)
+{
+    writeString(x, buf); 
+    return buf;
+}
+
+inline WriteBuffer & operator<<(WriteBuffer & buf, char x)     
+{ 
+    writeChar(x, buf);
+    return buf; 
+}
+
+inline WriteBuffer & operator<<(WriteBuffer & buf, const char * x)
+{
+    writeCString(x, buf); 
+    return buf; 
+}
+
+WriteBuffer & operator<<(WriteBuffer & buf, const pcg32_fast & x)
+{ 
+    PcgSerializer::serializePcg32(x, buf);
+    return buf;
+}
 
 inline EscapeManipWriteBuffer      operator<< (WriteBuffer & buf, EscapeManip)      { return buf; }
 inline QuoteManipWriteBuffer       operator<< (WriteBuffer & buf, QuoteManip)       { return buf; }
diff --git a/src/IO/WriteHelpers.h b/src/IO/WriteHelpers.h
index 6a0050b061f..36c8f2de13d 100644
--- a/src/IO/WriteHelpers.h
+++ b/src/IO/WriteHelpers.h
@@ -42,7 +42,6 @@
 
 #include <Formats/FormatSettings.h>
 
-
 namespace DB
 {
 
@@ -177,17 +176,20 @@ inline void writeFloatText(T x, WriteBuffer & buf)
     buf.write(buffer, result);
 }
 
-
 inline void writeString(const char * data, size_t size, WriteBuffer & buf)
 {
     buf.write(data, size);
 }
 
-inline void writeString(const StringRef & ref, WriteBuffer & buf)
+inline void writeString(StringRef ref, WriteBuffer & buf)
 {
     writeString(ref.data, ref.size, buf);
 }
 
+inline void writeString(std::string_view ref, WriteBuffer & buf)
+{
+    writeString(ref.data(), ref.size(), buf);
+}
 
 /** Writes a C-string without creating a temporary object. If the string is a literal, then `strlen` is executed at the compilation stage.
   * Use when the string is a literal.
diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index fc8f5801ba2..50d08b87fa9 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -30,34 +30,15 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
-const char * ActionsDAG::typeToString(ActionsDAG::ActionType type)
-{
-    switch (type)
-    {
-        case ActionType::INPUT:
-            return "Input";
-        case ActionType::COLUMN:
-            return "Column";
-        case ActionType::ALIAS:
-            return "Alias";
-        case ActionType::ARRAY_JOIN:
-            return "ArrayJoin";
-        case ActionType::FUNCTION:
-            return "Function";
-    }
-
-    __builtin_unreachable();
-}
-
 void ActionsDAG::Node::toTree(JSONBuilder::JSONMap & map) const
 {
-    map.add("Node Type", ActionsDAG::typeToString(type));
+    map.add("Node Type", magic_enum::enum_name(type));
 
     if (result_type)
         map.add("Result Type", result_type->getName());
 
     if (!result_name.empty())
-        map.add("Result Type", ActionsDAG::typeToString(type));
+        map.add("Result Type", magic_enum::enum_name(type));
 
     if (column)
         map.add("Column", column->getName());
diff --git a/src/Interpreters/ActionsDAG.h b/src/Interpreters/ActionsDAG.h
index d10218bc913..8111bcb123c 100644
--- a/src/Interpreters/ActionsDAG.h
+++ b/src/Interpreters/ActionsDAG.h
@@ -61,8 +61,6 @@ public:
         FUNCTION,
     };
 
-    static const char * typeToString(ActionType type);
-
     struct Node;
     using NodeRawPtrs = std::vector<Node *>;
     using NodeRawConstPtrs = std::vector<const Node *>;
diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
index dbb1addf202..6393264b47f 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -624,7 +624,7 @@ void makeWindowDescriptionFromAST(const Context & context,
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED,
             "Window frame '{}' is not implemented (while processing '{}')",
-            WindowFrame::toString(definition.frame_type),
+            definition.frame_type,
             ast->formatForErrorMessage());
     }
 
diff --git a/src/Interpreters/InterpreterSystemQuery.cpp b/src/Interpreters/InterpreterSystemQuery.cpp
index d4ac555add0..79a1f186f12 100644
--- a/src/Interpreters/InterpreterSystemQuery.cpp
+++ b/src/Interpreters/InterpreterSystemQuery.cpp
@@ -426,7 +426,7 @@ BlockIO InterpreterSystemQuery::execute()
         }
         case Type::STOP_LISTEN_QUERIES:
         case Type::START_LISTEN_QUERIES:
-            throw Exception(String(ASTSystemQuery::typeToString(query.type)) + " is not supported yet", ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} is not supported yet", query.type);
         default:
             throw Exception("Unknown type of SYSTEM query", ErrorCodes::BAD_ARGUMENTS);
     }
diff --git a/src/Interpreters/WindowDescription.cpp b/src/Interpreters/WindowDescription.cpp
index 32129072972..4661a148d70 100644
--- a/src/Interpreters/WindowDescription.cpp
+++ b/src/Interpreters/WindowDescription.cpp
@@ -51,7 +51,7 @@ std::string WindowFrame::toString() const
 
 void WindowFrame::toString(WriteBuffer & buf) const
 {
-    buf << toString(type) << " BETWEEN ";
+    buf << type << " BETWEEN ";
     if (begin_type == BoundaryType::Current)
     {
         buf << "CURRENT ROW";
@@ -101,9 +101,9 @@ void WindowFrame::checkValid() const
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Frame start offset for '{}' frame must be a nonnegative 32-bit integer, '{}' of type '{}' given",
-                toString(type),
+                type,
                 applyVisitor(FieldVisitorToString(), begin_offset),
-                Field::Types::toString(begin_offset.getType()));
+                begin_offset.getType());
         }
 
         if (end_type == BoundaryType::Offset
@@ -114,9 +114,9 @@ void WindowFrame::checkValid() const
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Frame end offset for '{}' frame must be a nonnegative 32-bit integer, '{}' of type '{}' given",
-                toString(type),
+                type,
                 applyVisitor(FieldVisitorToString(), end_offset),
-                Field::Types::toString(end_offset.getType()));
+                end_offset.getType());
         }
     }
 
diff --git a/src/Interpreters/WindowDescription.h b/src/Interpreters/WindowDescription.h
index 4cb478bae85..bb0130b4d4e 100644
--- a/src/Interpreters/WindowDescription.h
+++ b/src/Interpreters/WindowDescription.h
@@ -73,40 +73,6 @@ struct WindowFrame
             && other.end_preceding == end_preceding
             ;
     }
-
-    static std::string toString(FrameType type)
-    {
-        switch (type)
-        {
-            case FrameType::Rows:
-                return "ROWS";
-            case FrameType::Groups:
-                return "GROUPS";
-            case FrameType::Range:
-                return "RANGE";
-        }
-
-        // Somehow GCC 10 doesn't understand that the above switch is exhaustive.
-        assert(false);
-        return "<unknown frame>";
-    }
-
-    static std::string toString(BoundaryType type)
-    {
-        switch (type)
-        {
-            case BoundaryType::Unbounded:
-                return "UNBOUNDED";
-            case BoundaryType::Offset:
-                return "OFFSET";
-            case BoundaryType::Current:
-                return "CURRENT ROW";
-        }
-
-        // Somehow GCC 10 doesn't understand that the above switch is exhaustive.
-        assert(false);
-        return "<unknown frame boundary>";
-    }
 };
 
 struct WindowDescription
diff --git a/src/Interpreters/convertFieldToType.cpp b/src/Interpreters/convertFieldToType.cpp
index be0a10cf2e7..501ad51edad 100644
--- a/src/Interpreters/convertFieldToType.cpp
+++ b/src/Interpreters/convertFieldToType.cpp
@@ -75,8 +75,8 @@ static Field convertNumericType(const Field & from, const IDataType & type)
     if (from.getType() == Field::Types::Int256)
         return convertNumericTypeImpl<Int256, To>(from);
 
-    throw Exception("Type mismatch in IN or VALUES section. Expected: " + type.getName() + ". Got: "
-        + Field::Types::toString(from.getType()), ErrorCodes::TYPE_MISMATCH);
+    throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch in IN or VALUES section. Expected: {}. Got: {}",
+        type.getName(), from.getType());
 }
 
 
@@ -134,8 +134,8 @@ static Field convertDecimalType(const Field & from, const To & type)
     if (from.getType() == Field::Types::Decimal128)
         return convertDecimalToDecimalType<Decimal128>(from, type);
 
-    throw Exception("Type mismatch in IN or VALUES section. Expected: " + type.getName() + ". Got: "
-        + Field::Types::toString(from.getType()), ErrorCodes::TYPE_MISMATCH);
+    throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch in IN or VALUES section. Expected: {}. Got: {}",
+        type.getName(), from.getType());
 }
 
 
@@ -387,8 +387,8 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
         return convertFieldToType(parsed, type, from_type_hint);
     }
 
-    throw Exception("Type mismatch in IN or VALUES section. Expected: " + type.getName() + ". Got: "
-        + Field::Types::toString(src.getType()), ErrorCodes::TYPE_MISMATCH);
+    throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch in IN or VALUES section. Expected: {}. Got: {}",
+        type.getName(), src.getType());
 }
 
 }
diff --git a/src/Parsers/ASTSystemQuery.cpp b/src/Parsers/ASTSystemQuery.cpp
index 5d01e124b0e..219b52ca81f 100644
--- a/src/Parsers/ASTSystemQuery.cpp
+++ b/src/Parsers/ASTSystemQuery.cpp
@@ -13,101 +13,10 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-
-const char * ASTSystemQuery::typeToString(Type type)
-{
-    switch (type)
-    {
-        case Type::SHUTDOWN:
-            return "SHUTDOWN";
-        case Type::KILL:
-            return "KILL";
-        case Type::SUSPEND:
-            return "SUSPEND";
-        case Type::DROP_DNS_CACHE:
-            return "DROP DNS CACHE";
-        case Type::DROP_MARK_CACHE:
-            return "DROP MARK CACHE";
-        case Type::DROP_UNCOMPRESSED_CACHE:
-            return "DROP UNCOMPRESSED CACHE";
-        case Type::DROP_MMAP_CACHE:
-            return "DROP MMAP CACHE";
-#if USE_EMBEDDED_COMPILER
-        case Type::DROP_COMPILED_EXPRESSION_CACHE:
-            return "DROP COMPILED EXPRESSION CACHE";
-#endif
-        case Type::STOP_LISTEN_QUERIES:
-            return "STOP LISTEN QUERIES";
-        case Type::START_LISTEN_QUERIES:
-            return "START LISTEN QUERIES";
-        case Type::RESTART_REPLICAS:
-            return "RESTART REPLICAS";
-        case Type::RESTART_REPLICA:
-            return "RESTART REPLICA";
-        case Type::RESTORE_REPLICA:
-            return "RESTORE REPLICA";
-        case Type::DROP_REPLICA:
-            return "DROP REPLICA";
-        case Type::SYNC_REPLICA:
-            return "SYNC REPLICA";
-        case Type::FLUSH_DISTRIBUTED:
-            return "FLUSH DISTRIBUTED";
-        case Type::RELOAD_DICTIONARY:
-            return "RELOAD DICTIONARY";
-        case Type::RELOAD_DICTIONARIES:
-            return "RELOAD DICTIONARIES";
-        case Type::RELOAD_MODEL:
-            return "RELOAD MODEL";
-        case Type::RELOAD_MODELS:
-            return "RELOAD MODELS";
-        case Type::RELOAD_EMBEDDED_DICTIONARIES:
-            return "RELOAD EMBEDDED DICTIONARIES";
-        case Type::RELOAD_CONFIG:
-            return "RELOAD CONFIG";
-        case Type::RELOAD_SYMBOLS:
-            return "RELOAD SYMBOLS";
-        case Type::STOP_MERGES:
-            return "STOP MERGES";
-        case Type::START_MERGES:
-            return "START MERGES";
-        case Type::STOP_TTL_MERGES:
-            return "STOP TTL MERGES";
-        case Type::START_TTL_MERGES:
-            return "START TTL MERGES";
-        case Type::STOP_MOVES:
-            return "STOP MOVES";
-        case Type::START_MOVES:
-            return "START MOVES";
-        case Type::STOP_FETCHES:
-            return "STOP FETCHES";
-        case Type::START_FETCHES:
-            return "START FETCHES";
-        case Type::STOP_REPLICATED_SENDS:
-            return "STOP REPLICATED SENDS";
-        case Type::START_REPLICATED_SENDS:
-            return "START REPLICATED SENDS";
-        case Type::STOP_REPLICATION_QUEUES:
-            return "STOP REPLICATION QUEUES";
-        case Type::START_REPLICATION_QUEUES:
-            return "START REPLICATION QUEUES";
-        case Type::STOP_DISTRIBUTED_SENDS:
-            return "STOP DISTRIBUTED SENDS";
-        case Type::START_DISTRIBUTED_SENDS:
-            return "START DISTRIBUTED SENDS";
-        case Type::FLUSH_LOGS:
-            return "FLUSH LOGS";
-        case Type::RESTART_DISK:
-            return "RESTART DISK";
-        default:
-            throw Exception("Unknown SYSTEM query command", ErrorCodes::LOGICAL_ERROR);
-    }
-}
-
-
 void ASTSystemQuery::formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const
 {
     settings.ostr << (settings.hilite ? hilite_keyword : "") << "SYSTEM ";
-    settings.ostr << typeToString(type) << (settings.hilite ? hilite_none : "");
+    settings.ostr << type << (settings.hilite ? hilite_none : "");
 
     auto print_database_table = [&]
     {
diff --git a/src/Parsers/ASTSystemQuery.h b/src/Parsers/ASTSystemQuery.h
index fa7b6ece59a..a14537957d1 100644
--- a/src/Parsers/ASTSystemQuery.h
+++ b/src/Parsers/ASTSystemQuery.h
@@ -62,8 +62,6 @@ public:
         END
     };
 
-    static const char * typeToString(Type type);
-
     Type type = Type::UNKNOWN;
 
     String target_model;
diff --git a/src/Parsers/ASTWindowDefinition.cpp b/src/Parsers/ASTWindowDefinition.cpp
index 613dbcc392b..29e42de3ce0 100644
--- a/src/Parsers/ASTWindowDefinition.cpp
+++ b/src/Parsers/ASTWindowDefinition.cpp
@@ -98,7 +98,7 @@ void ASTWindowDefinition::formatImpl(const FormatSettings & settings,
             settings.ostr << " ";
         }
 
-        settings.ostr << WindowFrame::toString(frame_type) << " BETWEEN ";
+        settings.ostr << frame_type << " BETWEEN ";
         if (frame_begin_type == WindowFrame::BoundaryType::Current)
         {
             settings.ostr << "CURRENT ROW";
diff --git a/src/Parsers/CommonParsers.cpp b/src/Parsers/CommonParsers.cpp
index d7a9ed60ac3..db6a568a4b6 100644
--- a/src/Parsers/CommonParsers.cpp
+++ b/src/Parsers/CommonParsers.cpp
@@ -14,31 +14,18 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-
-ParserKeyword::ParserKeyword(const char * s_) : s(s_)
-{
-}
-
-
-const char * ParserKeyword::getName() const
-{
-    return s;
-}
-
-
 bool ParserKeyword::parseImpl(Pos & pos, ASTPtr & /*node*/, Expected & expected)
 {
     if (pos->type != TokenType::BareWord)
         return false;
 
-    const char * current_word = s;
+    const char * current_word = s.begin();
+    const char * s_end = s.end();
+    const size_t s_length = s.length();
 
-    size_t s_length = strlen(s);
     if (!s_length)
         throw Exception("Logical error: keyword cannot be empty string", ErrorCodes::LOGICAL_ERROR);
 
-    const char * s_end = s + s_length;
-
     while (true)
     {
         expected.add(pos, current_word);
diff --git a/src/Parsers/CommonParsers.h b/src/Parsers/CommonParsers.h
index 85b5217b617..b4f5cfd1a81 100644
--- a/src/Parsers/CommonParsers.h
+++ b/src/Parsers/CommonParsers.h
@@ -13,13 +13,13 @@ namespace DB
 class ParserKeyword : public IParserBase
 {
 private:
-    const char * s;
+    std::string_view s;
 
 public:
-    ParserKeyword(const char * s_);
+    constexpr ParserKeyword(std::string_view s_): s(s_) {}
 
 protected:
-    const char * getName() const override;
+    const char * getName() const override { return s.data(); }
 
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 };
diff --git a/src/Parsers/ParserSystemQuery.cpp b/src/Parsers/ParserSystemQuery.cpp
index 66bd39e0202..f20b69ec047 100644
--- a/src/Parsers/ParserSystemQuery.cpp
+++ b/src/Parsers/ParserSystemQuery.cpp
@@ -6,6 +6,8 @@
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/parseDatabaseAndTableName.h>
 
+#include <span>
+#include <common/EnumReflection.h>
 
 namespace ErrorCodes
 {
@@ -67,13 +69,14 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
     auto res = std::make_shared<ASTSystemQuery>();
 
     bool found = false;
-    for (int i = static_cast<int>(Type::UNKNOWN) + 1; i < static_cast<int>(Type::END); ++i)
+
+    for (const auto & [entry, str] : magic_enum::enum_entries<Type>())
     {
-        Type t = static_cast<Type>(i);
-        if (ParserKeyword{ASTSystemQuery::typeToString(t)}.ignore(pos, expected))
+        if (ParserKeyword(UnderscoreToSpace(str)).ignore(pos, expected))
         {
-            res->type = t;
+            res->type = entry;
             found = true;
+            break;
         }
     }
 
diff --git a/src/Processors/Transforms/WindowTransform.cpp b/src/Processors/Transforms/WindowTransform.cpp
index 132bdb7b327..f18ec7dbdfb 100644
--- a/src/Processors/Transforms/WindowTransform.cpp
+++ b/src/Processors/Transforms/WindowTransform.cpp
@@ -617,8 +617,8 @@ void WindowTransform::advanceFrameStart()
                 default:
                     throw Exception(ErrorCodes::NOT_IMPLEMENTED,
                         "Frame start type '{}' for frame '{}' is not implemented",
-                        WindowFrame::toString(window_description.frame.begin_type),
-                        WindowFrame::toString(window_description.frame.type));
+                        window_description.frame.begin_type,
+                        window_description.frame.type);
             }
             break;
     }
@@ -849,7 +849,7 @@ void WindowTransform::advanceFrameEnd()
                 default:
                     throw Exception(ErrorCodes::NOT_IMPLEMENTED,
                         "The frame end type '{}' is not implemented",
-                        WindowFrame::toString(window_description.frame.end_type));
+                        window_description.frame.end_type);
             }
             break;
     }
diff --git a/src/Storages/AlterCommands.cpp b/src/Storages/AlterCommands.cpp
index 7388f44fee1..1d39a36f2c8 100644
--- a/src/Storages/AlterCommands.cpp
+++ b/src/Storages/AlterCommands.cpp
@@ -842,53 +842,6 @@ std::optional<MutationCommand> AlterCommand::tryConvertToMutationCommand(Storage
     return result;
 }
 
-
-String alterTypeToString(const AlterCommand::Type type)
-{
-    switch (type)
-    {
-    case AlterCommand::Type::ADD_COLUMN:
-        return "ADD COLUMN";
-    case AlterCommand::Type::ADD_CONSTRAINT:
-        return "ADD CONSTRAINT";
-    case AlterCommand::Type::ADD_INDEX:
-        return "ADD INDEX";
-    case AlterCommand::Type::ADD_PROJECTION:
-        return "ADD PROJECTION";
-    case AlterCommand::Type::COMMENT_COLUMN:
-        return "COMMENT COLUMN";
-    case AlterCommand::Type::DROP_COLUMN:
-        return "DROP COLUMN";
-    case AlterCommand::Type::DROP_CONSTRAINT:
-        return "DROP CONSTRAINT";
-    case AlterCommand::Type::DROP_INDEX:
-        return "DROP INDEX";
-    case AlterCommand::Type::DROP_PROJECTION:
-        return "DROP PROJECTION";
-    case AlterCommand::Type::MODIFY_COLUMN:
-        return "MODIFY COLUMN";
-    case AlterCommand::Type::MODIFY_ORDER_BY:
-        return "MODIFY ORDER BY";
-    case AlterCommand::Type::MODIFY_SAMPLE_BY:
-        return "MODIFY SAMPLE BY";
-    case AlterCommand::Type::MODIFY_TTL:
-        return "MODIFY TTL";
-    case AlterCommand::Type::MODIFY_SETTING:
-        return "MODIFY SETTING";
-    case AlterCommand::Type::RESET_SETTING:
-        return "RESET SETTING";
-    case AlterCommand::Type::MODIFY_QUERY:
-        return "MODIFY QUERY";
-    case AlterCommand::Type::RENAME_COLUMN:
-        return "RENAME COLUMN";
-    case AlterCommand::Type::REMOVE_TTL:
-        return "REMOVE TTL";
-    default:
-        throw Exception("Uninitialized ALTER command", ErrorCodes::LOGICAL_ERROR);
-    }
-
-}
-
 void AlterCommands::apply(StorageInMemoryMetadata & metadata, ContextPtr context) const
 {
     if (!prepared)
diff --git a/src/Storages/AlterCommands.h b/src/Storages/AlterCommands.h
index 60f4ad7d552..96ed34ee416 100644
--- a/src/Storages/AlterCommands.h
+++ b/src/Storages/AlterCommands.h
@@ -168,9 +168,6 @@ struct AlterCommand
     std::optional<MutationCommand> tryConvertToMutationCommand(StorageInMemoryMetadata & metadata, ContextPtr context) const;
 };
 
-/// Return string representation of AlterCommand::Type
-String alterTypeToString(const AlterCommand::Type type);
-
 class Context;
 
 /// Vector of AlterCommand with several additional functions
diff --git a/src/Storages/IStorage.cpp b/src/Storages/IStorage.cpp
index d3636e6c756..8c3341a4ab2 100644
--- a/src/Storages/IStorage.cpp
+++ b/src/Storages/IStorage.cpp
@@ -140,9 +140,8 @@ void IStorage::checkAlterIsPossible(const AlterCommands & commands, ContextPtr /
     for (const auto & command : commands)
     {
         if (!command.isCommentAlter())
-            throw Exception(
-                "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
-                ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                command.type, getName());
     }
 }
 
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.cpp b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
index 47efec3c7ec..6d679a08c4d 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
@@ -480,39 +480,16 @@ UInt64 IMergeTreeDataPart::getIndexSizeInAllocatedBytes() const
     return res;
 }
 
-String IMergeTreeDataPart::stateToString(IMergeTreeDataPart::State state)
-{
-    switch (state)
-    {
-        case State::Temporary:
-            return "Temporary";
-        case State::PreCommitted:
-            return "PreCommitted";
-        case State::Committed:
-            return "Committed";
-        case State::Outdated:
-            return "Outdated";
-        case State::Deleting:
-            return "Deleting";
-        case State::DeleteOnDestroy:
-            return "DeleteOnDestroy";
-    }
-
-    __builtin_unreachable();
-}
-
-String IMergeTreeDataPart::stateString() const
-{
-    return stateToString(state);
-}
-
 void IMergeTreeDataPart::assertState(const std::initializer_list<IMergeTreeDataPart::State> & affordable_states) const
 {
     if (!checkState(affordable_states))
     {
         String states_str;
         for (auto affordable_state : affordable_states)
-            states_str += stateToString(affordable_state) + " ";
+        {
+            states_str += stateString(affordable_state);
+            states_str += ' ';
+        }
 
         throw Exception("Unexpected state of part " + getNameWithState() + ". Expected: " + states_str, ErrorCodes::NOT_FOUND_EXPECTED_DATA_PART);
     }
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.h b/src/Storages/MergeTree/IMergeTreeDataPart.h
index f4493adf0b6..aabd1337cd1 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.h
@@ -16,7 +16,6 @@
 
 #include <shared_mutex>
 
-
 namespace zkutil
 {
     class ZooKeeper;
@@ -221,12 +220,6 @@ public:
         DeleteOnDestroy, /// part was moved to another disk and should be deleted in own destructor
     };
 
-    static constexpr auto all_part_states =
-    {
-        State::Temporary, State::PreCommitted, State::Committed, State::Outdated, State::Deleting,
-        State::DeleteOnDestroy
-    };
-
     using TTLInfo = MergeTreeDataPartTTLInfo;
     using TTLInfos = MergeTreeDataPartTTLInfos;
 
@@ -236,14 +229,10 @@ public:
     void setState(State new_state) const;
     State getState() const;
 
-    /// Returns name of state
-    static String stateToString(State state);
-    String stateString() const;
+    static constexpr std::string_view stateString(State state) { return magic_enum::enum_name(state); }
+    constexpr std::string_view stateString() const { return stateString(state); }
 
-    String getNameWithState() const
-    {
-        return name + " (state " + stateString() + ")";
-    }
+    String getNameWithState() const { return fmt::format("{} (state {})", name, stateString()); }
 
     /// Returns true if state of part is one of affordable_states
     bool checkState(const std::initializer_list<State> & affordable_states) const
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index 734a67da758..0dd4e3e6c32 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -163,7 +163,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
     LOG_DEBUG(
         log,
         "Choose {} projection {}",
-        ProjectionDescription::typeToString(query_info.projection->desc->type),
+        query_info.projection->desc->type,
         query_info.projection->desc->name);
 
     Pipes pipes;
diff --git a/src/Storages/ProjectionsDescription.cpp b/src/Storages/ProjectionsDescription.cpp
index 2d40ddfc99d..d1b72d71b83 100644
--- a/src/Storages/ProjectionsDescription.cpp
+++ b/src/Storages/ProjectionsDescription.cpp
@@ -27,20 +27,6 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 };
 
-const char * ProjectionDescription::typeToString(Type type)
-{
-    switch (type)
-    {
-        case Type::Normal:
-            return "normal";
-        case Type::Aggregate:
-            return "aggregate";
-    }
-
-    __builtin_unreachable();
-}
-
-
 bool ProjectionDescription::isPrimaryKeyColumnPossiblyWrappedInFunctions(const ASTPtr & node) const
 {
     const String column_name = node->getColumnName();
diff --git a/src/Storages/ProjectionsDescription.h b/src/Storages/ProjectionsDescription.h
index e35fbd72f22..5c4db25feaa 100644
--- a/src/Storages/ProjectionsDescription.h
+++ b/src/Storages/ProjectionsDescription.h
@@ -30,8 +30,6 @@ struct ProjectionDescription
 
     static constexpr const char * MINMAX_COUNT_PROJECTION_NAME = "_minmax_count_projection";
 
-    static const char * typeToString(Type type);
-
     /// Definition AST of projection
     ASTPtr definition_ast;
 
diff --git a/src/Storages/StorageBuffer.cpp b/src/Storages/StorageBuffer.cpp
index e9136bb5d05..89f0573cd42 100644
--- a/src/Storages/StorageBuffer.cpp
+++ b/src/Storages/StorageBuffer.cpp
@@ -1021,11 +1021,13 @@ void StorageBuffer::checkAlterIsPossible(const AlterCommands & commands, Context
     auto name_deps = getDependentViewsByColumn(local_context);
     for (const auto & command : commands)
     {
-        if (command.type != AlterCommand::Type::ADD_COLUMN && command.type != AlterCommand::Type::MODIFY_COLUMN
-            && command.type != AlterCommand::Type::DROP_COLUMN && command.type != AlterCommand::Type::COMMENT_COLUMN)
-            throw Exception(
-                "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
-                ErrorCodes::NOT_IMPLEMENTED);
+        if (command.type != AlterCommand::Type::ADD_COLUMN
+            && command.type != AlterCommand::Type::MODIFY_COLUMN
+            && command.type != AlterCommand::Type::DROP_COLUMN
+            && command.type != AlterCommand::Type::COMMENT_COLUMN)
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                command.type, getName());
+
         if (command.type == AlterCommand::Type::DROP_COLUMN && !command.clear)
         {
             const auto & deps_mv = name_deps[command.column_name];
diff --git a/src/Storages/StorageDistributed.cpp b/src/Storages/StorageDistributed.cpp
index df7d568deb9..c87ba3408de 100644
--- a/src/Storages/StorageDistributed.cpp
+++ b/src/Storages/StorageDistributed.cpp
@@ -785,8 +785,9 @@ void StorageDistributed::checkAlterIsPossible(const AlterCommands & commands, Co
             && command.type != AlterCommand::Type::COMMENT_COLUMN
             && command.type != AlterCommand::Type::RENAME_COLUMN)
 
-            throw Exception("Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
-                ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                command.type, getName());
+
         if (command.type == AlterCommand::DROP_COLUMN && !command.clear)
         {
             const auto & deps_mv = name_deps[command.column_name];
diff --git a/src/Storages/StorageMaterializedView.cpp b/src/Storages/StorageMaterializedView.cpp
index f72f6fee180..907e06fb4f6 100644
--- a/src/Storages/StorageMaterializedView.cpp
+++ b/src/Storages/StorageMaterializedView.cpp
@@ -308,9 +308,8 @@ void StorageMaterializedView::checkAlterIsPossible(const AlterCommands & command
         for (const auto & command : commands)
         {
             if (!command.isCommentAlter() && command.type != AlterCommand::MODIFY_QUERY)
-                throw Exception(
-                    "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
-                    ErrorCodes::NOT_IMPLEMENTED);
+                throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                    command.type, getName());
         }
     }
     else
@@ -318,9 +317,8 @@ void StorageMaterializedView::checkAlterIsPossible(const AlterCommands & command
         for (const auto & command : commands)
         {
             if (!command.isCommentAlter())
-                throw Exception(
-                    "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
-                    ErrorCodes::NOT_IMPLEMENTED);
+                throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                    command.type, getName());
         }
     }
 }
diff --git a/src/Storages/StorageMerge.cpp b/src/Storages/StorageMerge.cpp
index d537ef05cdb..c1066329e6f 100644
--- a/src/Storages/StorageMerge.cpp
+++ b/src/Storages/StorageMerge.cpp
@@ -625,11 +625,13 @@ void StorageMerge::checkAlterIsPossible(const AlterCommands & commands, ContextP
     auto name_deps = getDependentViewsByColumn(local_context);
     for (const auto & command : commands)
     {
-        if (command.type != AlterCommand::Type::ADD_COLUMN && command.type != AlterCommand::Type::MODIFY_COLUMN
-            && command.type != AlterCommand::Type::DROP_COLUMN && command.type != AlterCommand::Type::COMMENT_COLUMN)
-            throw Exception(
-                "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
-                ErrorCodes::NOT_IMPLEMENTED);
+        if (command.type != AlterCommand::Type::ADD_COLUMN
+            && command.type != AlterCommand::Type::MODIFY_COLUMN
+            && command.type != AlterCommand::Type::DROP_COLUMN
+            && command.type != AlterCommand::Type::COMMENT_COLUMN)
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                command.type, getName());
+
         if (command.type == AlterCommand::Type::DROP_COLUMN && !command.clear)
         {
             const auto & deps_mv = name_deps[command.column_name];
diff --git a/src/Storages/StorageNull.cpp b/src/Storages/StorageNull.cpp
index 85f0daf3fa8..41422c82aed 100644
--- a/src/Storages/StorageNull.cpp
+++ b/src/Storages/StorageNull.cpp
@@ -41,11 +41,13 @@ void StorageNull::checkAlterIsPossible(const AlterCommands & commands, ContextPt
     auto name_deps = getDependentViewsByColumn(context);
     for (const auto & command : commands)
     {
-        if (command.type != AlterCommand::Type::ADD_COLUMN && command.type != AlterCommand::Type::MODIFY_COLUMN
-            && command.type != AlterCommand::Type::DROP_COLUMN && command.type != AlterCommand::Type::COMMENT_COLUMN)
-            throw Exception(
-                "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
-                ErrorCodes::NOT_IMPLEMENTED);
+        if (command.type != AlterCommand::Type::ADD_COLUMN 
+            && command.type != AlterCommand::Type::MODIFY_COLUMN
+            && command.type != AlterCommand::Type::DROP_COLUMN 
+            && command.type != AlterCommand::Type::COMMENT_COLUMN)
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                command.type, getName());
+
         if (command.type == AlterCommand::DROP_COLUMN && !command.clear)
         {
             const auto & deps_mv = name_deps[command.column_name];
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index dcb1913f8b7..418f3796520 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -5098,7 +5098,7 @@ void StorageReplicatedMergeTree::restoreMetadataInZooKeeper()
 
     auto metadata_snapshot = getInMemoryMetadataPtr();
 
-    const DataPartsVector all_parts = getDataPartsVector(IMergeTreeDataPart::all_part_states);
+    const DataPartsVector all_parts = getAllDataPartsVector();
     Strings active_parts_names;
 
     /// Why all parts (not only Committed) are moved to detached/:
diff --git a/src/Storages/System/StorageSystemParts.cpp b/src/Storages/System/StorageSystemParts.cpp
index dba05d44969..e79978463dd 100644
--- a/src/Storages/System/StorageSystemParts.cpp
+++ b/src/Storages/System/StorageSystemParts.cpp
@@ -265,7 +265,7 @@ void StorageSystemParts::processNextStorage(
         /// _state column should be the latest.
         /// Do not use part->getState*, it can be changed from different thread
         if (has_state_column)
-            columns[res_index++]->insert(IMergeTreeDataPart::stateToString(part_state));
+            columns[res_index++]->insert(IMergeTreeDataPart::stateString(part_state));
     }
 }
 
diff --git a/src/Storages/System/StorageSystemProjectionParts.cpp b/src/Storages/System/StorageSystemProjectionParts.cpp
index 7ae8a91ad60..378437bd4ec 100644
--- a/src/Storages/System/StorageSystemProjectionParts.cpp
+++ b/src/Storages/System/StorageSystemProjectionParts.cpp
@@ -282,7 +282,7 @@ void StorageSystemProjectionParts::processNextStorage(
         /// _state column should be the latest.
         /// Do not use part->getState*, it can be changed from different thread
         if (has_state_column)
-            columns[res_index++]->insert(IMergeTreeDataPart::stateToString(part_state));
+            columns[res_index++]->insert(IMergeTreeDataPart::stateString(part_state));
     }
 }
 
diff --git a/src/Storages/System/StorageSystemStoragePolicies.cpp b/src/Storages/System/StorageSystemStoragePolicies.cpp
index 48dfadd2b3c..26caed55961 100644
--- a/src/Storages/System/StorageSystemStoragePolicies.cpp
+++ b/src/Storages/System/StorageSystemStoragePolicies.cpp
@@ -6,6 +6,7 @@
 #include <DataTypes/DataTypeNullable.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <Interpreters/Context.h>
+#include <common/EnumReflection.h>
 
 
 namespace DB
@@ -68,7 +69,7 @@ Pipe StorageSystemStoragePolicies::read(
             for (const auto & disk_ptr : volumes[i]->getDisks())
                 disks.push_back(disk_ptr->getName());
             col_disks->insert(disks);
-            col_volume_type->insert(volumeTypeToString(volumes[i]->getType()));
+            col_volume_type->insert(magic_enum::enum_name(volumes[i]->getType()));
             col_max_part_size->insert(volumes[i]->max_data_part_size);
             col_move_factor->insert(policy_ptr->getMoveFactor());
             col_prefer_not_to_merge->insert(volumes[i]->areMergesAvoided() ? 1 : 0);

From fe3e786cf2ddea6f5e16b969aacf816671de3fac Mon Sep 17 00:00:00 2001
From: zhangxiao871 <zhangxiao871@jd.com>
Date: Tue, 7 Sep 2021 01:20:12 +0800
Subject: [PATCH 083/273] add bitShiftLeft for FixedString and String integer.

---
 src/Functions/bitShiftLeft.cpp                | 114 +++++-
 src/Functions/bitShiftRight.cpp               |  12 +-
 ...it_shift_left_for_string_integer.reference | 339 ++++++++++++++++++
 ...2017_bit_shift_left_for_string_integer.sql | 134 +++++++
 4 files changed, 593 insertions(+), 6 deletions(-)
 create mode 100644 tests/queries/0_stateless/02017_bit_shift_left_for_string_integer.reference
 create mode 100644 tests/queries/0_stateless/02017_bit_shift_left_for_string_integer.sql

diff --git a/src/Functions/bitShiftLeft.cpp b/src/Functions/bitShiftLeft.cpp
index 18a43ae120c..60e61753d53 100644
--- a/src/Functions/bitShiftLeft.cpp
+++ b/src/Functions/bitShiftLeft.cpp
@@ -17,7 +17,7 @@ struct BitShiftLeftImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
-    static const constexpr bool allow_string_integer = false;
+    static const constexpr bool allow_string_integer = true;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a [[maybe_unused]], B b [[maybe_unused]])
@@ -30,6 +30,118 @@ struct BitShiftLeftImpl
             return static_cast<Result>(a) << static_cast<Result>(b);
     }
 
+    /// For String
+    static ALWAYS_INLINE NO_SANITIZE_UNDEFINED void apply(const UInt8 * pos [[maybe_unused]], const UInt8 * end [[maybe_unused]], const B & b [[maybe_unused]], ColumnString::Chars & out_vec, ColumnString::Offsets & out_offsets)
+    {
+        if constexpr (is_big_int_v<B>)
+            throw Exception("BitShiftLeft is not implemented for big integers as second argument", ErrorCodes::NOT_IMPLEMENTED);
+        else
+        {
+            UInt8 word_size = 8;
+            /// To prevent overflow
+            if (static_cast<double>(b) >= (static_cast<double>(end - pos) * word_size) || b < 0)
+            {
+                // insert default value
+                out_vec.push_back(0);
+                out_offsets.push_back(out_offsets.back() + 1);
+                return;
+            }
+
+            size_t shift_left_bits = b % word_size;
+            size_t shift_left_bytes = b / word_size;
+
+            const UInt8 * begin = pos;
+
+            const size_t old_size = out_vec.size();
+            size_t length;
+            if (shift_left_bits)
+                length = end + shift_left_bytes - begin + 1; /// Moving to the left here will make a redundant byte to store the overflowing bits in the front
+            else
+                length = end + shift_left_bytes - begin;
+
+            const size_t new_size = old_size + length + 1;
+            out_vec.resize(new_size);
+            out_vec[old_size + length] = 0;
+
+            UInt8 * op_pointer = const_cast<UInt8 *>(begin);
+            UInt8 * out = out_vec.data() + old_size;
+
+            UInt8 previous = 0;
+            while (op_pointer < end)
+            {
+                if (shift_left_bits)
+                {
+                    /// The left b bit of the right byte is moved to the right b bit of this byte
+                    *out = UInt8(UInt8(*(op_pointer) >> (8 - shift_left_bits)) | previous);
+                    previous = *op_pointer << shift_left_bits;
+                }
+                else
+                {
+                    *out = *op_pointer;
+                }
+                op_pointer++;
+                out++;
+            }
+            if (shift_left_bits)
+            {
+                *out = *(op_pointer - 1) << shift_left_bits;
+                out++;
+            }
+
+            for (size_t i = 0; i < shift_left_bytes; ++i)
+                *(out + i) = 0;
+
+            out_offsets.push_back(new_size);
+        }
+    }
+
+    /// For FixedString
+    static ALWAYS_INLINE NO_SANITIZE_UNDEFINED void apply(const UInt8 * pos [[maybe_unused]], const UInt8 * end [[maybe_unused]], const B & b [[maybe_unused]], ColumnFixedString::Chars & out_vec)
+    {
+        if constexpr (is_big_int_v<B>)
+            throw Exception("BitShiftLeft is not implemented for big integers as second argument", ErrorCodes::NOT_IMPLEMENTED);
+        else
+        {
+            UInt8 word_size = 8;
+            size_t n = end - pos;
+            /// To prevent overflow
+            if (static_cast<double>(b) >= (static_cast<double>(n) * word_size) || b < 0)
+            {
+                // insert default value
+                out_vec.resize_fill(out_vec.size() + n);
+                return;
+            }
+
+            size_t shift_left_bytes = b / word_size;
+            size_t shift_left_bits = b % word_size;
+
+            const UInt8 * begin = pos;
+
+            const size_t old_size = out_vec.size();
+            const size_t new_size = old_size + n;
+
+            out_vec.resize(new_size);
+
+            UInt8 * op_pointer = const_cast<UInt8 *>(begin + shift_left_bytes);
+            UInt8 * out = out_vec.data() + old_size;
+
+            while (op_pointer < end)
+            {
+                *out = *op_pointer << shift_left_bits;
+                if (op_pointer + 1 < end)
+                {
+                    /// The left b bit of the right byte is moved to the right b bit of this byte
+                    *out = UInt8(UInt8(*(op_pointer + 1) >> (8 - shift_left_bits)) | *out);
+                }
+                op_pointer++;
+                out++;
+            }
+
+            for (size_t i = 0; i < shift_left_bytes; ++i)
+                *(out + i) = 0;
+        }
+    }
+
 #if USE_EMBEDDED_COMPILER
     static constexpr bool compilable = true;
 
diff --git a/src/Functions/bitShiftRight.cpp b/src/Functions/bitShiftRight.cpp
index fe39344b7b7..f3e16e4ed62 100644
--- a/src/Functions/bitShiftRight.cpp
+++ b/src/Functions/bitShiftRight.cpp
@@ -31,7 +31,7 @@ struct BitShiftRightImpl
             return static_cast<Result>(a) >> static_cast<Result>(b);
     }
 
-    static inline NO_SANITIZE_UNDEFINED void bitShiftRightForBytes(UInt8 * op_pointer, const UInt8 * begin, UInt8 * out, const size_t shift_right_bits)
+    static inline NO_SANITIZE_UNDEFINED void bitShiftRightForBytes(const UInt8 * op_pointer, const UInt8 * begin, UInt8 * out, const size_t shift_right_bits)
     {
         while (op_pointer > begin)
         {
@@ -40,7 +40,7 @@ struct BitShiftRightImpl
             *out = *op_pointer >> shift_right_bits;
             if (op_pointer - 1 >= begin)
             {
-                /// The right 8-b bit of the left byte is moved to the left 8-b bit of this byte
+                /// The right b bit of the left byte is moved to the left b bit of this byte
                 *out = UInt8(UInt8(*(op_pointer - 1) << (8 - shift_right_bits)) | *out);
             }
         }
@@ -54,9 +54,10 @@ struct BitShiftRightImpl
         else
         {
             UInt8 word_size = 8;
-            if (b >= static_cast<B>((end - pos) * word_size) || b < 0)
+            /// To prevent overflow
+            if (static_cast<double>(b) >= (static_cast<double>(end - pos) * word_size) || b < 0)
             {
-                // insert default value
+                /// insert default value
                 out_vec.push_back(0);
                 out_offsets.push_back(out_offsets.back() + 1);
                 return;
@@ -91,7 +92,8 @@ struct BitShiftRightImpl
         {
             UInt8 word_size = 8;
             size_t n = end - pos;
-            if (b >= static_cast<B>(n * word_size) || b < 0)
+            /// To prevent overflow
+            if (static_cast<double>(b) >= (static_cast<double>(n) * word_size) || b < 0)
             {
                 // insert default value
                 out_vec.resize_fill(out_vec.size() + n);
diff --git a/tests/queries/0_stateless/02017_bit_shift_left_for_string_integer.reference b/tests/queries/0_stateless/02017_bit_shift_left_for_string_integer.reference
new file mode 100644
index 00000000000..ff5a09c0d48
--- /dev/null
+++ b/tests/queries/0_stateless/02017_bit_shift_left_for_string_integer.reference
@@ -0,0 +1,339 @@
+String ConstConst
+1
+0	Hello	0100100001100101011011000110110001101111
+1	Hello	000000001001000011001010110110001101100011011110
+2	Hello	000000010010000110010101101100011011000110111100
+3	Hello	000000100100001100101011011000110110001101111000
+4	Hello	000001001000011001010110110001101100011011110000
+5	Hello	000010010000110010101101100011011000110111100000
+6	Hello	000100100001100101011011000110110001101111000000
+7	Hello	001001000011001010110110001101100011011110000000
+8	Hello	010010000110010101101100011011000110111100000000
+9	Hello	00000000100100001100101011011000110110001101111000000000
+10	Hello	00000001001000011001010110110001101100011011110000000000
+11	Hello	00000010010000110010101101100011011000110111100000000000
+12	Hello	00000100100001100101011011000110110001101111000000000000
+13	Hello	00001001000011001010110110001101100011011110000000000000
+14	Hello	00010010000110010101101100011011000110111100000000000000
+15	Hello	00100100001100101011011000110110001101111000000000000000
+16	Hello	01001000011001010110110001101100011011110000000000000000
+17	Hello	0000000010010000110010101101100011011000110111100000000000000000
+18	Hello	0000000100100001100101011011000110110001101111000000000000000000
+19	Hello	0000001001000011001010110110001101100011011110000000000000000000
+20	Hello	0000010010000110010101101100011011000110111100000000000000000000
+21	Hello	0000100100001100101011011000110110001101111000000000000000000000
+22	Hello	0001001000011001010110110001101100011011110000000000000000000000
+23	Hello	0010010000110010101101100011011000110111100000000000000000000000
+24	Hello	0100100001100101011011000110110001101111000000000000000000000000
+25	Hello	000000001001000011001010110110001101100011011110000000000000000000000000
+26	Hello	000000010010000110010101101100011011000110111100000000000000000000000000
+27	Hello	000000100100001100101011011000110110001101111000000000000000000000000000
+28	Hello	000001001000011001010110110001101100011011110000000000000000000000000000
+29	Hello	000010010000110010101101100011011000110111100000000000000000000000000000
+30	Hello	000100100001100101011011000110110001101111000000000000000000000000000000
+31	Hello	001001000011001010110110001101100011011110000000000000000000000000000000
+32	Hello	010010000110010101101100011011000110111100000000000000000000000000000000
+33	Hello	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+34	Hello	00000001001000011001010110110001101100011011110000000000000000000000000000000000
+35	Hello	00000010010000110010101101100011011000110111100000000000000000000000000000000000
+36	Hello	00000100100001100101011011000110110001101111000000000000000000000000000000000000
+37	Hello	00001001000011001010110110001101100011011110000000000000000000000000000000000000
+38	Hello	00010010000110010101101100011011000110111100000000000000000000000000000000000000
+39	Hello	00100100001100101011011000110110001101111000000000000000000000000000000000000000
+40	Hello	
+41	Hello	
+42	Hello	
+FixedString ConstConst
+1
+0	Hello\0\0\0\0\0	01001000011001010110110001101100011011110000000000000000000000000000000000000000
+1	Hello\0\0\0\0\0	10010000110010101101100011011000110111100000000000000000000000000000000000000000
+2	Hello\0\0\0\0\0	00100001100101011011000110110001101111000000000000000000000000000000000000000000
+3	Hello\0\0\0\0\0	01000011001010110110001101100011011110000000000000000000000000000000000000000000
+4	Hello\0\0\0\0\0	10000110010101101100011011000110111100000000000000000000000000000000000000000000
+5	Hello\0\0\0\0\0	00001100101011011000110110001101111000000000000000000000000000000000000000000000
+6	Hello\0\0\0\0\0	00011001010110110001101100011011110000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+9	Hello\0\0\0\0\0	11001010110110001101100011011110000000000000000000000000000000000000000000000000
+10	Hello\0\0\0\0\0	10010101101100011011000110111100000000000000000000000000000000000000000000000000
+11	Hello\0\0\0\0\0	00101011011000110110001101111000000000000000000000000000000000000000000000000000
+12	Hello\0\0\0\0\0	01010110110001101100011011110000000000000000000000000000000000000000000000000000
+13	Hello\0\0\0\0\0	10101101100011011000110111100000000000000000000000000000000000000000000000000000
+14	Hello\0\0\0\0\0	01011011000110110001101111000000000000000000000000000000000000000000000000000000
+15	Hello\0\0\0\0\0	10110110001101100011011110000000000000000000000000000000000000000000000000000000
+16	Hello\0\0\0\0\0	01101100011011000110111100000000000000000000000000000000000000000000000000000000
+17	Hello\0\0\0\0\0	11011000110110001101111000000000000000000000000000000000000000000000000000000000
+18	Hello\0\0\0\0\0	10110001101100011011110000000000000000000000000000000000000000000000000000000000
+19	Hello\0\0\0\0\0	01100011011000110111100000000000000000000000000000000000000000000000000000000000
+20	Hello\0\0\0\0\0	11000110110001101111000000000000000000000000000000000000000000000000000000000000
+21	Hello\0\0\0\0\0	10001101100011011110000000000000000000000000000000000000000000000000000000000000
+22	Hello\0\0\0\0\0	00011011000110111100000000000000000000000000000000000000000000000000000000000000
+23	Hello\0\0\0\0\0	00110110001101111000000000000000000000000000000000000000000000000000000000000000
+24	Hello\0\0\0\0\0	01101100011011110000000000000000000000000000000000000000000000000000000000000000
+25	Hello\0\0\0\0\0	11011000110111100000000000000000000000000000000000000000000000000000000000000000
+26	Hello\0\0\0\0\0	10110001101111000000000000000000000000000000000000000000000000000000000000000000
+27	Hello\0\0\0\0\0	01100011011110000000000000000000000000000000000000000000000000000000000000000000
+28	Hello\0\0\0\0\0	11000110111100000000000000000000000000000000000000000000000000000000000000000000
+29	Hello\0\0\0\0\0	10001101111000000000000000000000000000000000000000000000000000000000000000000000
+30	Hello\0\0\0\0\0	00011011110000000000000000000000000000000000000000000000000000000000000000000000
+31	Hello\0\0\0\0\0	00110111100000000000000000000000000000000000000000000000000000000000000000000000
+32	Hello\0\0\0\0\0	01101111000000000000000000000000000000000000000000000000000000000000000000000000
+33	Hello\0\0\0\0\0	11011110000000000000000000000000000000000000000000000000000000000000000000000000
+34	Hello\0\0\0\0\0	10111100000000000000000000000000000000000000000000000000000000000000000000000000
+35	Hello\0\0\0\0\0	01111000000000000000000000000000000000000000000000000000000000000000000000000000
+36	Hello\0\0\0\0\0	11110000000000000000000000000000000000000000000000000000000000000000000000000000
+37	Hello\0\0\0\0\0	11100000000000000000000000000000000000000000000000000000000000000000000000000000
+38	Hello\0\0\0\0\0	11000000000000000000000000000000000000000000000000000000000000000000000000000000
+39	Hello\0\0\0\0\0	10000000000000000000000000000000000000000000000000000000000000000000000000000000
+40	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+41	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+42	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+77	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+78	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+79	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+80	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+81	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+
+String VectorVector
+-1	Hello	
+0	Hello	0100100001100101011011000110110001101111
+1	Hello	000000001001000011001010110110001101100011011110
+7	Hello	001001000011001010110110001101100011011110000000
+8	Hello	010010000110010101101100011011000110111100000000
+9	Hello	00000000100100001100101011011000110110001101111000000000
+15	Hello	00100100001100101011011000110110001101111000000000000000
+16	Hello	01001000011001010110110001101100011011110000000000000000
+17	Hello	0000000010010000110010101101100011011000110111100000000000000000
+23	Hello	0010010000110010101101100011011000110111100000000000000000000000
+24	Hello	0100100001100101011011000110110001101111000000000000000000000000
+25	Hello	000000001001000011001010110110001101100011011110000000000000000000000000
+31	Hello	001001000011001010110110001101100011011110000000000000000000000000000000
+32	Hello	010010000110010101101100011011000110111100000000000000000000000000000000
+33	Hello	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+39	Hello	00100100001100101011011000110110001101111000000000000000000000000000000000000000
+40	Hello	
+41	Hello	
+42	Hello	
+7	Hel	00100100001100101011011000000000
+8	Hel	01001000011001010110110000000000
+9	Hel	0000000010010000110010101101100000000000
+23	Hello	0010010000110010101101100011011000110111100000000000000000000000
+24	Hello	0100100001100101011011000110110001101111000000000000000000000000
+25	Hello	000000001001000011001010110110001101100011011110000000000000000000000000
+7	Hel	00100100001100101011011000000000
+8	Hel	01001000011001010110110000000000
+9	Hel	0000000010010000110010101101100000000000
+
+FixedString VectorVector
+-1	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+0	Hello\0\0\0\0\0	01001000011001010110110001101100011011110000000000000000000000000000000000000000
+1	Hello\0\0\0\0\0	10010000110010101101100011011000110111100000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+9	Hello\0\0\0\0\0	11001010110110001101100011011110000000000000000000000000000000000000000000000000
+15	Hello\0\0\0\0\0	10110110001101100011011110000000000000000000000000000000000000000000000000000000
+16	Hello\0\0\0\0\0	01101100011011000110111100000000000000000000000000000000000000000000000000000000
+17	Hello\0\0\0\0\0	11011000110110001101111000000000000000000000000000000000000000000000000000000000
+23	Hello\0\0\0\0\0	00110110001101111000000000000000000000000000000000000000000000000000000000000000
+24	Hello\0\0\0\0\0	01101100011011110000000000000000000000000000000000000000000000000000000000000000
+25	Hello\0\0\0\0\0	11011000110111100000000000000000000000000000000000000000000000000000000000000000
+31	Hello\0\0\0\0\0	00110111100000000000000000000000000000000000000000000000000000000000000000000000
+32	Hello\0\0\0\0\0	01101111000000000000000000000000000000000000000000000000000000000000000000000000
+33	Hello\0\0\0\0\0	11011110000000000000000000000000000000000000000000000000000000000000000000000000
+39	Hello\0\0\0\0\0	10000000000000000000000000000000000000000000000000000000000000000000000000000000
+40	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+41	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+42	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00110010101101100000000000000000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	01100101011011000000000000000000000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	11001010110110000000000000000000000000000000000000000000000000000000000000000000
+23	Hello\0\0\0\0\0	00110110001101111000000000000000000000000000000000000000000000000000000000000000
+24	Hello\0\0\0\0\0	01101100011011110000000000000000000000000000000000000000000000000000000000000000
+25	Hello\0\0\0\0\0	11011000110111100000000000000000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00110010101101100000000000000000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	01100101011011000000000000000000000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	11001010110110000000000000000000000000000000000000000000000000000000000000000000
+
+String VectorConst
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hel	00100100001100101011011000000000
+7	Hel	00100100001100101011011000000000
+7	Hel	00100100001100101011011000000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hel	01001000011001010110110000000000
+8	Hel	01001000011001010110110000000000
+8	Hel	01001000011001010110110000000000
+
+FixedString VectorConst
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00110010101101100000000000000000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00110010101101100000000000000000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00110010101101100000000000000000000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	01100101011011000000000000000000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	01100101011011000000000000000000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	01100101011011000000000000000000000000000000000000000000000000000000000000000000
+
+String ConstVector
+-1	Hello	
+0	Hello	0100100001100101011011000110110001101111
+1	Hello	000000001001000011001010110110001101100011011110
+7	Hello	001001000011001010110110001101100011011110000000
+8	Hello	010010000110010101101100011011000110111100000000
+9	Hello	00000000100100001100101011011000110110001101111000000000
+15	Hello	00100100001100101011011000110110001101111000000000000000
+16	Hello	01001000011001010110110001101100011011110000000000000000
+17	Hello	0000000010010000110010101101100011011000110111100000000000000000
+23	Hello	0010010000110010101101100011011000110111100000000000000000000000
+24	Hello	0100100001100101011011000110110001101111000000000000000000000000
+25	Hello	000000001001000011001010110110001101100011011110000000000000000000000000
+31	Hello	001001000011001010110110001101100011011110000000000000000000000000000000
+32	Hello	010010000110010101101100011011000110111100000000000000000000000000000000
+33	Hello	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+39	Hello	00100100001100101011011000110110001101111000000000000000000000000000000000000000
+40	Hello	
+41	Hello	
+42	Hello	
+7	Hello	001001000011001010110110001101100011011110000000
+8	Hello	010010000110010101101100011011000110111100000000
+9	Hello	00000000100100001100101011011000110110001101111000000000
+-1	Hel	
+0	Hel	010010000110010101101100
+1	Hel	00000000100100001100101011011000
+7	Hel	00100100001100101011011000000000
+8	Hel	01001000011001010110110000000000
+9	Hel	0000000010010000110010101101100000000000
+15	Hel	0010010000110010101101100000000000000000
+16	Hel	0100100001100101011011000000000000000000
+17	Hel	000000001001000011001010110110000000000000000000
+23	Hel	001001000011001010110110000000000000000000000000
+24	Hel	
+25	Hel	
+31	Hel	
+32	Hel	
+33	Hel	
+39	Hel	
+40	Hel	
+41	Hel	
+42	Hel	
+7	Hel	00100100001100101011011000000000
+8	Hel	01001000011001010110110000000000
+9	Hel	0000000010010000110010101101100000000000
+
+FixedString ConstVector
+-1	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+0	Hello\0\0\0\0\0	01001000011001010110110001101100011011110000000000000000000000000000000000000000
+1	Hello\0\0\0\0\0	10010000110010101101100011011000110111100000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+9	Hello\0\0\0\0\0	11001010110110001101100011011110000000000000000000000000000000000000000000000000
+15	Hello\0\0\0\0\0	10110110001101100011011110000000000000000000000000000000000000000000000000000000
+16	Hello\0\0\0\0\0	01101100011011000110111100000000000000000000000000000000000000000000000000000000
+17	Hello\0\0\0\0\0	11011000110110001101111000000000000000000000000000000000000000000000000000000000
+23	Hello\0\0\0\0\0	00110110001101111000000000000000000000000000000000000000000000000000000000000000
+24	Hello\0\0\0\0\0	01101100011011110000000000000000000000000000000000000000000000000000000000000000
+25	Hello\0\0\0\0\0	11011000110111100000000000000000000000000000000000000000000000000000000000000000
+31	Hello\0\0\0\0\0	00110111100000000000000000000000000000000000000000000000000000000000000000000000
+32	Hello\0\0\0\0\0	01101111000000000000000000000000000000000000000000000000000000000000000000000000
+33	Hello\0\0\0\0\0	11011110000000000000000000000000000000000000000000000000000000000000000000000000
+39	Hello\0\0\0\0\0	10000000000000000000000000000000000000000000000000000000000000000000000000000000
+40	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+41	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+42	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+9	Hello\0\0\0\0\0	11001010110110001101100011011110000000000000000000000000000000000000000000000000
+-1	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+0	Hel\0\0\0\0\0\0\0	01001000011001010110110000000000000000000000000000000000000000000000000000000000
+1	Hel\0\0\0\0\0\0\0	10010000110010101101100000000000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00110010101101100000000000000000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	01100101011011000000000000000000000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	11001010110110000000000000000000000000000000000000000000000000000000000000000000
+15	Hel\0\0\0\0\0\0\0	10110110000000000000000000000000000000000000000000000000000000000000000000000000
+16	Hel\0\0\0\0\0\0\0	01101100000000000000000000000000000000000000000000000000000000000000000000000000
+17	Hel\0\0\0\0\0\0\0	11011000000000000000000000000000000000000000000000000000000000000000000000000000
+23	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+24	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+25	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+31	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+32	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+33	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+39	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+40	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+41	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+42	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00110010101101100000000000000000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	01100101011011000000000000000000000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	11001010110110000000000000000000000000000000000000000000000000000000000000000000
diff --git a/tests/queries/0_stateless/02017_bit_shift_left_for_string_integer.sql b/tests/queries/0_stateless/02017_bit_shift_left_for_string_integer.sql
new file mode 100644
index 00000000000..5c7a9901dae
--- /dev/null
+++ b/tests/queries/0_stateless/02017_bit_shift_left_for_string_integer.sql
@@ -0,0 +1,134 @@
+SELECT 'String ConstConst';
+SELECT bin('Hello') == bin(bitShiftLeft('Hello', 0));
+SELECT 0, 'Hello',bin(bitShiftLeft('Hello', 0));
+SELECT 1, 'Hello',bin(bitShiftLeft('Hello', 1));
+SELECT 2, 'Hello',bin(bitShiftLeft('Hello', 2));
+SELECT 3, 'Hello',bin(bitShiftLeft('Hello', 3));
+SELECT 4, 'Hello',bin(bitShiftLeft('Hello', 4));
+SELECT 5, 'Hello',bin(bitShiftLeft('Hello', 5));
+SELECT 6, 'Hello',bin(bitShiftLeft('Hello', 6));
+SELECT 7, 'Hello',bin(bitShiftLeft('Hello', 7));
+SELECT 8, 'Hello',bin(bitShiftLeft('Hello', 8));
+SELECT 9, 'Hello',bin(bitShiftLeft('Hello', 9));
+SELECT 10,'Hello',bin(bitShiftLeft('Hello', 10));
+SELECT 11,'Hello',bin(bitShiftLeft('Hello', 11));
+SELECT 12,'Hello',bin(bitShiftLeft('Hello', 12));
+SELECT 13,'Hello',bin(bitShiftLeft('Hello', 13));
+SELECT 14,'Hello',bin(bitShiftLeft('Hello', 14));
+SELECT 15,'Hello',bin(bitShiftLeft('Hello', 15));
+SELECT 16,'Hello',bin(bitShiftLeft('Hello', 16));
+SELECT 17,'Hello',bin(bitShiftLeft('Hello', 17));
+SELECT 18,'Hello',bin(bitShiftLeft('Hello', 18));
+SELECT 19,'Hello',bin(bitShiftLeft('Hello', 19));
+SELECT 20,'Hello',bin(bitShiftLeft('Hello', 20));
+SELECT 21,'Hello',bin(bitShiftLeft('Hello', 21));
+SELECT 22,'Hello',bin(bitShiftLeft('Hello', 22));
+SELECT 23,'Hello',bin(bitShiftLeft('Hello', 23));
+SELECT 24,'Hello',bin(bitShiftLeft('Hello', 24));
+SELECT 25,'Hello',bin(bitShiftLeft('Hello', 25));
+SELECT 26,'Hello',bin(bitShiftLeft('Hello', 26));
+SELECT 27,'Hello',bin(bitShiftLeft('Hello', 27));
+SELECT 28,'Hello',bin(bitShiftLeft('Hello', 28));
+SELECT 29,'Hello',bin(bitShiftLeft('Hello', 29));
+SELECT 30,'Hello',bin(bitShiftLeft('Hello', 30));
+SELECT 31,'Hello',bin(bitShiftLeft('Hello', 31));
+SELECT 32,'Hello',bin(bitShiftLeft('Hello', 32));
+SELECT 33,'Hello',bin(bitShiftLeft('Hello', 33));
+SELECT 34,'Hello',bin(bitShiftLeft('Hello', 34));
+SELECT 35,'Hello',bin(bitShiftLeft('Hello', 35));
+SELECT 36,'Hello',bin(bitShiftLeft('Hello', 36));
+SELECT 37,'Hello',bin(bitShiftLeft('Hello', 37));
+SELECT 38,'Hello',bin(bitShiftLeft('Hello', 38));
+SELECT 39,'Hello',bin(bitShiftLeft('Hello', 39));
+SELECT 40,'Hello',bin(bitShiftLeft('Hello', 40));
+SELECT 41,'Hello',bin(bitShiftLeft('Hello', 41));
+SELECT 42,'Hello',bin(bitShiftLeft('Hello', 42));
+
+SELECT 'FixedString ConstConst';
+SELECT bin(toFixedString('Hello', 10)) == bin(bitShiftLeft(toFixedString('Hello', 10), 0));
+SELECT 0, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 0));
+SELECT 1, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 1));
+SELECT 2, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 2));
+SELECT 3, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 3));
+SELECT 4, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 4));
+SELECT 5, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 5));
+SELECT 6, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 6));
+SELECT 7, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 7));
+SELECT 8, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 8));
+SELECT 9, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 9));
+SELECT 10,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 10));
+SELECT 11,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 11));
+SELECT 12,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 12));
+SELECT 13,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 13));
+SELECT 14,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 14));
+SELECT 15,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 15));
+SELECT 16,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 16));
+SELECT 17,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 17));
+SELECT 18,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 18));
+SELECT 19,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 19));
+SELECT 20,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 20));
+SELECT 21,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 21));
+SELECT 22,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 22));
+SELECT 23,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 23));
+SELECT 24,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 24));
+SELECT 25,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 25));
+SELECT 26,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 26));
+SELECT 27,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 27));
+SELECT 28,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 28));
+SELECT 29,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 29));
+SELECT 30,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 30));
+SELECT 31,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 31));
+SELECT 32,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 32));
+SELECT 33,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 33));
+SELECT 34,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 34));
+SELECT 35,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 35));
+SELECT 36,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 36));
+SELECT 37,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 37));
+SELECT 38,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 38));
+SELECT 39,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 39));
+SELECT 40,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 40));
+SELECT 41,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 41));
+SELECT 42,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 42));
+SELECT 77,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 77));
+SELECT 78,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 78));
+SELECT 79,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 79));
+SELECT 80,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 80));
+SELECT 81,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 81));
+
+DROP TABLE IF EXISTS test_bit_shift_left_string_integer;
+
+CREATE TABLE test_bit_shift_left_string_integer (str String, fixedStr FixedString(10), id Int64) engine=Log;
+
+INSERT INTO test_bit_shift_left_string_integer VALUES('Hello','Hello',-1)('Hello','Hello',0),('Hello','Hello',1),('Hello','Hello',7),('Hello','Hello',8),('Hello','Hello',9),('Hello','Hello',15),('Hello','Hello',16),('Hello','Hello',17),('Hello','Hello',23),('Hello','Hello',24),('Hello','Hello',25),('Hello','Hello',31),('Hello','Hello',32),('Hello','Hello',33),('Hello','Hello',39),('Hello','Hello',40),('Hello','Hello',41),('Hello','Hello',42),('Hel','Hel',7),('Hel','Hel',8),('Hel','Hel',9);
+
+SELECT bin(bitShiftLeft('Hello', 42));  --A blank line
+SELECT 'String VectorVector';
+SELECT id as shift_right_bit,str as arg,bin(bitShiftLeft(str, id)) as string_res FROM test_bit_shift_left_string_integer;
+SELECT id as shift_right_bit,str as arg,bin(bitShiftLeft(str, id)) as string_res FROM test_bit_shift_left_string_integer WHERE (str='Hello' AND (id=23 OR id=24 OR id=25)) OR (str='Hel' AND (id=7 OR id=8 OR id=9));
+
+SELECT bin(bitShiftLeft('Hello', 42));
+SELECT 'FixedString VectorVector';
+SELECT id as shift_right_bit,fixedStr as arg,bin(bitShiftLeft(fixedStr, id)) as fixed_string_res FROM test_bit_shift_left_string_integer;
+SELECT id as shift_right_bit,fixedStr as arg,bin(bitShiftLeft(fixedStr, id)) as fixed_string_res FROM test_bit_shift_left_string_integer WHERE (str='Hello' AND (id=23 OR id=24 OR id=25)) OR (str='Hel' AND (id=7 OR id=8 OR id=9));
+
+SELECT bin(bitShiftLeft('Hello', 42));  --A blank line
+SELECT 'String VectorConst';
+SELECT 7 as shift_right_bit,str as arg,bin(bitShiftLeft(str, 7)) as string_res FROM test_bit_shift_left_string_integer;
+SELECT 8 as shift_right_bit,str as arg,bin(bitShiftLeft(str, 8)) as string_res FROM test_bit_shift_left_string_integer;
+
+SELECT bin(bitShiftLeft('Hello', 42));  --A blank line
+SELECT 'FixedString VectorConst';
+SELECT 7 as shift_right_bit,fixedStr as arg,bin(bitShiftLeft(fixedStr, 7)) as fixed_string_res FROM test_bit_shift_left_string_integer;
+SELECT 8 as shift_right_bit,fixedStr as arg,bin(bitShiftLeft(fixedStr, 8)) as fixed_string_res FROM test_bit_shift_left_string_integer;
+
+SELECT bin(bitShiftLeft('Hello', 42));  --A blank line
+SELECT 'String ConstVector';
+SELECT id as shift_right_bit,'Hello' as arg,bin(bitShiftLeft('Hello', id)) as string_res FROM test_bit_shift_left_string_integer;
+SELECT id as shift_right_bit,'Hel' as arg,bin(bitShiftLeft('Hel', id)) as string_res FROM test_bit_shift_left_string_integer;
+
+SELECT bin(bitShiftLeft('Hello', 42));  --A blank line
+SELECT 'FixedString ConstVector';
+SELECT id as shift_right_bit,toFixedString('Hello', 10) as arg,bin(bitShiftLeft(toFixedString('Hello', 10), id)) as fixed_string_res FROM test_bit_shift_left_string_integer;
+SELECT id as shift_right_bit,toFixedString('Hel', 10) as arg,bin(bitShiftLeft(toFixedString('Hel', 10), id)) as fixed_string_res FROM test_bit_shift_left_string_integer;
+
+DROP TABLE IF EXISTS test_bit_shift_left_string_integer;

From 46638f1290e9a249eeaaf416f55df010d9080672 Mon Sep 17 00:00:00 2001
From: Alexey <lehasm@gmail.com>
Date: Tue, 7 Sep 2021 19:32:12 +0000
Subject: [PATCH 084/273] Links to CREATE FUNCTION and DROP FUNCTION from
 function Introduction

---
 docs/en/sql-reference/functions/index.md | 4 ++++
 docs/ru/sql-reference/functions/index.md | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/docs/en/sql-reference/functions/index.md b/docs/en/sql-reference/functions/index.md
index 54afd461e1d..47da4e6f3cc 100644
--- a/docs/en/sql-reference/functions/index.md
+++ b/docs/en/sql-reference/functions/index.md
@@ -59,6 +59,10 @@ A lambda function that accepts multiple arguments can also be passed to a higher
 
 For some functions the first argument (the lambda function) can be omitted. In this case, identical mapping is assumed.
 
+## User Defined Functions {#user-defined-functions}
+
+Custom functions can be created using the [CREATE FUNCTION](../statements/create/function.md) statement. To delete these functions use the [DROP FUNCTION](../statements/drop.md#drop-function) statement.
+
 ## Error Handling {#error-handling}
 
 Some functions might throw an exception if the data is invalid. In this case, the query is canceled and an error text is returned to the client. For distributed processing, when an exception occurs on one of the servers, the other servers also attempt to abort the query.
diff --git a/docs/ru/sql-reference/functions/index.md b/docs/ru/sql-reference/functions/index.md
index 15da9d36ef5..92bd1c1c2f8 100644
--- a/docs/ru/sql-reference/functions/index.md
+++ b/docs/ru/sql-reference/functions/index.md
@@ -58,6 +58,10 @@ str -> str != Referer
 
 Для некоторых функций первый аргумент (лямбда-функция) может отсутствовать. В этом случае подразумевается тождественное отображение.
 
+## Пользовательские функции {#user-defined-functions}
+
+Функции можно создавать с помощью выражения [CREATE FUNCTION](../statements/create/function.md). Для удаления таких функций используется выражение [DROP FUNCTION](../statements/drop.md#drop-function).
+
 ## Обработка ошибок {#obrabotka-oshibok}
 
 Некоторые функции могут кидать исключения в случае ошибочных данных. В этом случае, выполнение запроса прерывается, и текст ошибки выводится клиенту. При распределённой обработке запроса, при возникновении исключения на одном из серверов, на другие серверы пытается отправиться просьба тоже прервать выполнение запроса.

From cd038979d4cf5a529baf9b29a3ec6ebb646c7713 Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Wed, 8 Sep 2021 05:32:02 +0300
Subject: [PATCH 085/273] Initial (en)

---
 .../engines/table-engines/integrations/s3.md  |  2 +-
 docs/en/sql-reference/table-functions/s3.md   | 26 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/docs/en/engines/table-engines/integrations/s3.md b/docs/en/engines/table-engines/integrations/s3.md
index 7249e24aff9..e494e9aec6a 100644
--- a/docs/en/engines/table-engines/integrations/s3.md
+++ b/docs/en/engines/table-engines/integrations/s3.md
@@ -210,4 +210,4 @@ ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/big_prefix/file-
 
 ## See also
 
--  [S3 table function](../../../sql-reference/table-functions/s3.md)
+-  [s3 table function](../../../sql-reference/table-functions/s3.md)
diff --git a/docs/en/sql-reference/table-functions/s3.md b/docs/en/sql-reference/table-functions/s3.md
index d84edb3f46e..de3e442fa79 100644
--- a/docs/en/sql-reference/table-functions/s3.md
+++ b/docs/en/sql-reference/table-functions/s3.md
@@ -3,7 +3,7 @@ toc_priority: 45
 toc_title: s3
 ---
 
-# S3 Table Function {#s3-table-function}
+# s3 Table Function {#s3-table-function}
 
 Provides table-like interface to select/insert files in [Amazon S3](https://aws.amazon.com/s3/). This table function is similar to [hdfs](../../sql-reference/table-functions/hdfs.md), but provides S3-specific features.
 
@@ -125,6 +125,30 @@ INSERT INTO FUNCTION s3('https://storage.yandexcloud.net/my-test-bucket-768/test
 SELECT name, value FROM existing_table;
 ```
 
+## Partitioned Write {#partitioned-write}
+
+When inserting data into S3 table, you can split it into several files by specifying `PARTITION BY` expression. In this case a separate file is created for each partition value. Splitting the data helps to improve reading operations efficiency.
+
+**Examples**
+
+Using wildcards in a file name creates separate files:
+
+```sql
+INSERT INTO TABLE FUNCTION
+    s3('http://bucket.amazonaws.com/my_bucket/file_{_partition_id}.csv', 'CSV', 'a UInt32, b UInt32, c UInt32')
+    PARTITION BY a VALUES (1, 2, 3), (1, 4, 5), (10, 11, 12), (10, 13, 14), (20, 21, 22), (20, 23, 24)
+```
+As a result, the data is written into three files: `file_1.csv`, `file_10.csv`, and `file_20.csv`.
+
+Using wildcards in a bucket name creates files in different buckets:
+
+```sql
+INSERT INTO TABLE FUNCTION
+    s3('http://bucket.amazonaws.com/my_bucket_{_partition_id}/file.csv', 'CSV', 'a UInt32, b UInt32, c UInt32')
+    PARTITION BY a VALUES (1, 2, 3), (1, 4, 5), (10, 11, 12), (10, 13, 14), (20, 21, 22), (20, 23, 24)
+```
+As a result, the data is written into three files in different buckets: `my_bucket_1/file.csv`, `my_bucket_10/file.csv`, and `my_bucket_20/file.csv`.
+
 **See Also**
 
 -   [S3 engine](../../engines/table-engines/integrations/s3.md)

From a62c428291dabfa7848ecc81829623da7763237d Mon Sep 17 00:00:00 2001
From: Olga Revyakina <revolg@yandex-team.ru>
Date: Wed, 8 Sep 2021 05:52:17 +0300
Subject: [PATCH 086/273] Translated and minor fixes

---
 docs/en/sql-reference/table-functions/s3.md   |  4 ++--
 .../engines/table-engines/integrations/s3.md  |  2 +-
 docs/ru/sql-reference/table-functions/s3.md   | 24 +++++++++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/docs/en/sql-reference/table-functions/s3.md b/docs/en/sql-reference/table-functions/s3.md
index de3e442fa79..12d39a2b324 100644
--- a/docs/en/sql-reference/table-functions/s3.md
+++ b/docs/en/sql-reference/table-functions/s3.md
@@ -131,7 +131,7 @@ When inserting data into S3 table, you can split it into several files by specif
 
 **Examples**
 
-Using wildcards in a file name creates separate files:
+1. Using partition ID in a file name creates separate files:
 
 ```sql
 INSERT INTO TABLE FUNCTION
@@ -140,7 +140,7 @@ INSERT INTO TABLE FUNCTION
 ```
 As a result, the data is written into three files: `file_1.csv`, `file_10.csv`, and `file_20.csv`.
 
-Using wildcards in a bucket name creates files in different buckets:
+2. Using partition ID in a bucket name creates files in different buckets:
 
 ```sql
 INSERT INTO TABLE FUNCTION
diff --git a/docs/ru/engines/table-engines/integrations/s3.md b/docs/ru/engines/table-engines/integrations/s3.md
index 5895bd43d2f..c90b7293e1c 100644
--- a/docs/ru/engines/table-engines/integrations/s3.md
+++ b/docs/ru/engines/table-engines/integrations/s3.md
@@ -151,4 +151,4 @@ ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/big_prefix/file-
 
 **Смотрите также**
 
--  [Табличная функция S3](../../../sql-reference/table-functions/s3.md)
+-  [Табличная функция s3](../../../sql-reference/table-functions/s3.md)
diff --git a/docs/ru/sql-reference/table-functions/s3.md b/docs/ru/sql-reference/table-functions/s3.md
index 597f145c096..3a671e2029f 100644
--- a/docs/ru/sql-reference/table-functions/s3.md
+++ b/docs/ru/sql-reference/table-functions/s3.md
@@ -133,6 +133,30 @@ INSERT INTO FUNCTION s3('https://storage.yandexcloud.net/my-test-bucket-768/test
 SELECT name, value FROM existing_table;
 ```
 
+## Партиционирование при записи данных {#partitioned-write}
+
+При добавлении данных в таблицу S3 вы можете сохранить таблицу в нескольких файлах, указав выражение `PARTITION BY`. В этом случае для каждого значения выражения партиционирования создается отдельный файл. Сохранение таблицы в нескольких отдельных файлах повышает эффективность операций чтения.
+
+**Примеры**
+
+1. При использовании ID партиции в названии файла создаются отдельные файлы:
+
+```sql
+INSERT INTO TABLE FUNCTION
+    s3('http://bucket.amazonaws.com/my_bucket/file_{_partition_id}.csv', 'CSV', 'a UInt32, b UInt32, c UInt32')
+    PARTITION BY a VALUES (1, 2, 3), (1, 4, 5), (10, 11, 12), (10, 13, 14), (20, 21, 22), (20, 23, 24)
+```
+В результате данные будут записаны в три файла: `file_1.csv`, `file_10.csv` и `file_20.csv`.
+
+2. При использовании ID партиции в названии бакета создаются файлы в разных бакетах:
+
+```sql
+INSERT INTO TABLE FUNCTION
+    s3('http://bucket.amazonaws.com/my_bucket_{_partition_id}/file.csv', 'CSV', 'a UInt32, b UInt32, c UInt32')
+    PARTITION BY a VALUES (1, 2, 3), (1, 4, 5), (10, 11, 12), (10, 13, 14), (20, 21, 22), (20, 23, 24)
+```
+В результате будут созданы три файла в разных бакетах: `my_bucket_1/file.csv`, `my_bucket_10/file.csv` и `my_bucket_20/file.csv`.
+
 **Смотрите также**
 
 -  [Движок таблиц S3](../../engines/table-engines/integrations/s3.md)

From cbbc5b2ee546e5a3efced7cb9f2cbf350183c7a0 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Wed, 8 Sep 2021 12:58:17 +0300
Subject: [PATCH 087/273] Fix some broken images

---
 docker/test/integration/kerberos_kdc/Dockerfile        | 6 ++----
 docker/test/integration/mysql_golang_client/Dockerfile | 2 +-
 docker/test/sqlancer/Dockerfile                        | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/docker/test/integration/kerberos_kdc/Dockerfile b/docker/test/integration/kerberos_kdc/Dockerfile
index a33d1d24568..7805d8f1d1c 100644
--- a/docker/test/integration/kerberos_kdc/Dockerfile
+++ b/docker/test/integration/kerberos_kdc/Dockerfile
@@ -1,9 +1,7 @@
 # docker build -t clickhouse/kerberos-kdc .
+FROM centos:7
 
-FROM centos:6.6
-# old OS to make is faster and smaller
-
-RUN yum install -y krb5-server krb5-libs krb5-auth-dialog krb5-workstation
+RUN yum install -y ca-certificates krb5-server krb5-libs krb5-auth-dialog krb5-workstation
 
 EXPOSE 88 749
 
diff --git a/docker/test/integration/mysql_golang_client/Dockerfile b/docker/test/integration/mysql_golang_client/Dockerfile
index 6e448b4c66a..68b0aaab42c 100644
--- a/docker/test/integration/mysql_golang_client/Dockerfile
+++ b/docker/test/integration/mysql_golang_client/Dockerfile
@@ -1,7 +1,7 @@
 # docker build -t clickhouse/mysql-golang-client .
 # MySQL golang client docker container
 
-FROM golang:1.12.2
+FROM golang:1.13
 
 RUN go get "github.com/go-sql-driver/mysql"
 
diff --git a/docker/test/sqlancer/Dockerfile b/docker/test/sqlancer/Dockerfile
index f603b812408..e73fd03fb6d 100644
--- a/docker/test/sqlancer/Dockerfile
+++ b/docker/test/sqlancer/Dockerfile
@@ -3,7 +3,7 @@ FROM ubuntu:20.04
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
-RUN apt-get update --yes && env DEBIAN_FRONTEND=noninteractive apt-get install wget unzip git openjdk-14-jdk maven python3 --yes --no-install-recommends
+RUN apt-get update --yes && env DEBIAN_FRONTEND=noninteractive apt-get install wget unzip git default-jdk maven python3 --yes --no-install-recommends
 RUN wget https://github.com/sqlancer/sqlancer/archive/master.zip -O /sqlancer.zip
 RUN mkdir /sqlancer && \
 	cd /sqlancer && \

From 3f11cbd31bd2f97d460b52c2c7e39f48bf600ccf Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Wed, 8 Sep 2021 13:03:54 +0300
Subject: [PATCH 088/273] Rename more images

---
 tests/integration/README.md          |  4 ++--
 tests/integration/ci-runner.py       | 12 ++++++------
 tests/integration/helpers/cluster.py |  6 +++---
 tests/integration/helpers/network.py |  8 ++++----
 tests/integration/runner             | 16 ++++++++--------
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/tests/integration/README.md b/tests/integration/README.md
index ed96eafdef8..1b1e7f3e052 100644
--- a/tests/integration/README.md
+++ b/tests/integration/README.md
@@ -66,7 +66,7 @@ For tests that use common docker compose files you may need to set up their path
 ### Running with runner script
 
 The only requirement is fresh configured docker and
-docker pull yandex/clickhouse-integration-tests-runner
+docker pull clickhouse/integration-tests-runner
 
 Notes:
 * If you want to run integration tests without `sudo` you have to add your user to docker group `sudo usermod -aG docker $USER`. [More information](https://docs.docker.com/install/linux/linux-postinstall/) about docker configuration.
@@ -122,7 +122,7 @@ You can just open shell inside a container by overwritting the command:
 The main container used for integration tests lives in `docker/test/integration/Dockerfile`. Rebuild it with
 ```
 cd docker/test/integration
-docker build -t yandex/clickhouse-integration-test .
+docker build -t clickhouse/integration-test .
 ```
 
 The helper container used by the `runner` script is in `docker/test/integration/runner/Dockerfile`.
diff --git a/tests/integration/ci-runner.py b/tests/integration/ci-runner.py
index bf7549a83c4..f17eb84e5f3 100755
--- a/tests/integration/ci-runner.py
+++ b/tests/integration/ci-runner.py
@@ -207,11 +207,11 @@ class ClickhouseIntegrationTestsRunner:
 
     @staticmethod
     def get_images_names():
-        return ["yandex/clickhouse-integration-tests-runner", "yandex/clickhouse-mysql-golang-client",
-                "yandex/clickhouse-mysql-java-client", "yandex/clickhouse-mysql-js-client",
-                "yandex/clickhouse-mysql-php-client", "yandex/clickhouse-postgresql-java-client",
-                "yandex/clickhouse-integration-test", "yandex/clickhouse-kerberos-kdc",
-                "yandex/clickhouse-integration-helper", ]
+        return ["clickhouse/integration-tests-runner", "clickhouse/mysql-golang-client",
+                "clickhouse/mysql-java-client", "clickhouse/mysql-js-client",
+                "clickhouse/mysql-php-client", "clickhouse/postgresql-java-client",
+                "clickhouse/integration-test", "clickhouse/kerberos-kdc",
+                "clickhouse/integration-helper", ]
 
 
     def _can_run_with(self, path, opt):
@@ -343,7 +343,7 @@ class ClickhouseIntegrationTestsRunner:
         image_cmd = ''
         if self._can_run_with(os.path.join(repo_path, "tests/integration", "runner"), '--docker-image-version'):
             for img in self.get_images_names():
-                if img == "yandex/clickhouse-integration-tests-runner":
+                if img == "clickhouse/integration-tests-runner":
                     runner_version = self.get_single_image_version()
                     logging.info("Can run with custom docker image version %s", runner_version)
                     image_cmd += ' --docker-image-version={} '.format(runner_version)
diff --git a/tests/integration/helpers/cluster.py b/tests/integration/helpers/cluster.py
index 165e2175cf2..d1240999274 100644
--- a/tests/integration/helpers/cluster.py
+++ b/tests/integration/helpers/cluster.py
@@ -532,7 +532,7 @@ class ClickHouseCluster:
             binary_path = binary_path[:-len('-server')]
 
         env_variables['keeper_binary'] = binary_path
-        env_variables['image'] = "yandex/clickhouse-integration-test:" + self.docker_base_tag
+        env_variables['image'] = "clickhouse/integration-test:" + self.docker_base_tag
         env_variables['user'] = str(os.getuid())
         env_variables['keeper_fs'] = 'bind'
         for i in range(1, 4):
@@ -757,7 +757,7 @@ class ClickHouseCluster:
                      with_odbc_drivers=False, with_postgres=False, with_postgres_cluster=False, with_hdfs=False,
                      with_kerberized_hdfs=False, with_mongo=False, with_mongo_secure=False, with_nginx=False,
                      with_redis=False, with_minio=False, with_cassandra=False, with_jdbc_bridge=False,
-                     hostname=None, env_variables=None, image="yandex/clickhouse-integration-test", tag=None,
+                     hostname=None, env_variables=None, image="clickhouse/integration-test", tag=None,
                      stay_alive=False, ipv4_address=None, ipv6_address=None, with_installed_binary=False, tmpfs=None,
                      zookeeper_docker_compose_path=None, minio_certs_dir=None, use_keeper=True,
                      main_config_name="config.xml", users_config_name="users.xml", copy_common_configs=True):
@@ -1801,7 +1801,7 @@ class ClickHouseInstance:
             clickhouse_start_command=CLICKHOUSE_START_COMMAND,
             main_config_name="config.xml", users_config_name="users.xml", copy_common_configs=True,
             hostname=None, env_variables=None,
-            image="yandex/clickhouse-integration-test", tag="latest",
+            image="clickhouse/integration-test", tag="latest",
             stay_alive=False, ipv4_address=None, ipv6_address=None, with_installed_binary=False, tmpfs=None):
 
         self.name = name
diff --git a/tests/integration/helpers/network.py b/tests/integration/helpers/network.py
index 040d49b992f..af0942c9b94 100644
--- a/tests/integration/helpers/network.py
+++ b/tests/integration/helpers/network.py
@@ -195,21 +195,21 @@ class _NetworkManager:
                         print("Error removing network blocade container, will try again", str(ex))
                         time.sleep(i)
 
-            image = subprocess.check_output("docker images -q yandex/clickhouse-integration-helper 2>/dev/null", shell=True)
+            image = subprocess.check_output("docker images -q clickhouse/integration-helper 2>/dev/null", shell=True)
             if not image.strip():
                 print("No network image helper, will try download")
                 # for some reason docker api may hang if image doesn't exist, so we download it
                 # before running
                 for i in range(5):
                     try:
-                        subprocess.check_call("docker pull yandex/clickhouse-integration-helper", shell=True)   # STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL
+                        subprocess.check_call("docker pull clickhouse/integration-helper", shell=True)   # STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL
                         break
                     except:
                         time.sleep(i)
                 else:
-                    raise Exception("Cannot pull yandex/clickhouse-integration-helper image")
+                    raise Exception("Cannot pull clickhouse/integration-helper image")
 
-            self._container = self._docker_client.containers.run('yandex/clickhouse-integration-helper',
+            self._container = self._docker_client.containers.run('clickhouse/integration-helper',
                                                                  auto_remove=True,
                                                                  command=('sleep %s' % self.container_exit_timeout),
                                                                  detach=True, network_mode='host')
diff --git a/tests/integration/runner b/tests/integration/runner
index 2143d7ebf29..3ff982a9913 100755
--- a/tests/integration/runner
+++ b/tests/integration/runner
@@ -19,7 +19,7 @@ CONFIG_DIR_IN_REPO = "programs/server"
 INTERGATION_DIR_IN_REPO = "tests/integration"
 SRC_DIR_IN_REPO = "src"
 
-DIND_INTEGRATION_TESTS_IMAGE_NAME = "yandex/clickhouse-integration-tests-runner"
+DIND_INTEGRATION_TESTS_IMAGE_NAME = "clickhouse/integration-tests-runner"
 
 def check_args_and_update_paths(args):
     if args.clickhouse_root:
@@ -225,19 +225,19 @@ if __name__ == "__main__":
     if args.docker_compose_images_tags is not None:
         for img_tag in args.docker_compose_images_tags:
             [image, tag] = img_tag.split(":")
-            if image == "yandex/clickhouse-mysql-golang-client":
+            if image == "clickhouse/mysql-golang-client":
                 env_tags += "-e {}={} ".format("DOCKER_MYSQL_GOLANG_CLIENT_TAG", tag)
-            elif image == "yandex/clickhouse-mysql-java-client":
+            elif image == "clickhouse/mysql-java-client":
                 env_tags += "-e {}={} ".format("DOCKER_MYSQL_JAVA_CLIENT_TAG", tag)
-            elif image == "yandex/clickhouse-mysql-js-client":
+            elif image == "clickhouse/mysql-js-client":
                 env_tags += "-e {}={} ".format("DOCKER_MYSQL_JS_CLIENT_TAG", tag)
-            elif image == "yandex/clickhouse-mysql-php-client":
+            elif image == "clickhouse/mysql-php-client":
                 env_tags += "-e {}={} ".format("DOCKER_MYSQL_PHP_CLIENT_TAG", tag)
-            elif image == "yandex/clickhouse-postgresql-java-client":
+            elif image == "clickhouse/postgresql-java-client":
                 env_tags += "-e {}={} ".format("DOCKER_POSTGRESQL_JAVA_CLIENT_TAG", tag)
-            elif image == "yandex/clickhouse-integration-test":
+            elif image == "clickhouse/integration-test":
                 env_tags += "-e {}={} ".format("DOCKER_BASE_TAG", tag)
-            elif image == "yandex/clickhouse-kerberos-kdc":
+            elif image == "clickhouse/kerberos-kdc":
                 env_tags += "-e {}={}".format("DOCKER_KERBEROS_KDC_TAG", tag)
             else:
                 logging.info("Unknown image %s" % (image))

From b8cfad4ba2d0e1fb4518a01a537e0dd6660ce9cb Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Wed, 8 Sep 2021 13:06:03 +0300
Subject: [PATCH 089/273] Renames for testflows

---
 .../aes_encryption/aes_encryption_env/clickhouse-service.yml    | 2 +-
 .../datetime64_extended_range_env/clickhouse-service.yml        | 2 +-
 tests/testflows/example/example_env/clickhouse-service.yml      | 2 +-
 .../extended-precision-data-type_env/clickhouse-service.yml     | 2 +-
 tests/testflows/kerberos/kerberos_env/clickhouse-service.yml    | 2 +-
 .../ldap_authentication_env/clickhouse-service.yml              | 2 +-
 .../ldap_external_user_directory_env/clickhouse-service.yml     | 2 +-
 .../role_mapping/ldap_role_mapping_env/clickhouse-service.yml   | 2 +-
 tests/testflows/map_type/map_type_env/clickhouse-service.yml    | 2 +-
 tests/testflows/rbac/rbac_env/clickhouse-service.yml            | 2 +-
 tests/testflows/runner                                          | 2 +-
 .../window_functions_env/clickhouse-service.yml                 | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/testflows/aes_encryption/aes_encryption_env/clickhouse-service.yml b/tests/testflows/aes_encryption/aes_encryption_env/clickhouse-service.yml
index 0789decf022..0c9352dbc0b 100644
--- a/tests/testflows/aes_encryption/aes_encryption_env/clickhouse-service.yml
+++ b/tests/testflows/aes_encryption/aes_encryption_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/datetime64_extended_range/datetime64_extended_range_env/clickhouse-service.yml b/tests/testflows/datetime64_extended_range/datetime64_extended_range_env/clickhouse-service.yml
index 0789decf022..0c9352dbc0b 100644
--- a/tests/testflows/datetime64_extended_range/datetime64_extended_range_env/clickhouse-service.yml
+++ b/tests/testflows/datetime64_extended_range/datetime64_extended_range_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/example/example_env/clickhouse-service.yml b/tests/testflows/example/example_env/clickhouse-service.yml
index 0789decf022..0c9352dbc0b 100644
--- a/tests/testflows/example/example_env/clickhouse-service.yml
+++ b/tests/testflows/example/example_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/extended_precision_data_types/extended-precision-data-type_env/clickhouse-service.yml b/tests/testflows/extended_precision_data_types/extended-precision-data-type_env/clickhouse-service.yml
index fdd4a8057a9..afb31f77c94 100644
--- a/tests/testflows/extended_precision_data_types/extended-precision-data-type_env/clickhouse-service.yml
+++ b/tests/testflows/extended_precision_data_types/extended-precision-data-type_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/kerberos/kerberos_env/clickhouse-service.yml b/tests/testflows/kerberos/kerberos_env/clickhouse-service.yml
index 14736a264b8..9f30ca3039a 100644
--- a/tests/testflows/kerberos/kerberos_env/clickhouse-service.yml
+++ b/tests/testflows/kerberos/kerberos_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test:21454
+    image: clickhouse/integration-test:21454
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/ldap/authentication/ldap_authentication_env/clickhouse-service.yml b/tests/testflows/ldap/authentication/ldap_authentication_env/clickhouse-service.yml
index 0789decf022..0c9352dbc0b 100644
--- a/tests/testflows/ldap/authentication/ldap_authentication_env/clickhouse-service.yml
+++ b/tests/testflows/ldap/authentication/ldap_authentication_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/clickhouse-service.yml b/tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/clickhouse-service.yml
index 0789decf022..0c9352dbc0b 100644
--- a/tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/clickhouse-service.yml
+++ b/tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/ldap/role_mapping/ldap_role_mapping_env/clickhouse-service.yml b/tests/testflows/ldap/role_mapping/ldap_role_mapping_env/clickhouse-service.yml
index 0789decf022..0c9352dbc0b 100644
--- a/tests/testflows/ldap/role_mapping/ldap_role_mapping_env/clickhouse-service.yml
+++ b/tests/testflows/ldap/role_mapping/ldap_role_mapping_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/map_type/map_type_env/clickhouse-service.yml b/tests/testflows/map_type/map_type_env/clickhouse-service.yml
index fdd4a8057a9..afb31f77c94 100755
--- a/tests/testflows/map_type/map_type_env/clickhouse-service.yml
+++ b/tests/testflows/map_type/map_type_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/rbac/rbac_env/clickhouse-service.yml b/tests/testflows/rbac/rbac_env/clickhouse-service.yml
index 2d79443dcbb..ac52e3b83eb 100755
--- a/tests/testflows/rbac/rbac_env/clickhouse-service.yml
+++ b/tests/testflows/rbac/rbac_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/runner b/tests/testflows/runner
index 772a4d01a84..0208512762c 100755
--- a/tests/testflows/runner
+++ b/tests/testflows/runner
@@ -14,7 +14,7 @@ DEFAULT_CLICKHOUSE_ROOT = os.path.abspath(os.path.join(CUR_FILE_DIR, "../../"))
 CURRENT_WORK_DIR = os.getcwd()
 CONTAINER_NAME = "clickhouse_testflows_tests"
 
-DIND_TESTFLOWS_TESTS_IMAGE_NAME = "yandex/clickhouse-testflows-runner"
+DIND_TESTFLOWS_TESTS_IMAGE_NAME = "clickhouse/testflows-runner"
 
 def check_args_and_update_paths(args):
     if not os.path.isabs(args.binary):
diff --git a/tests/testflows/window_functions/window_functions_env/clickhouse-service.yml b/tests/testflows/window_functions/window_functions_env/clickhouse-service.yml
index fdd4a8057a9..afb31f77c94 100755
--- a/tests/testflows/window_functions/window_functions_env/clickhouse-service.yml
+++ b/tests/testflows/window_functions/window_functions_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"

From b073d5a4b4280c1f6d94596205e288f13722ed28 Mon Sep 17 00:00:00 2001
From: Dmitrii Kovalkov <dimas.kovas@gmail.com>
Date: Wed, 8 Sep 2021 13:11:38 +0300
Subject: [PATCH 090/273] Default argument for Pool.get()

---
 base/mysqlxx/Pool.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/mysqlxx/Pool.h b/base/mysqlxx/Pool.h
index 08d8b85b4ac..f542c3d3b76 100644
--- a/base/mysqlxx/Pool.h
+++ b/base/mysqlxx/Pool.h
@@ -189,7 +189,7 @@ public:
     ~Pool();
 
     /// Allocates connection.
-    Entry get(uint64_t wait_timeout);
+    Entry get(uint64_t wait_timeout = UINT64_MAX);
 
     /// Allocates connection.
     /// If database is not accessible, returns empty Entry object.

From 107710e61831cf53f5549f9be23e2dcddc972daa Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <mikhaylovnikitka@gmail.com>
Date: Wed, 8 Sep 2021 15:06:15 +0000
Subject: [PATCH 091/273] save

---
 debian/rules                      |  4 ++--
 docker/packager/binary/Dockerfile | 15 ++++-----------
 docker/packager/deb/Dockerfile    | 12 ++++--------
 docker/packager/packager          |  2 +-
 docs/en/development/build-osx.md  |  2 +-
 docs/ru/development/build-osx.md  |  2 +-
 tests/ci/ci_config.json           |  8 ++++----
 7 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/debian/rules b/debian/rules
index 73d1f3d3b34..4562d24bec4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,8 +36,8 @@ endif
 
 CMAKE_FLAGS += -DENABLE_UTILS=0
 
-DEB_CC ?= $(shell which gcc-10 gcc-9 gcc | head -n1)
-DEB_CXX ?= $(shell which g++-10 g++-9 g++ | head -n1)
+DEB_CC ?= $(shell which gcc-11 gcc-10 gcc-9 gcc | head -n1)
+DEB_CXX ?= $(shell which g++-11 g++-10 g++-9 g++ | head -n1)
 
 ifdef DEB_CXX
     DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index f5d496ce97f..05d1c565eed 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -41,8 +41,6 @@ RUN apt-get update \
         ccache \
         cmake \
         curl \
-        g++-10 \
-        gcc-10 \
         gdb \
         git \
         gperf \
@@ -104,15 +102,10 @@ RUN wget -nv "https://developer.arm.com/-/media/Files/downloads/gnu-a/8.3-2019.0
 # Download toolchain for FreeBSD 11.3
 RUN wget -nv https://clickhouse-datasets.s3.yandex.net/toolchains/toolchains/freebsd-11.3-toolchain.tar.xz
 
-# NOTE: For some reason we have outdated version of gcc-10 in ubuntu 20.04 stable.
-# Current workaround is to use latest version proposed repo. Remove as soon as
-# gcc-10.2 appear in stable repo.
-RUN echo 'deb http://archive.ubuntu.com/ubuntu/ focal-proposed restricted main multiverse universe' > /etc/apt/sources.list.d/proposed-repositories.list
-
-RUN apt-get update \
-    && apt-get install gcc-10 g++-10 --yes
-
-RUN rm /etc/apt/sources.list.d/proposed-repositories.list && apt-get update
+# NOTE: Seems like gcc-11 is too new for ubuntu20 repository
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test --yes \
+    && apt-get update \
+    && apt-get install gcc-11 g++-11 --yes
 
 
 COPY build.sh /
diff --git a/docker/packager/deb/Dockerfile b/docker/packager/deb/Dockerfile
index 22bba94f250..bcab87c925e 100644
--- a/docker/packager/deb/Dockerfile
+++ b/docker/packager/deb/Dockerfile
@@ -57,15 +57,11 @@ RUN apt-get update \
         tzdata \
         --yes --no-install-recommends
 
-# NOTE: For some reason we have outdated version of gcc-10 in ubuntu 20.04 stable.
-# Current workaround is to use latest version proposed repo. Remove as soon as
-# gcc-10.2 appear in stable repo.
-RUN echo 'deb http://archive.ubuntu.com/ubuntu/ focal-proposed restricted main multiverse universe' > /etc/apt/sources.list.d/proposed-repositories.list
+# NOTE: Seems like gcc-11 is too new for ubuntu20 repository
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test --yes \
+    && apt-get update \
+    && apt-get install gcc-11 g++-11 --yes
 
-RUN apt-get update \
-    && apt-get install gcc-10 g++-10 --yes --no-install-recommends
-
-RUN rm /etc/apt/sources.list.d/proposed-repositories.list && apt-get update
 
 # This symlink required by gcc to find lld compiler
 RUN ln -s /usr/bin/lld-${LLVM_VERSION} /usr/bin/ld.lld
diff --git a/docker/packager/packager b/docker/packager/packager
index f37d64e9949..5bea9fafd12 100755
--- a/docker/packager/packager
+++ b/docker/packager/packager
@@ -205,7 +205,7 @@ if __name__ == "__main__":
     parser.add_argument("--build-type", choices=("debug", ""), default="")
     parser.add_argument("--compiler", choices=("clang-11", "clang-11-darwin", "clang-11-darwin-aarch64", "clang-11-aarch64",
                                                "clang-12", "clang-12-darwin", "clang-12-darwin-aarch64", "clang-12-aarch64",
-                                               "clang-11-freebsd", "clang-12-freebsd", "gcc-10"), default="clang-12")
+                                               "clang-11-freebsd", "clang-12-freebsd", "gcc-11"), default="clang-12")
     parser.add_argument("--sanitizer", choices=("address", "thread", "memory", "undefined", ""), default="")
     parser.add_argument("--unbundled", action="store_true")
     parser.add_argument("--split-binary", action="store_true")
diff --git a/docs/en/development/build-osx.md b/docs/en/development/build-osx.md
index 687e0179e07..91e4902d0d2 100644
--- a/docs/en/development/build-osx.md
+++ b/docs/en/development/build-osx.md
@@ -76,7 +76,7 @@ cd ClickHouse
 rm -rf build
 mkdir build
 cd build
-cmake -DCMAKE_C_COMPILER=$(brew --prefix gcc)/bin/gcc-10 -DCMAKE_CXX_COMPILER=$(brew --prefix gcc)/bin/g++-10 -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
+cmake -DCMAKE_C_COMPILER=$(brew --prefix gcc)/bin/gcc-11 -DCMAKE_CXX_COMPILER=$(brew --prefix gcc)/bin/g++-11 -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
 cmake --build . --config RelWithDebInfo
 cd ..
 ```
diff --git a/docs/ru/development/build-osx.md b/docs/ru/development/build-osx.md
index 8d5d06a544c..bdc80322f34 100644
--- a/docs/ru/development/build-osx.md
+++ b/docs/ru/development/build-osx.md
@@ -74,7 +74,7 @@ $ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/
   $ rm -rf build
   $ mkdir build
   $ cd build
-  $ cmake -DCMAKE_C_COMPILER=$(brew --prefix gcc)/bin/gcc-10 -DCMAKE_CXX_COMPILER=$(brew --prefix gcc)/bin/g++-10 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_JEMALLOC=OFF ..
+  $ cmake -DCMAKE_C_COMPILER=$(brew --prefix gcc)/bin/gcc-11 -DCMAKE_CXX_COMPILER=$(brew --prefix gcc)/bin/g++-11 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_JEMALLOC=OFF ..
   $ cmake --build . --config RelWithDebInfo
   $ cd ..
   ```
diff --git a/tests/ci/ci_config.json b/tests/ci/ci_config.json
index 26c8d560312..cbae9a86fdf 100644
--- a/tests/ci/ci_config.json
+++ b/tests/ci/ci_config.json
@@ -22,7 +22,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "gcc-10",
+            "compiler": "gcc-11",
             "build-type": "",
             "sanitizer": "",
             "package-type": "binary",
@@ -82,7 +82,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "gcc-10",
+            "compiler": "gcc-11",
             "build-type": "",
             "sanitizer": "",
             "package-type": "deb",
@@ -347,7 +347,7 @@
         },
         "Functional stateless tests (unbundled)": {
             "required_build_properties": {
-                "compiler": "gcc-10",
+                "compiler": "gcc-11",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -551,7 +551,7 @@
         },
         "Unit tests release gcc": {
             "required_build_properties": {
-                "compiler": "gcc-10",
+                "compiler": "gcc-11",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",

From 7141b5d0415addd4772b6100ed65e239932b62b7 Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Wed, 8 Sep 2021 20:22:24 +0300
Subject: [PATCH 092/273] Get rid of regexp

---
 .../static-files-disk-uploader.cpp            | 127 +++++---
 src/Disks/DiskWebServer.cpp                   | 288 ++++++------------
 src/Disks/DiskWebServer.h                     |  58 ++--
 utils/s3tools/s3uploader                      |  48 ++-
 4 files changed, 220 insertions(+), 301 deletions(-)

diff --git a/programs/static-files-disk-uploader/static-files-disk-uploader.cpp b/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
index 9e44b42dc86..04f46178c84 100644
--- a/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
+++ b/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
@@ -15,8 +15,7 @@
 
 namespace fs = std::filesystem;
 
-#define UUID_PATTERN "[\\w]{8}-[\\w]{4}-[\\w]{4}-[\\w]{4}-[\\w]{12}"
-#define EXTRACT_UUID_PATTERN fmt::format(".*\\/({})\\/.*", UUID_PATTERN)
+#define EXTRACT_PATH_PATTERN ".*\\/store/(.*)"
 
 
 namespace DB
@@ -32,40 +31,102 @@ namespace ErrorCodes
  * If test-mode option is added, files will be put by given url via PUT request.
  */
 
-void processTableFiles(const fs::path & path, String root_path, String uuid,
-        WriteBuffer & metadata_buf, std::function<std::shared_ptr<WriteBuffer>(const String &)> create_dst_buf)
+void processFile(const fs::path & file_path, const fs::path & dst_path, bool test_mode, WriteBuffer & metadata_buf)
 {
-    fs::directory_iterator dir_end;
-    auto process_file = [&](const String & file_name, const String & file_path)
+    String remote_path;
+    RE2::FullMatch(file_path.string(), EXTRACT_PATH_PATTERN, &remote_path);
+    bool is_directory = fs::is_directory(file_path);
+
+    writeText(file_path.filename(), metadata_buf);
+    writeChar('\t', metadata_buf);
+    writeBoolText(is_directory, metadata_buf);
+    if (!is_directory)
     {
-        auto remote_file_name = uuid + "/" + file_name;
-        writeText(remote_file_name, metadata_buf);
         writeChar('\t', metadata_buf);
         writeIntText(fs::file_size(file_path), metadata_buf);
-        writeChar('\n', metadata_buf);
+    }
+    writeChar('\n', metadata_buf);
 
-        auto src_buf = createReadBufferFromFileBase(file_path, {}, fs::file_size(file_path));
-        fs::create_directories((fs::path(root_path) / remote_file_name).parent_path());
-        auto dst_buf = create_dst_buf(remote_file_name);
+    if (is_directory)
+        return;
 
-        copyData(*src_buf, *dst_buf);
-        dst_buf->next();
-        dst_buf->finalize();
-    };
+    auto dst_file_path = fs::path(dst_path) / remote_path;
 
-    for (fs::directory_iterator dir_it(path); dir_it != dir_end; ++dir_it)
+    auto src_buf = createReadBufferFromFileBase(file_path, {}, fs::file_size(file_path));
+    std::shared_ptr<WriteBuffer> dst_buf;
+
+    /// test mode for integration tests.
+    if (test_mode)
+        dst_buf = std::make_shared<WriteBufferFromHTTP>(Poco::URI(dst_file_path), Poco::Net::HTTPRequest::HTTP_PUT);
+    else
+        dst_buf = std::make_shared<WriteBufferFromFile>(dst_file_path);
+
+    copyData(*src_buf, *dst_buf);
+    dst_buf->next();
+    dst_buf->finalize();
+};
+
+
+void processTableFiles(const fs::path & data_path, fs::path dst_path, bool test_mode)
+{
+    std::cerr << "Data path: " << data_path << ", destination path: " << dst_path << std::endl;
+
+    String prefix;
+    RE2::FullMatch(data_path.string(), EXTRACT_PATH_PATTERN, &prefix);
+
+    std::shared_ptr<WriteBuffer> root_meta;
+    if (test_mode)
+    {
+        dst_path /= "store";
+        auto files_root = dst_path / prefix;
+        root_meta = std::make_shared<WriteBufferFromHTTP>(Poco::URI(files_root / ".index"), Poco::Net::HTTPRequest::HTTP_PUT);
+    }
+    else
+    {
+        dst_path = fs::canonical(dst_path);
+        auto files_root = dst_path / prefix;
+        fs::create_directories(files_root);
+        root_meta = std::make_shared<WriteBufferFromFile>(files_root / ".index");
+    }
+
+    fs::directory_iterator dir_end;
+    for (fs::directory_iterator dir_it(data_path); dir_it != dir_end; ++dir_it)
     {
         if (dir_it->is_directory())
         {
+            processFile(dir_it->path(), dst_path, test_mode, *root_meta);
+
+            String directory_prefix;
+            RE2::FullMatch(dir_it->path().string(), EXTRACT_PATH_PATTERN, &directory_prefix);
+
+            std::shared_ptr<WriteBuffer> directory_meta;
+            if (test_mode)
+            {
+                auto files_root = dst_path / prefix;
+                directory_meta = std::make_shared<WriteBufferFromHTTP>(Poco::URI(dst_path / directory_prefix / ".index"), Poco::Net::HTTPRequest::HTTP_PUT);
+            }
+            else
+            {
+                dst_path = fs::canonical(dst_path);
+                auto files_root = dst_path / prefix;
+                fs::create_directories(dst_path / directory_prefix);
+                directory_meta = std::make_shared<WriteBufferFromFile>(dst_path / directory_prefix / ".index");
+            }
+
             fs::directory_iterator files_end;
             for (fs::directory_iterator file_it(dir_it->path()); file_it != files_end; ++file_it)
-                process_file(dir_it->path().filename() / file_it->path().filename(), file_it->path());
+                processFile(file_it->path(), dst_path, test_mode, *directory_meta);
+
+            directory_meta->next();
+            directory_meta->finalize();
         }
         else
         {
-            process_file(dir_it->path().filename(), dir_it->path());
+            processFile(dir_it->path(), dst_path, test_mode, *root_meta);
         }
     }
+    root_meta->next();
+    root_meta->finalize();
 }
 }
 
@@ -94,7 +155,7 @@ try
         exit(0);
     }
 
-    String url, metadata_path;
+    String metadata_path;
 
     if (options.count("metadata-path"))
         metadata_path = options["metadata-path"].as<std::string>();
@@ -108,28 +169,14 @@ try
         return 1;
     }
 
-    String uuid;
-    if (!RE2::Extract(metadata_path, EXTRACT_UUID_PATTERN, "\\1", &uuid))
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot extract uuid for: {}", metadata_path);
-
-    std::shared_ptr<WriteBuffer> metadata_buf;
-    std::function<std::shared_ptr<WriteBuffer>(const String &)> create_dst_buf;
     String root_path;
-
     auto test_mode = options.contains("test-mode");
     if (test_mode)
     {
         if (options.count("url"))
-            url = options["url"].as<std::string>();
+            root_path = options["url"].as<std::string>();
         else
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "No url option passed for test mode");
-
-        metadata_buf = std::make_shared<WriteBufferFromHTTP>(Poco::URI(fs::path(url) / (".index-" + uuid)), Poco::Net::HTTPRequest::HTTP_PUT);
-
-        create_dst_buf = [&](const String & remote_file_name)
-        {
-            return std::make_shared<WriteBufferFromHTTP>(Poco::URI(fs::path(url) / remote_file_name), Poco::Net::HTTPRequest::HTTP_PUT);
-        };
     }
     else
     {
@@ -137,17 +184,9 @@ try
             root_path = options["output-dir"].as<std::string>();
         else
             root_path = fs::current_path();
-
-        metadata_buf = std::make_shared<WriteBufferFromFile>(fs::path(root_path) / (".index-" + uuid));
-        create_dst_buf = [&](const String & remote_file_name)
-        {
-            return std::make_shared<WriteBufferFromFile>(fs::path(root_path) / remote_file_name);
-        };
     }
 
-    processTableFiles(fs_path, root_path, uuid, *metadata_buf, create_dst_buf);
-    metadata_buf->next();
-    metadata_buf->finalize();
+    processTableFiles(fs_path, root_path, test_mode);
 
     return 0;
 }
diff --git a/src/Disks/DiskWebServer.cpp b/src/Disks/DiskWebServer.cpp
index 925fe5971d6..10172550987 100644
--- a/src/Disks/DiskWebServer.cpp
+++ b/src/Disks/DiskWebServer.cpp
@@ -17,14 +17,6 @@
 #include <re2/re2.h>
 
 
-#define UUID_PATTERN "[\\w]{8}-[\\w]{4}-[\\w]{4}-[\\w]{4}-[\\w]{12}"
-#define EXTRACT_UUID_PATTERN fmt::format(".*/({})\\/.*", UUID_PATTERN)
-
-#define MATCH_DIRECTORY_FILE_PATTERN fmt::format(".*({})\\/(\\w+)\\/(.*)", UUID_PATTERN)
-#define MATCH_DIRECTORY_PATTERN fmt::format(".*({})\\/(\\w+)\\/", UUID_PATTERN)
-#define MATCH_ROOT_FILE_PATTERN fmt::format(".*({})\\/(\\w+\\.\\w+)", UUID_PATTERN)
-
-
 namespace DB
 {
 
@@ -33,84 +25,82 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
     extern const int LOGICAL_ERROR;
     extern const int NETWORK_ERROR;
+    extern const int FILE_DOESNT_EXIST;
+    extern const int DIRECTORY_DOESNT_EXIST;
 }
 
 
-void DiskWebServer::Metadata::initialize(const String & uri_with_path, const String & table_uuid, ContextPtr context) const
+void DiskWebServer::initialize(const String & uri_path) const
 {
-    ReadWriteBufferFromHTTP metadata_buf(Poco::URI(fs::path(uri_with_path) / (".index-" + table_uuid)),
-                                         Poco::Net::HTTPRequest::HTTP_GET,
-                                         ReadWriteBufferFromHTTP::OutStreamCallback(),
-                                         ConnectionTimeouts::getHTTPTimeouts(context));
-    String uuid, directory, file, remote_file_name;
-    size_t file_size;
-
-    while (!metadata_buf.eof())
+    std::vector<String> directories_to_load;
+    LOG_TRACE(log, "Loading metadata for directory: {}", uri_path);
+    try
     {
-        readText(remote_file_name, metadata_buf);
-        assertChar('\t', metadata_buf);
-        readIntText(file_size, metadata_buf);
-        assertChar('\n', metadata_buf);
-        LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Read file: {}, size: {}", remote_file_name, file_size);
+        ReadWriteBufferFromHTTP metadata_buf(Poco::URI(fs::path(uri_path) / ".index"),
+                                            Poco::Net::HTTPRequest::HTTP_GET,
+                                            ReadWriteBufferFromHTTP::OutStreamCallback(),
+                                            ConnectionTimeouts::getHTTPTimeouts(getContext()));
+        String file_name;
+        FileData file_data;
 
-        /*
-         * URI/   {uri}/{uuid}/all_x_x_x/{file}
-         *        ...
-         *        {uri}/{uuid}/format_version.txt
-         *        {uri}/{uuid}/detached-{file}
-         *        ...
-        **/
-        if (RE2::FullMatch(remote_file_name, MATCH_DIRECTORY_FILE_PATTERN, &uuid, &directory, &file))
+        String dir_name = fs::path(uri_path.substr(url.size())) / "";
+        LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Adding directory: {}", dir_name);
+
+        while (!metadata_buf.eof())
         {
-            if (uuid != table_uuid)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected uuid: {}, expected: {}", uuid, table_uuid);
+            readText(file_name, metadata_buf);
+            assertChar('\t', metadata_buf);
 
-            tables_data[uuid][directory].emplace(std::make_pair(file, file_size));
-        }
-        else if (RE2::FullMatch(remote_file_name, MATCH_ROOT_FILE_PATTERN, &uuid, &file))
-        {
-            if (uuid != table_uuid)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected uuid: {}, expected: {}", uuid, table_uuid);
+            bool is_directory;
+            readBoolText(is_directory, metadata_buf);
+            if (!is_directory)
+            {
+                assertChar('\t', metadata_buf);
+                readIntText(file_data.size, metadata_buf);
+            }
+            assertChar('\n', metadata_buf);
 
-            tables_data[uuid][file].emplace(std::make_pair(file, file_size));
+            file_data.type = is_directory ? FileType::Directory : FileType::File;
+            String file_path = fs::path(uri_path) / file_name;
+            if(file_data.type == FileType::Directory)
+                directories_to_load.push_back(file_path);
+            file_path = file_path.substr(url.size());
+
+            files.emplace(std::make_pair(file_path, file_data));
+            LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Adding file: {}, size: {}", file_path, file_data.size);
         }
-        else
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected file: {}", remote_file_name);
+
+        LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Adding directory: {}", dir_name);
+        files.emplace(std::make_pair(dir_name, FileData({ .type = FileType::Directory })));
     }
+    catch (Exception & e)
+    {
+        e.addMessage("while loadng disk metadata");
+        throw;
+    }
+
+    for (const auto & directory_path : directories_to_load)
+        initialize(directory_path);
 }
 
 
-template <typename Directory>
-class DiskWebDirectoryIterator final : public IDiskDirectoryIterator
+class DiskWebServerDirectoryIterator final : public IDiskDirectoryIterator
 {
 public:
-
-    DiskWebDirectoryIterator(Directory & directory_, const String & directory_root_)
-        : directory(directory_), iter(directory.begin()), directory_root(directory_root_)
-    {
-    }
+    explicit DiskWebServerDirectoryIterator(std::vector<fs::path> && dir_file_paths_)
+        : dir_file_paths(std::move(dir_file_paths_)), iter(dir_file_paths.begin()) {}
 
     void next() override { ++iter; }
 
-    bool isValid() const override
-    {
-        return iter != directory.end();
-    }
+    bool isValid() const override { return iter != dir_file_paths.end(); }
 
-    String path() const override
-    {
-        return fs::path(directory_root) / name();
-    }
+    String path() const override { return iter->string(); }
 
-    String name() const override
-    {
-        return iter->first;
-    }
+    String name() const override { return iter->filename(); }
 
 private:
-    Directory & directory;
-    typename Directory::iterator iter;
-    const String directory_root;
+    std::vector<fs::path> dir_file_paths;
+    std::vector<fs::path>::iterator iter;
 };
 
 
@@ -146,177 +136,95 @@ private:
 
 DiskWebServer::DiskWebServer(
             const String & disk_name_,
-            const String & uri_,
-            const String & metadata_path_,
+            const String & url_,
+            const String &,
             ContextPtr context_,
             SettingsPtr settings_)
         : WithContext(context_->getGlobalContext())
         , log(&Poco::Logger::get("DiskWeb"))
-        , uri(uri_)
+        , url(url_)
         , name(disk_name_)
-        , metadata_path(metadata_path_)
+        , metadata_path(url)
         , settings(std::move(settings_))
 {
 }
 
 
-String DiskWebServer::getFileName(const String & path)
-{
-    String result;
-
-    if (RE2::FullMatch(path, MATCH_DIRECTORY_FILE_PATTERN)
-        && RE2::Extract(path, MATCH_DIRECTORY_FILE_PATTERN, R"(\1/\2/\3)", &result))
-        return result;
-
-    if (RE2::FullMatch(path, MATCH_ROOT_FILE_PATTERN)
-        && RE2::Extract(path, MATCH_ROOT_FILE_PATTERN, R"(\1/\2)", &result))
-        return result;
-
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected file: {}", path);
-}
-
-
-bool DiskWebServer::findFileInMetadata(const String & path, File & file_info) const
-{
-    String table_uuid, directory_name, file_name;
-
-    if (RE2::FullMatch(path, MATCH_DIRECTORY_FILE_PATTERN, &table_uuid, &directory_name, &file_name)
-       || RE2::FullMatch(path, MATCH_ROOT_FILE_PATTERN, &table_uuid, &file_name)
-       || RE2::FullMatch(path, MATCH_DIRECTORY_PATTERN, &table_uuid, &directory_name))
-    {
-        if (directory_name.empty())
-            directory_name = file_name;
-
-        if (!metadata.tables_data.count(table_uuid))
-            return false;
-
-        try
-        {
-            if (!metadata.tables_data.count(table_uuid))
-                metadata.initialize(uri, table_uuid, getContext());
-        }
-        catch (const Poco::Exception &)
-        {
-            const auto message = getCurrentExceptionMessage(false);
-            bool can_throw = CurrentThread::isInitialized() && CurrentThread::get().getQueryContext();
-            if (can_throw)
-                throw Exception(ErrorCodes::NETWORK_ERROR, "Cannot load disk metadata. Error: {}", message);
-
-            LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Cannot load disk metadata. Error: {}", message);
-            return false;
-        }
-
-        if (!metadata.tables_data[table_uuid].count(directory_name))
-            return false;
-
-        if (file_name.empty())
-            return true;
-
-        const auto & files = metadata.tables_data[table_uuid][directory_name];
-        auto file = files.find(file_name);
-        if (file == files.end())
-            return false;
-
-        file_info = File(file->first, file->second);
-        return true;
-    }
-
-    return false;
-}
-
-
 bool DiskWebServer::exists(const String & path) const
 {
-    LOG_TRACE(log, "Checking existence of file: {}", path);
-
-    File file;
-    return findFileInMetadata(path, file);
+    LOG_TRACE(log, "Checkig existance of path: {}", path);
+    // if (files.find(path) == files.end())
+    //     initialize(fs::path(url) / path);
+    return files.find(path) != files.end();
 }
 
 
 std::unique_ptr<ReadBufferFromFileBase> DiskWebServer::readFile(const String & path, const ReadSettings & read_settings, size_t) const
 {
+    LOG_TRACE(log, "Read from path: {}", path);
+    auto iter = files.find(path);
+    if (iter == files.end())
+        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "File path {} does not exist", path);
 
-    File file;
-    if (!findFileInMetadata(path, file))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "File {} not found", path);
+    auto fs_path = fs::path(url) / path;
+    auto remote_path = fs_path.parent_path() / (escapeForFileName(fs_path.stem()) + fs_path.extension().string());
+    remote_path = remote_path.string().substr(url.size());
 
-    auto file_name = escapeForFileName(fs::path(path).stem()) + fs::path(path).extension().string();
-    auto remote_path = fs::path(path).parent_path() / file_name;
-    LOG_TRACE(log, "Read from file by path: {}", remote_path.string());
+    RemoteMetadata meta(path, remote_path);
+    meta.remote_fs_objects.emplace_back(std::make_pair(remote_path, iter->second.size));
 
-    RemoteMetadata meta(uri, remote_path);
-    meta.remote_fs_objects.emplace_back(std::make_pair(getFileName(remote_path), file.size));
-
-    auto reader = std::make_unique<ReadBufferFromWebServer>(uri, meta, getContext(), settings->max_read_tries, read_settings.remote_fs_buffer_size);
+    auto reader = std::make_unique<ReadBufferFromWebServer>(url, meta, getContext(), settings->max_read_tries, read_settings.remote_fs_buffer_size);
     return std::make_unique<SeekAvoidingReadBuffer>(std::move(reader), settings->min_bytes_for_seek);
 }
 
 
 DiskDirectoryIteratorPtr DiskWebServer::iterateDirectory(const String & path)
 {
-    LOG_TRACE(log, "Iterate directory: {}", path);
-    String uuid;
+    if (files.find(path) == files.end())
+        initialize(fs::path(url) / path);
 
-    if (RE2::FullMatch(path, ".*/store/"))
-        return std::make_unique<DiskWebDirectoryIterator<UUIDDirectoryListing>>(metadata.tables_data, path);
+    if (files.find(path) == files.end())
+        throw Exception("Directory '" + path + "' does not exist", ErrorCodes::DIRECTORY_DOESNT_EXIST);
 
-    if (!RE2::Extract(path, EXTRACT_UUID_PATTERN, "\\1", &uuid))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot extract uuid for: {}", path);
+    std::vector<fs::path> dir_file_paths;
+    for (const auto & file : files)
+        if (parentPath(file.first) == path)
+            dir_file_paths.emplace_back(file.first);
 
-    /// Do not throw if it is not a query, but disk load.
-    bool can_throw = CurrentThread::isInitialized() && CurrentThread::get().getQueryContext();
-
-    try
-    {
-        if (!metadata.tables_data.count(uuid))
-            metadata.initialize(uri, uuid, getContext());
-    }
-    catch (const Poco::Exception &)
-    {
-        const auto message = getCurrentExceptionMessage(false);
-        if (can_throw)
-        {
-            throw Exception(ErrorCodes::NETWORK_ERROR, "Cannot load disk metadata. Error: {}", message);
-        }
-
-        LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Cannot load disk metadata. Error: {}", message);
-        /// Empty iterator.
-        return std::make_unique<DiskWebDirectoryIterator<RootDirectoryListing>>(metadata.tables_data[""], path);
-    }
-
-    String directory_name;
-    if (RE2::FullMatch(path, MATCH_DIRECTORY_PATTERN, &uuid, &directory_name))
-    {
-        if (metadata.tables_data[uuid].contains(directory_name))
-            return std::make_unique<DiskWebDirectoryIterator<DirectoryListing>>(metadata.tables_data[uuid][directory_name], path);
-        if (can_throw)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Directory {} does not exist. (uuid: {})", directory_name, uuid);
-        return std::make_unique<DiskWebDirectoryIterator<RootDirectoryListing>>(metadata.tables_data[""], path); /// Empty directory.
-    }
-
-    return std::make_unique<DiskWebDirectoryIterator<RootDirectoryListing>>(metadata.tables_data[uuid], path);
+    LOG_TRACE(log, "Iterate directory {} with {} files", path, dir_file_paths.size());
+    if (dir_file_paths.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "EMpty dir: {}", path);
+    return std::make_unique<DiskWebServerDirectoryIterator>(std::move(dir_file_paths));
 }
 
 
 size_t DiskWebServer::getFileSize(const String & path) const
 {
-    File file;
-    if (!findFileInMetadata(path, file))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "File {} not found", path);
-    return file.size;
+    auto iter = files.find(path);
+    if (iter == files.end())
+        return false;
+
+    return iter->second.size;
 }
 
 
 bool DiskWebServer::isFile(const String & path) const
 {
-    return RE2::FullMatch(path, ".*/\\w+.\\w+");
+    auto iter = files.find(path);
+    if (iter == files.end())
+        return false;
+
+    return iter->second.type == FileType::File;
 }
 
 
 bool DiskWebServer::isDirectory(const String & path) const
 {
-    return RE2::FullMatch(path, ".*/\\w+");
+    auto iter = files.find(path);
+    if (iter == files.end())
+        return false;
+
+    return iter->second.type == FileType::Directory;
 }
 
 
diff --git a/src/Disks/DiskWebServer.h b/src/Disks/DiskWebServer.h
index c023ba6c6b7..3bdf122e8ad 100644
--- a/src/Disks/DiskWebServer.h
+++ b/src/Disks/DiskWebServer.h
@@ -66,45 +66,8 @@ public:
                   ContextPtr context,
                   SettingsPtr settings_);
 
-    struct File
-    {
-        String name;
-        size_t size;
-        File(const String & name_ = "", const size_t size_ = 0) : name(name_), size(size_) {}
-    };
-
-    using Directory = std::unordered_map<String, size_t>;
-
-    /* Each root directory contains either directories like
-     * all_x_x_x/{file}, detached/, etc, or root files like format_version.txt.
-     */
-    using RootDirectory = std::unordered_map<String, Directory>;
-
-    /* Each table is attached via ATTACH TABLE table UUID <uuid> <def>.
-     * Then there is a mapping: {table uuid} -> {root directory}
-     */
-    using TableDirectories = std::unordered_map<String, RootDirectory>;
-
-    struct Metadata
-    {
-        /// Fetch meta only when required.
-        mutable TableDirectories tables_data;
-
-        Metadata() = default;
-
-        void initialize(const String & uri_with_path, const String & uuid, ContextPtr context) const;
-    };
-
-    using UUIDDirectoryListing = std::unordered_map<String, RootDirectory>;
-    using RootDirectoryListing = std::unordered_map<String, Directory>;
-    using DirectoryListing = std::unordered_map<String, size_t>;
-
-    bool findFileInMetadata(const String & path, File & file_info) const;
-
     bool supportZeroCopyReplication() const override { return false; }
 
-    static String getFileName(const String & path);
-
     DiskType getType() const override { return DiskType::WebServer; }
 
     bool isRemote() const override { return true; }
@@ -223,13 +186,28 @@ public:
     void createHardLink(const String &, const String &) override {}
 
 private:
+    void initialize(const String & uri_path) const;
+
+    enum class FileType
+    {
+        File = 1,
+        Directory = 2
+    };
+
+    struct FileData
+    {
+        FileType type;
+        size_t size;
+    };
+
+    using Files = std::unordered_map<String, FileData>; /// file path -> file data
+    mutable Files files;
 
     Poco::Logger * log;
-    String uri, name;
+    String url;
+    String name;
     const String metadata_path;
     SettingsPtr settings;
-
-    Metadata metadata;
 };
 
 }
diff --git a/utils/s3tools/s3uploader b/utils/s3tools/s3uploader
index 45b14c9a26e..0627b19ea8f 100755
--- a/utils/s3tools/s3uploader
+++ b/utils/s3tools/s3uploader
@@ -8,6 +8,7 @@ import math
 
 try:
     from boto.s3.connection import S3Connection
+    from boto.s3.key import Key
 except ImportError:
     raise ImportError("You have to install boto package 'pip install boto'")
 
@@ -63,28 +64,24 @@ class S3API(object):
         key.set_contents_from_filename(local_file_path, cb=call_back)
 
     def upload_data_for_static_files_disk(self, bucket_name, directory_path, s3_path):
-        logging.info("Will upload files to bucket '%s' from directory '%s' to s3 path '%s'", bucket_name, directory_path, s3_path)
         bucket = self.connection.get_bucket(bucket_name)
-        for file_name in os.listdir(directory_path):
-            if file_name.startswith('.index'):
-                local_file_path = os.path.join(directory_path, file_name)
-                s3_file_path = os.path.join(s3_path, file_name)
+        if s3_path.endswith("/"):
+            s3_path += "store/"
+        else:
+            s3_path += "/store/"
+        print(s3_path)
+        for root, dirs, files in os.walk(directory_path):
+            path = root.split(os.sep)
+            for file in files:
+                local_file_path = os.path.join(root, file)
+                s3_file = local_file_path[len(directory_path) + 1:]
+                s3_file_path = os.path.join(s3_path, s3_file)
                 self.set_file_contents(bucket, local_file_path, s3_file_path)
 
-                file_path = os.path.join(directory_path, file_name)
-                with open(file_path) as file:
-                    lines = file.readlines()
-                    files = [line.rstrip() for line in lines]
-                    for file_line in files:
-                        file_path = file_line.split('\t')[0]
-                        s3_file_path = os.path.join(s3_path, file_path)
-                        local_file_path = os.path.join(directory_path, file_path)
-                        self.set_file_contents(bucket, local_file_path, s3_file_path)
-
         logging.info("Uploading finished")
         return "https://{bucket}.{mds_url}/{path}".format(bucket=bucket_name, mds_url=self.mds_url, path=s3_path)
 
-    def list_bucket_keys(self, bucket_name, s3_path):
+    def list_bucket_keys(self, bucket_name):
         bucket = self.connection.get_bucket(bucket_name)
         for obj in bucket.get_all_keys():
             print(obj.key)
@@ -156,20 +153,17 @@ if __name__ == "__main__":
         args.s3_api_url, args.s3_common_url)
 
     file_path = ''
-    directory_path = ''
+    directory_path = args.directory_path
     s3_path = args.s3_path
 
-    if args.s3_path and args.list_directory:
-        s3_conn.list_bucket_keys(args.bucket_name, s3_path)
+    if args.list_directory:
+        s3_conn.list_bucket_keys(args.bucket_name)
+    elif args.remove_directory:
+        print('Removing s3 path: ' + args.remove_directory)
+        s3_conn.remove_folder_from_bucket(args.bucket_name, args.remove_directory)
     elif args.directory_path is not None:
-        directory_path = args.directory_path
-
-        if args.remove_directory:
-            print('Removing s3 path: ' + args.remove_directory)
-            s3_conn.remove_folder_from_bucket(args.bucket_name, args.remove_directory)
-        else:
-            url = s3_conn.upload_data_for_static_files_disk(args.bucket_name, directory_path, s3_path)
-            logging.info("Data uploaded: %s", url)
+        url = s3_conn.upload_data_for_static_files_disk(args.bucket_name, directory_path, s3_path)
+        logging.info("Data uploaded: %s", url)
     else:
 
         if args.table_name is not None:

From dcf7cb4a5c9e775922e23b23d903d74abdc12480 Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <mikhaylovnikitka@gmail.com>
Date: Wed, 8 Sep 2021 17:33:40 +0000
Subject: [PATCH 093/273] Done

---
 cmake/warnings.cmake                          | 11 +++++++++++
 contrib/fastops                               |  2 +-
 contrib/llvm                                  |  2 +-
 contrib/rocksdb                               |  2 +-
 src/Compression/CompressionCodecEncrypted.cpp |  2 +-
 tests/ci/ci_config.json                       |  2 +-
 6 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/cmake/warnings.cmake b/cmake/warnings.cmake
index a85fe8963c7..38524acaff6 100644
--- a/cmake/warnings.cmake
+++ b/cmake/warnings.cmake
@@ -191,5 +191,16 @@ elseif (COMPILER_GCC)
         #     34 |   return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest));
         # For some reason (bug in gcc?) macro 'GCC diagnostic ignored "-Wstringop-overflow"' doesn't help.
         add_cxx_compile_options(-Wno-stringop-overflow)
+        # reinterpretAs.cpp:182:31: error: ‘void* memcpy(void*, const void*, size_t)’ copying an object of non-trivial type
+        # ‘using ToFieldType = using FieldType = using UUID = struct StrongTypedef<wide::integer<128, unsigned int>, DB::UUIDTag>’
+        # {aka ‘struct StrongTypedef<wide::integer<128, unsigned int>, DB::UUIDTag>’} from an array of ‘const char8_t’
+        add_cxx_compile_options(-Wno-error=class-memaccess)
+    endif()
+
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 11)
+        # reinterpretAs.cpp:182:31: error: ‘void* memcpy(void*, const void*, size_t)’ copying an object of non-trivial type
+        # ‘using ToFieldType = using FieldType = using UUID = struct StrongTypedef<wide::integer<128, unsigned int>, DB::UUIDTag>’
+        # {aka ‘struct StrongTypedef<wide::integer<128, unsigned int>, DB::UUIDTag>’} from an array of ‘const char8_t’
+        add_cxx_compile_options(-Wno-error=class-memaccess)
     endif()
 endif ()
diff --git a/contrib/fastops b/contrib/fastops
index 88752a5e03c..ac7ca889858 160000
--- a/contrib/fastops
+++ b/contrib/fastops
@@ -1 +1 @@
-Subproject commit 88752a5e03cf34639a4a37a4b41d8b463fffd2b5
+Subproject commit ac7ca8898589f63f0e7e904199469730d96aefa5
diff --git a/contrib/llvm b/contrib/llvm
index e5751459412..80b3a6fd1be 160000
--- a/contrib/llvm
+++ b/contrib/llvm
@@ -1 +1 @@
-Subproject commit e5751459412bce1391fb7a2e9bbc01e131bf72f1
+Subproject commit 80b3a6fd1be8249f613b945ff49c24d3ee31d6e6
diff --git a/contrib/rocksdb b/contrib/rocksdb
index b6480c69bf3..22690ed890f 160000
--- a/contrib/rocksdb
+++ b/contrib/rocksdb
@@ -1 +1 @@
-Subproject commit b6480c69bf3ab6e298e0d019a07fd4f69029b26a
+Subproject commit 22690ed890fc99873089abcdfc0977182e757c91
diff --git a/src/Compression/CompressionCodecEncrypted.cpp b/src/Compression/CompressionCodecEncrypted.cpp
index 47f93eb6202..7d667fbc1b7 100644
--- a/src/Compression/CompressionCodecEncrypted.cpp
+++ b/src/Compression/CompressionCodecEncrypted.cpp
@@ -106,7 +106,7 @@ namespace DB
 
     std::string CompressionCodecEncrypted::lastErrorString()
     {
-        std::array<char, 1024> buffer;
+        std::array<char, 1024> buffer{};
         ERR_error_string_n(ERR_get_error(), buffer.data(), buffer.size());
         return std::string(buffer.data());
     }
diff --git a/tests/ci/ci_config.json b/tests/ci/ci_config.json
index cbae9a86fdf..fbb2c1d41a9 100644
--- a/tests/ci/ci_config.json
+++ b/tests/ci/ci_config.json
@@ -12,7 +12,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-12",
+            "compiler": "gcc-11",
             "build-type": "",
             "sanitizer": "",
             "package-type": "performance",

From 9816014f6c08d2e6132f71ae5b06cdf2a2586886 Mon Sep 17 00:00:00 2001
From: Anton Popov <pad11rus@gmail.com>
Date: Wed, 8 Sep 2021 21:42:34 +0300
Subject: [PATCH 094/273] fix nested and scalar columns with dot, which is
 missed in part

---
 src/Storages/MergeTree/IMergeTreeReader.cpp    |  5 +++--
 .../02017_columns_with_dot_2.reference         |  2 ++
 .../0_stateless/02017_columns_with_dot_2.sql   | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 tests/queries/0_stateless/02017_columns_with_dot_2.reference
 create mode 100644 tests/queries/0_stateless/02017_columns_with_dot_2.sql

diff --git a/src/Storages/MergeTree/IMergeTreeReader.cpp b/src/Storages/MergeTree/IMergeTreeReader.cpp
index d659259e1a9..41de5784d55 100644
--- a/src/Storages/MergeTree/IMergeTreeReader.cpp
+++ b/src/Storages/MergeTree/IMergeTreeReader.cpp
@@ -135,10 +135,11 @@ void IMergeTreeReader::fillMissingColumns(Columns & res_columns, bool & should_e
 
                 String offsets_name = Nested::extractTableName(name);
                 auto offset_it = offset_columns.find(offsets_name);
-                if (offset_it != offset_columns.end())
+                const auto * array_type = typeid_cast<const DataTypeArray *>(type.get());
+                if (offset_it != offset_columns.end() && array_type)
                 {
                     ColumnPtr offsets_column = offset_it->second;
-                    DataTypePtr nested_type = typeid_cast<const DataTypeArray &>(*type).getNestedType();
+                    DataTypePtr nested_type = array_type->getNestedType();
                     size_t nested_rows = typeid_cast<const ColumnUInt64 &>(*offsets_column).getData().back();
 
                     ColumnPtr nested_column =
diff --git a/tests/queries/0_stateless/02017_columns_with_dot_2.reference b/tests/queries/0_stateless/02017_columns_with_dot_2.reference
new file mode 100644
index 00000000000..8d43601632c
--- /dev/null
+++ b/tests/queries/0_stateless/02017_columns_with_dot_2.reference
@@ -0,0 +1,2 @@
+123	asd	[1,2]
+123	asd	[1,2]	0
diff --git a/tests/queries/0_stateless/02017_columns_with_dot_2.sql b/tests/queries/0_stateless/02017_columns_with_dot_2.sql
new file mode 100644
index 00000000000..eefe52b74f3
--- /dev/null
+++ b/tests/queries/0_stateless/02017_columns_with_dot_2.sql
@@ -0,0 +1,18 @@
+DROP TABLE IF EXISTS test_nested;
+
+CREATE TABLE test_nested
+(
+    `id` String,
+    `with_dot.str` String,
+    `with_dot.array` Array(Int32)
+)
+ENGINE = MergeTree()
+ORDER BY id;
+
+INSERT INTO test_nested VALUES('123', 'asd', [1,2]);
+SELECT * FROM test_nested;
+
+ALTER TABLE test_nested ADD COLUMN `with_dot.bool` UInt8;
+SELECT * FROM test_nested;
+
+DROP TABLE test_nested;

From 7345ad8e09709361e3297b155453dd5478368e3e Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Wed, 8 Sep 2021 22:40:26 +0300
Subject: [PATCH 095/273] Add no throw

---
 src/Disks/DiskWebServer.cpp | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/Disks/DiskWebServer.cpp b/src/Disks/DiskWebServer.cpp
index 10172550987..e1cd12950b3 100644
--- a/src/Disks/DiskWebServer.cpp
+++ b/src/Disks/DiskWebServer.cpp
@@ -24,9 +24,9 @@ namespace ErrorCodes
 {
     extern const int BAD_ARGUMENTS;
     extern const int LOGICAL_ERROR;
-    extern const int NETWORK_ERROR;
     extern const int FILE_DOESNT_EXIST;
     extern const int DIRECTORY_DOESNT_EXIST;
+    extern const int NETWORK_ERROR;
 }
 
 
@@ -62,7 +62,7 @@ void DiskWebServer::initialize(const String & uri_path) const
 
             file_data.type = is_directory ? FileType::Directory : FileType::File;
             String file_path = fs::path(uri_path) / file_name;
-            if(file_data.type == FileType::Directory)
+            if (file_data.type == FileType::Directory)
                 directories_to_load.push_back(file_path);
             file_path = file_path.substr(url.size());
 
@@ -152,9 +152,7 @@ DiskWebServer::DiskWebServer(
 
 bool DiskWebServer::exists(const String & path) const
 {
-    LOG_TRACE(log, "Checkig existance of path: {}", path);
-    // if (files.find(path) == files.end())
-    //     initialize(fs::path(url) / path);
+    /// TODO: Actually on server startup we always return false for format_version.txt.
     return files.find(path) != files.end();
 }
 
@@ -180,20 +178,33 @@ std::unique_ptr<ReadBufferFromFileBase> DiskWebServer::readFile(const String & p
 
 DiskDirectoryIteratorPtr DiskWebServer::iterateDirectory(const String & path)
 {
+    std::vector<fs::path> dir_file_paths;
     if (files.find(path) == files.end())
-        initialize(fs::path(url) / path);
+    {
+        try
+        {
+            initialize(fs::path(url) / path);
+        }
+        catch (...)
+        {
+            const auto message = getCurrentExceptionMessage(false);
+            bool can_throw = CurrentThread::isInitialized() && CurrentThread::get().getQueryContext();
+            if (can_throw)
+                throw Exception(ErrorCodes::NETWORK_ERROR, "Cannot load disk metadata. Error: {}", message);
+
+            LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Cannot load disk metadata. Error: {}", message);
+            return std::make_unique<DiskWebServerDirectoryIterator>(std::move(dir_file_paths));
+        }
+    }
 
     if (files.find(path) == files.end())
         throw Exception("Directory '" + path + "' does not exist", ErrorCodes::DIRECTORY_DOESNT_EXIST);
 
-    std::vector<fs::path> dir_file_paths;
     for (const auto & file : files)
         if (parentPath(file.first) == path)
             dir_file_paths.emplace_back(file.first);
 
     LOG_TRACE(log, "Iterate directory {} with {} files", path, dir_file_paths.size());
-    if (dir_file_paths.empty())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "EMpty dir: {}", path);
     return std::make_unique<DiskWebServerDirectoryIterator>(std::move(dir_file_paths));
 }
 

From 1101ee7808251576e5d644a31fc452f008c5ef61 Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Wed, 8 Sep 2021 22:43:46 +0300
Subject: [PATCH 096/273] Update example

---
 src/Disks/DiskWebServer.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Disks/DiskWebServer.h b/src/Disks/DiskWebServer.h
index 3bdf122e8ad..94f0644fb0d 100644
--- a/src/Disks/DiskWebServer.h
+++ b/src/Disks/DiskWebServer.h
@@ -26,14 +26,14 @@ struct DiskWebServerSettings
 
 
 /*
- * Quick ready test: ATTACH TABLE test_hits UUID 'dbeecc07-58f3-4e89-9bee-cc0758f34e89' ( WatchID UInt64, JavaEnable UInt8, Title String, GoodEvent Int16, EventTime DateTime, EventDate Date, CounterID UInt32, ClientIP UInt32, ClientIP6 FixedString(16), RegionID UInt32, UserID UInt64, CounterClass Int8, OS UInt8, UserAgent UInt8, URL String, Referer String, URLDomain String, RefererDomain String, Refresh UInt8, IsRobot UInt8, RefererCategories Array(UInt16), URLCategories Array(UInt16), URLRegions Array(UInt32), RefererRegions Array(UInt32), ResolutionWidth UInt16, ResolutionHeight UInt16, ResolutionDepth UInt8, FlashMajor UInt8, FlashMinor UInt8, FlashMinor2 String, NetMajor UInt8, NetMinor UInt8, UserAgentMajor UInt16, UserAgentMinor FixedString(2), CookieEnable UInt8, JavascriptEnable UInt8, IsMobile UInt8, MobilePhone UInt8, MobilePhoneModel String, Params String, IPNetworkID UInt32, TraficSourceID Int8, SearchEngineID UInt16, SearchPhrase String, AdvEngineID UInt8, IsArtifical UInt8, WindowClientWidth UInt16, WindowClientHeight UInt16, ClientTimeZone Int16, ClientEventTime DateTime, SilverlightVersion1 UInt8, SilverlightVersion2 UInt8, SilverlightVersion3 UInt32, SilverlightVersion4 UInt16, PageCharset String, CodeVersion UInt32, IsLink UInt8, IsDownload UInt8, IsNotBounce UInt8, FUniqID UInt64, HID UInt32, IsOldCounter UInt8, IsEvent UInt8, IsParameter UInt8, DontCountHits UInt8, WithHash UInt8, HitColor FixedString(1), UTCEventTime DateTime, Age UInt8, Sex UInt8, Income UInt8, Interests UInt16, Robotness UInt8, GeneralInterests Array(UInt16), RemoteIP UInt32, RemoteIP6 FixedString(16), WindowName Int32, OpenerName Int32, HistoryLength Int16, BrowserLanguage FixedString(2), BrowserCountry FixedString(2), SocialNetwork String, SocialAction String, HTTPError UInt16, SendTiming Int32, DNSTiming Int32, ConnectTiming Int32, ResponseStartTiming Int32, ResponseEndTiming Int32, FetchTiming Int32, RedirectTiming Int32, DOMInteractiveTiming Int32, DOMContentLoadedTiming Int32, DOMCompleteTiming Int32, LoadEventStartTiming Int32, LoadEventEndTiming Int32, NSToDOMContentLoadedTiming Int32, FirstPaintTiming Int32, RedirectCount Int8, SocialSourceNetworkID UInt8, SocialSourcePage String, ParamPrice Int64, ParamOrderID String, ParamCurrency FixedString(3), ParamCurrencyID UInt16, GoalsReached Array(UInt32), OpenstatServiceName String, OpenstatCampaignID String, OpenstatAdID String, OpenstatSourceID String, UTMSource String, UTMMedium String, UTMCampaign String, UTMContent String, UTMTerm String, FromTag String, HasGCLID UInt8, RefererHash UInt64, URLHash UInt64, CLID UInt32, YCLID UInt64, ShareService String, ShareURL String, ShareTitle String, ParsedParams Nested(Key1 String, Key2 String, Key3 String, Key4 String, Key5 String, ValueDouble Float64), IslandID FixedString(16), RequestNum UInt32, RequestTry UInt8)
+ * Quick ready test: ATTACH TABLE test_hits UUID '1ae36516-d62d-4218-9ae3-6516d62da218' ( WatchID UInt64, JavaEnable UInt8, Title String, GoodEvent Int16, EventTime DateTime, EventDate Date, CounterID UInt32, ClientIP UInt32, ClientIP6 FixedString(16), RegionID UInt32, UserID UInt64, CounterClass Int8, OS UInt8, UserAgent UInt8, URL String, Referer String, URLDomain String, RefererDomain String, Refresh UInt8, IsRobot UInt8, RefererCategories Array(UInt16), URLCategories Array(UInt16), URLRegions Array(UInt32), RefererRegions Array(UInt32), ResolutionWidth UInt16, ResolutionHeight UInt16, ResolutionDepth UInt8, FlashMajor UInt8, FlashMinor UInt8, FlashMinor2 String, NetMajor UInt8, NetMinor UInt8, UserAgentMajor UInt16, UserAgentMinor FixedString(2), CookieEnable UInt8, JavascriptEnable UInt8, IsMobile UInt8, MobilePhone UInt8, MobilePhoneModel String, Params String, IPNetworkID UInt32, TraficSourceID Int8, SearchEngineID UInt16, SearchPhrase String, AdvEngineID UInt8, IsArtifical UInt8, WindowClientWidth UInt16, WindowClientHeight UInt16, ClientTimeZone Int16, ClientEventTime DateTime, SilverlightVersion1 UInt8, SilverlightVersion2 UInt8, SilverlightVersion3 UInt32, SilverlightVersion4 UInt16, PageCharset String, CodeVersion UInt32, IsLink UInt8, IsDownload UInt8, IsNotBounce UInt8, FUniqID UInt64, HID UInt32, IsOldCounter UInt8, IsEvent UInt8, IsParameter UInt8, DontCountHits UInt8, WithHash UInt8, HitColor FixedString(1), UTCEventTime DateTime, Age UInt8, Sex UInt8, Income UInt8, Interests UInt16, Robotness UInt8, GeneralInterests Array(UInt16), RemoteIP UInt32, RemoteIP6 FixedString(16), WindowName Int32, OpenerName Int32, HistoryLength Int16, BrowserLanguage FixedString(2), BrowserCountry FixedString(2), SocialNetwork String, SocialAction String, HTTPError UInt16, SendTiming Int32, DNSTiming Int32, ConnectTiming Int32, ResponseStartTiming Int32, ResponseEndTiming Int32, FetchTiming Int32, RedirectTiming Int32, DOMInteractiveTiming Int32, DOMContentLoadedTiming Int32, DOMCompleteTiming Int32, LoadEventStartTiming Int32, LoadEventEndTiming Int32, NSToDOMContentLoadedTiming Int32, FirstPaintTiming Int32, RedirectCount Int8, SocialSourceNetworkID UInt8, SocialSourcePage String, ParamPrice Int64, ParamOrderID String, ParamCurrency FixedString(3), ParamCurrencyID UInt16, GoalsReached Array(UInt32), OpenstatServiceName String, OpenstatCampaignID String, OpenstatAdID String, OpenstatSourceID String, UTMSource String, UTMMedium String, UTMCampaign String, UTMContent String, UTMTerm String, FromTag String, HasGCLID UInt8, RefererHash UInt64, URLHash UInt64, CLID UInt32, YCLID UInt64, ShareService String, ShareURL String, ShareTitle String, ParsedParams Nested(Key1 String, Key2 String, Key3 String, Key4 String, Key5 String, ValueDouble Float64), IslandID FixedString(16), RequestNum UInt32, RequestTry UInt8)
  *                   ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS storage_policy='web';
  *
  *   <storage_configuration>
  *       <disks>
  *           <web>
  *               <type>web</type>
- *               <endpoint>https://clickhouse-datasets.s3.yandex.net/test-hits/</endpoint>
+ *               <endpoint>https://clickhouse-datasets.s3.yandex.net/disk-with-static-files-tests/test-hits/</endpoint>
  *           </web>
  *       </disks>
  *       <policies>
@@ -51,6 +51,8 @@ struct DiskWebServerSettings
  * clickhouse static-files-disk-uploader --metadata-path <path> --output-dir <dir>
  * (--metadata-path can be found in query: `select data_paths from system.tables where name='<table_name>';`)
  *
+ * When loading files by <endpoint> they must be loaded into <endpoint>/store/ path, but config must conrain only <endpoint>.
+ *
  * If url is not reachable on disk load when server is starting up tables, then all errors are caught.
  * If in this case there were errors, tables can be reloaded (become visible) via detach table table_name -> attach table table_name.
  * If metadata was successfully loaded at server startup, then tables are available straight away.

From 72505db3bd3f3b9f8b40440a352e96c88929815c Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Thu, 9 Sep 2021 10:10:34 +0300
Subject: [PATCH 097/273] Fix checks

---
 src/Disks/DiskWebServer.cpp | 7 +------
 src/Disks/DiskWebServer.h   | 9 +++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/Disks/DiskWebServer.cpp b/src/Disks/DiskWebServer.cpp
index e1cd12950b3..04ed0b40bc2 100644
--- a/src/Disks/DiskWebServer.cpp
+++ b/src/Disks/DiskWebServer.cpp
@@ -23,7 +23,6 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int BAD_ARGUMENTS;
-    extern const int LOGICAL_ERROR;
     extern const int FILE_DOESNT_EXIST;
     extern const int DIRECTORY_DOESNT_EXIST;
     extern const int NETWORK_ERROR;
@@ -137,14 +136,12 @@ private:
 DiskWebServer::DiskWebServer(
             const String & disk_name_,
             const String & url_,
-            const String &,
             ContextPtr context_,
             SettingsPtr settings_)
         : WithContext(context_->getGlobalContext())
         , log(&Poco::Logger::get("DiskWeb"))
         , url(url_)
         , name(disk_name_)
-        , metadata_path(url)
         , settings(std::move(settings_))
 {
 }
@@ -255,9 +252,7 @@ void registerDiskWebServer(DiskFactory & factory)
             context->getGlobalContext()->getSettingsRef().http_max_single_read_retries,
             config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024));
 
-        String metadata_path = fs::path(context->getPath()) / "disks" / disk_name / "";
-
-        return std::make_shared<DiskWebServer>(disk_name, uri, metadata_path, context, std::move(settings));
+        return std::make_shared<DiskWebServer>(disk_name, uri, context, std::move(settings));
     };
 
     factory.registerDiskType("web", creator);
diff --git a/src/Disks/DiskWebServer.h b/src/Disks/DiskWebServer.h
index 94f0644fb0d..ae1469ad5cc 100644
--- a/src/Disks/DiskWebServer.h
+++ b/src/Disks/DiskWebServer.h
@@ -26,8 +26,7 @@ struct DiskWebServerSettings
 
 
 /*
- * Quick ready test: ATTACH TABLE test_hits UUID '1ae36516-d62d-4218-9ae3-6516d62da218' ( WatchID UInt64, JavaEnable UInt8, Title String, GoodEvent Int16, EventTime DateTime, EventDate Date, CounterID UInt32, ClientIP UInt32, ClientIP6 FixedString(16), RegionID UInt32, UserID UInt64, CounterClass Int8, OS UInt8, UserAgent UInt8, URL String, Referer String, URLDomain String, RefererDomain String, Refresh UInt8, IsRobot UInt8, RefererCategories Array(UInt16), URLCategories Array(UInt16), URLRegions Array(UInt32), RefererRegions Array(UInt32), ResolutionWidth UInt16, ResolutionHeight UInt16, ResolutionDepth UInt8, FlashMajor UInt8, FlashMinor UInt8, FlashMinor2 String, NetMajor UInt8, NetMinor UInt8, UserAgentMajor UInt16, UserAgentMinor FixedString(2), CookieEnable UInt8, JavascriptEnable UInt8, IsMobile UInt8, MobilePhone UInt8, MobilePhoneModel String, Params String, IPNetworkID UInt32, TraficSourceID Int8, SearchEngineID UInt16, SearchPhrase String, AdvEngineID UInt8, IsArtifical UInt8, WindowClientWidth UInt16, WindowClientHeight UInt16, ClientTimeZone Int16, ClientEventTime DateTime, SilverlightVersion1 UInt8, SilverlightVersion2 UInt8, SilverlightVersion3 UInt32, SilverlightVersion4 UInt16, PageCharset String, CodeVersion UInt32, IsLink UInt8, IsDownload UInt8, IsNotBounce UInt8, FUniqID UInt64, HID UInt32, IsOldCounter UInt8, IsEvent UInt8, IsParameter UInt8, DontCountHits UInt8, WithHash UInt8, HitColor FixedString(1), UTCEventTime DateTime, Age UInt8, Sex UInt8, Income UInt8, Interests UInt16, Robotness UInt8, GeneralInterests Array(UInt16), RemoteIP UInt32, RemoteIP6 FixedString(16), WindowName Int32, OpenerName Int32, HistoryLength Int16, BrowserLanguage FixedString(2), BrowserCountry FixedString(2), SocialNetwork String, SocialAction String, HTTPError UInt16, SendTiming Int32, DNSTiming Int32, ConnectTiming Int32, ResponseStartTiming Int32, ResponseEndTiming Int32, FetchTiming Int32, RedirectTiming Int32, DOMInteractiveTiming Int32, DOMContentLoadedTiming Int32, DOMCompleteTiming Int32, LoadEventStartTiming Int32, LoadEventEndTiming Int32, NSToDOMContentLoadedTiming Int32, FirstPaintTiming Int32, RedirectCount Int8, SocialSourceNetworkID UInt8, SocialSourcePage String, ParamPrice Int64, ParamOrderID String, ParamCurrency FixedString(3), ParamCurrencyID UInt16, GoalsReached Array(UInt32), OpenstatServiceName String, OpenstatCampaignID String, OpenstatAdID String, OpenstatSourceID String, UTMSource String, UTMMedium String, UTMCampaign String, UTMContent String, UTMTerm String, FromTag String, HasGCLID UInt8, RefererHash UInt64, URLHash UInt64, CLID UInt32, YCLID UInt64, ShareService String, ShareURL String, ShareTitle String, ParsedParams Nested(Key1 String, Key2 String, Key3 String, Key4 String, Key5 String, ValueDouble Float64), IslandID FixedString(16), RequestNum UInt32, RequestTry UInt8)
- *                   ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS storage_policy='web';
+ * Quick ready test: ATTACH TABLE test_hits UUID '1ae36516-d62d-4218-9ae3-6516d62da218' ( WatchID UInt64, JavaEnable UInt8, Title String, GoodEvent Int16, EventTime DateTime, EventDate Date, CounterID UInt32, ClientIP UInt32, ClientIP6 FixedString(16), RegionID UInt32, UserID UInt64, CounterClass Int8, OS UInt8, UserAgent UInt8, URL String, Referer String, URLDomain String, RefererDomain String, Refresh UInt8, IsRobot UInt8, RefererCategories Array(UInt16), URLCategories Array(UInt16), URLRegions Array(UInt32), RefererRegions Array(UInt32), ResolutionWidth UInt16, ResolutionHeight UInt16, ResolutionDepth UInt8, FlashMajor UInt8, FlashMinor UInt8, FlashMinor2 String, NetMajor UInt8, NetMinor UInt8, UserAgentMajor UInt16, UserAgentMinor FixedString(2), CookieEnable UInt8, JavascriptEnable UInt8, IsMobile UInt8, MobilePhone UInt8, MobilePhoneModel String, Params String, IPNetworkID UInt32, TraficSourceID Int8, SearchEngineID UInt16, SearchPhrase String, AdvEngineID UInt8, IsArtifical UInt8, WindowClientWidth UInt16, WindowClientHeight UInt16, ClientTimeZone Int16, ClientEventTime DateTime, SilverlightVersion1 UInt8, SilverlightVersion2 UInt8, SilverlightVersion3 UInt32, SilverlightVersion4 UInt16, PageCharset String, CodeVersion UInt32, IsLink UInt8, IsDownload UInt8, IsNotBounce UInt8, FUniqID UInt64, HID UInt32, IsOldCounter UInt8, IsEvent UInt8, IsParameter UInt8, DontCountHits UInt8, WithHash UInt8, HitColor FixedString(1), UTCEventTime DateTime, Age UInt8, Sex UInt8, Income UInt8, Interests UInt16, Robotness UInt8, GeneralInterests Array(UInt16), RemoteIP UInt32, RemoteIP6 FixedString(16), WindowName Int32, OpenerName Int32, HistoryLength Int16, BrowserLanguage FixedString(2), BrowserCountry FixedString(2), SocialNetwork String, SocialAction String, HTTPError UInt16, SendTiming Int32, DNSTiming Int32, ConnectTiming Int32, ResponseStartTiming Int32, ResponseEndTiming Int32, FetchTiming Int32, RedirectTiming Int32, DOMInteractiveTiming Int32, DOMContentLoadedTiming Int32, DOMCompleteTiming Int32, LoadEventStartTiming Int32, LoadEventEndTiming Int32, NSToDOMContentLoadedTiming Int32, FirstPaintTiming Int32, RedirectCount Int8, SocialSourceNetworkID UInt8, SocialSourcePage String, ParamPrice Int64, ParamOrderID String, ParamCurrency FixedString(3), ParamCurrencyID UInt16, GoalsReached Array(UInt32), OpenstatServiceName String, OpenstatCampaignID String, OpenstatAdID String, OpenstatSourceID String, UTMSource String, UTMMedium String, UTMCampaign String, UTMContent String, UTMTerm String, FromTag String, HasGCLID UInt8, RefererHash UInt64, URLHash UInt64, CLID UInt32, YCLID UInt64, ShareService String, ShareURL String, ShareTitle String, ParsedParams Nested(Key1 String, Key2 String, Key3 String, Key4 String, Key5 String, ValueDouble Float64), IslandID FixedString(16), RequestNum UInt32, RequestTry UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS storage_policy='web';
  *
  *   <storage_configuration>
  *       <disks>
@@ -63,8 +62,7 @@ using SettingsPtr = std::unique_ptr<DiskWebServerSettings>;
 
 public:
     DiskWebServer(const String & disk_name_,
-                  const String & files_root_path_uri_,
-                  const String & metadata_path_,
+                  const String & url_,
                   ContextPtr context,
                   SettingsPtr settings_);
 
@@ -82,7 +80,7 @@ public:
 
     const String & getName() const final override { return name; }
 
-    const String & getPath() const final override { return metadata_path; }
+    const String & getPath() const final override { return url; }
 
     bool isReadOnly() const override { return true; }
 
@@ -208,7 +206,6 @@ private:
     Poco::Logger * log;
     String url;
     String name;
-    const String metadata_path;
     SettingsPtr settings;
 };
 

From 4d49e6da58f93e1499c7984e5c86bd36d664d3af Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Wed, 8 Sep 2021 22:23:06 +0300
Subject: [PATCH 098/273] Fix build image name

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

diff --git a/docker/images.json b/docker/images.json
index 795ca47be00..96424bb9432 100644
--- a/docker/images.json
+++ b/docker/images.json
@@ -108,7 +108,7 @@
         "dependent": []
     },
     "docker/test/integration/mysql_java_client": {
-        "name": "clickhouse/clickhouse-mysql-java-client",
+        "name": "clickhouse/mysql-java-client",
         "dependent": []
     },
     "docker/test/integration/mysql_js_client": {

From 63cc735b8fc9b8fbe1123f158e081a3d24528d54 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Thu, 9 Sep 2021 10:41:55 +0300
Subject: [PATCH 099/273] Revert jdbc-bridge image

---
 .../integration/runner/compose/docker_compose_jdbc_bridge.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml b/docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml
index b3686adc21c..eb70fea607b 100644
--- a/docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml
+++ b/docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml
@@ -1,7 +1,7 @@
 version: '2.3'
 services:
   bridge1:
-    image: clickhouse/jdbc-bridge
+    image: yandex/clickhouse-jdbc-bridge
     command: |
       /bin/bash -c 'cat << EOF > config/datasources/self.json
       {
@@ -24,4 +24,4 @@ services:
     volumes:
       - type: ${JDBC_BRIDGE_FS:-tmpfs}
         source: ${JDBC_BRIDGE_LOGS:-}
-        target: /app/logs
\ No newline at end of file
+        target: /app/logs

From 1297e95e4a08bd00d0ed5e88dc46ba297fbce8b1 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Thu, 9 Sep 2021 10:45:04 +0300
Subject: [PATCH 100/273] Revert "Revert jdbc-bridge image"

This reverts commit 63cc735b8fc9b8fbe1123f158e081a3d24528d54.
---
 .../integration/runner/compose/docker_compose_jdbc_bridge.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml b/docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml
index eb70fea607b..b3686adc21c 100644
--- a/docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml
+++ b/docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml
@@ -1,7 +1,7 @@
 version: '2.3'
 services:
   bridge1:
-    image: yandex/clickhouse-jdbc-bridge
+    image: clickhouse/jdbc-bridge
     command: |
       /bin/bash -c 'cat << EOF > config/datasources/self.json
       {
@@ -24,4 +24,4 @@ services:
     volumes:
       - type: ${JDBC_BRIDGE_FS:-tmpfs}
         source: ${JDBC_BRIDGE_LOGS:-}
-        target: /app/logs
+        target: /app/logs
\ No newline at end of file

From 2ccdb6c22d428b3b774a1b30725e48c2be061480 Mon Sep 17 00:00:00 2001
From: Anton Popov <pad11rus@gmail.com>
Date: Thu, 9 Sep 2021 12:40:26 +0300
Subject: [PATCH 101/273] fix clang-tidy

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

diff --git a/src/Storages/MergeTree/IMergeTreeReader.cpp b/src/Storages/MergeTree/IMergeTreeReader.cpp
index 41de5784d55..d0d845ed6a3 100644
--- a/src/Storages/MergeTree/IMergeTreeReader.cpp
+++ b/src/Storages/MergeTree/IMergeTreeReader.cpp
@@ -138,8 +138,8 @@ void IMergeTreeReader::fillMissingColumns(Columns & res_columns, bool & should_e
                 const auto * array_type = typeid_cast<const DataTypeArray *>(type.get());
                 if (offset_it != offset_columns.end() && array_type)
                 {
+                    const auto & nested_type = array_type->getNestedType();
                     ColumnPtr offsets_column = offset_it->second;
-                    DataTypePtr nested_type = array_type->getNestedType();
                     size_t nested_rows = typeid_cast<const ColumnUInt64 &>(*offsets_column).getData().back();
 
                     ColumnPtr nested_column =

From c23e17d369e7b75f75684d94ad71c9b2c85a98ff Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Thu, 9 Sep 2021 15:25:44 +0300
Subject: [PATCH 102/273] Fix

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

diff --git a/src/Disks/DiskWebServer.cpp b/src/Disks/DiskWebServer.cpp
index 04ed0b40bc2..fc86763f4d3 100644
--- a/src/Disks/DiskWebServer.cpp
+++ b/src/Disks/DiskWebServer.cpp
@@ -74,7 +74,7 @@ void DiskWebServer::initialize(const String & uri_path) const
     }
     catch (Exception & e)
     {
-        e.addMessage("while loadng disk metadata");
+        e.addMessage("while loading disk metadata");
         throw;
     }
 
@@ -210,7 +210,7 @@ size_t DiskWebServer::getFileSize(const String & path) const
 {
     auto iter = files.find(path);
     if (iter == files.end())
-        return false;
+        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "File path {} does not exist", path);
 
     return iter->second.size;
 }
@@ -220,7 +220,7 @@ bool DiskWebServer::isFile(const String & path) const
 {
     auto iter = files.find(path);
     if (iter == files.end())
-        return false;
+        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "File path {} does not exist", path);
 
     return iter->second.type == FileType::File;
 }
@@ -230,7 +230,7 @@ bool DiskWebServer::isDirectory(const String & path) const
 {
     auto iter = files.find(path);
     if (iter == files.end())
-        return false;
+        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "File path {} does not exist", path);
 
     return iter->second.type == FileType::Directory;
 }
diff --git a/src/Disks/DiskWebServer.h b/src/Disks/DiskWebServer.h
index ae1469ad5cc..1d2f00fe483 100644
--- a/src/Disks/DiskWebServer.h
+++ b/src/Disks/DiskWebServer.h
@@ -190,8 +190,8 @@ private:
 
     enum class FileType
     {
-        File = 1,
-        Directory = 2
+        File,
+        Directory
     };
 
     struct FileData

From 0e0c136d4385813fafc40264ceeb9ac74b6e57b0 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Thu, 9 Sep 2021 15:31:29 +0300
Subject: [PATCH 103/273] Fix error code of clickhouse-test if server is dead.

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

diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index f3a41ba6a25..c3136c4fd52 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -1162,6 +1162,9 @@ def main(args):
             total_tests_run += do_run_tests(
                 jobs, suite, suite_dir, suite_tmp_dir, all_tests, parallel_tests, sequential_tests, args.parallel)
 
+    if server_died.is_set():
+        exit_code.value = 1
+
     if args.hung_check:
 
         # Some queries may execute in background for some time after test was finished. This is normal.

From 513d40feb2188adc727d9528af09fc3e098a8d8e Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <mikhaylovnikitka@gmail.com>
Date: Thu, 9 Sep 2021 14:59:25 +0000
Subject: [PATCH 104/273] Fix build

---
 cmake/warnings.cmake           | 22 ++++++++++++++++++----
 src/Columns/ColumnCompressed.h |  9 ++++++---
 src/Columns/ColumnMap.cpp      |  5 ++++-
 src/Interpreters/Cluster.h     |  2 +-
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/cmake/warnings.cmake b/cmake/warnings.cmake
index 38524acaff6..0b6bbe36cf9 100644
--- a/cmake/warnings.cmake
+++ b/cmake/warnings.cmake
@@ -191,10 +191,6 @@ elseif (COMPILER_GCC)
         #     34 |   return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest));
         # For some reason (bug in gcc?) macro 'GCC diagnostic ignored "-Wstringop-overflow"' doesn't help.
         add_cxx_compile_options(-Wno-stringop-overflow)
-        # reinterpretAs.cpp:182:31: error: ‘void* memcpy(void*, const void*, size_t)’ copying an object of non-trivial type
-        # ‘using ToFieldType = using FieldType = using UUID = struct StrongTypedef<wide::integer<128, unsigned int>, DB::UUIDTag>’
-        # {aka ‘struct StrongTypedef<wide::integer<128, unsigned int>, DB::UUIDTag>’} from an array of ‘const char8_t’
-        add_cxx_compile_options(-Wno-error=class-memaccess)
     endif()
 
     if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 11)
@@ -202,5 +198,23 @@ elseif (COMPILER_GCC)
         # ‘using ToFieldType = using FieldType = using UUID = struct StrongTypedef<wide::integer<128, unsigned int>, DB::UUIDTag>’
         # {aka ‘struct StrongTypedef<wide::integer<128, unsigned int>, DB::UUIDTag>’} from an array of ‘const char8_t’
         add_cxx_compile_options(-Wno-error=class-memaccess)
+
+        # Maybe false positive...
+        # In file included from /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/memory:673,
+        # In function ‘void std::__1::__libcpp_operator_delete(_Args ...) [with _Args = {void*, long unsigned int}]’,
+        # inlined from ‘void std::__1::__do_deallocate_handle_size(void*, size_t, _Args ...) [with _Args = {}]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/new:271:34,
+        # inlined from ‘void std::__1::__libcpp_deallocate(void*, size_t, size_t)’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/new:285:41,
+        # inlined from ‘constexpr void std::__1::allocator<_Tp>::deallocate(_Tp*, size_t) [with _Tp = char]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/memory:849:39,
+        # inlined from ‘static constexpr void std::__1::allocator_traits<_Alloc>::deallocate(std::__1::allocator_traits<_Alloc>::allocator_type&, std::__1::allocator_traits<_Alloc>::pointer, std::__1::allocator_traits<_Alloc>::size_type) [with _Alloc = std::__1::allocator<char>]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/__memory/allocator_traits.h:476:24,
+        # inlined from ‘std::__1::basic_string<_CharT, _Traits, _Allocator>::~basic_string() [with _CharT = char; _Traits = std::__1::char_traits<char>; _Allocator = std::__1::allocator<char>]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/string:2219:35,
+        # inlined from ‘std::__1::basic_string<_CharT, _Traits, _Allocator>::~basic_string() [with _CharT = char; _Traits = std::__1::char_traits<char>; _Allocator = std::__1::allocator<char>]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/string:2213:1,
+        # inlined from ‘DB::JSONBuilder::JSONMap::Pair::~Pair()’ at /home/jakalletti/ClickHouse/ClickHouse/src/Common/JSONBuilder.h:90:12,
+        # inlined from ‘void DB::JSONBuilder::JSONMap::add(std::__1::string, DB::JSONBuilder::ItemPtr)’ at /home/jakalletti/ClickHouse/ClickHouse/src/Common/JSONBuilder.h:97:68,
+        # inlined from ‘virtual void DB::ExpressionStep::describeActions(DB::JSONBuilder::JSONMap&) const’ at /home/jakalletti/ClickHouse/ClickHouse/src/Processors/QueryPlan/ExpressionStep.cpp:102:12:
+        # /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/new:247:20: error: ‘void operator delete(void*, size_t)’ called on a pointer to an unallocated object ‘7598543875853023301’ [-Werror=free-nonheap-object]
+        add_cxx_compile_options(-Wno-error=free-nonheap-object)
+
+        # AggregateFunctionAvg.h:203:100: error: ‘this’ pointer is null [-Werror=nonnull]
+        add_cxx_compile_options(-Wno-error=nonnull)
     endif()
 endif ()
diff --git a/src/Columns/ColumnCompressed.h b/src/Columns/ColumnCompressed.h
index 1f916db9d61..92bdca7cd72 100644
--- a/src/Columns/ColumnCompressed.h
+++ b/src/Columns/ColumnCompressed.h
@@ -57,9 +57,13 @@ public:
       */
     static ColumnPtr wrap(ColumnPtr column)
     {
+        /// The order of evaluation of function arguments is unspecified
+        /// and could cause interacting with object in moved-from state
+        const auto size = column->size();
+        const auto bytes = column->allocatedBytes();
         return ColumnCompressed::create(
-            column->size(),
-            column->allocatedBytes(),
+            size,
+            bytes,
             [column = std::move(column)]{ return column; });
     }
 
@@ -124,4 +128,3 @@ private:
 };
 
 }
-
diff --git a/src/Columns/ColumnMap.cpp b/src/Columns/ColumnMap.cpp
index 2e50d95826c..c547a380ff3 100644
--- a/src/Columns/ColumnMap.cpp
+++ b/src/Columns/ColumnMap.cpp
@@ -276,7 +276,10 @@ bool ColumnMap::structureEquals(const IColumn & rhs) const
 ColumnPtr ColumnMap::compress() const
 {
     auto compressed = nested->compress();
-    return ColumnCompressed::create(size(), compressed->byteSize(), [compressed = std::move(compressed)]
+    const auto byte_size = compressed->byteSize();
+    /// The order of evaluation of function arguments is unspecified
+    /// and could cause interacting with object in moved-from state
+    return ColumnCompressed::create(size(), byte_size, [compressed = std::move(compressed)]
     {
         return ColumnMap::create(compressed->decompress());
     });
diff --git a/src/Interpreters/Cluster.h b/src/Interpreters/Cluster.h
index a77eb3983dc..ec78abf574c 100644
--- a/src/Interpreters/Cluster.h
+++ b/src/Interpreters/Cluster.h
@@ -85,7 +85,7 @@ public:
         */
 
         String host_name;
-        UInt16 port;
+        UInt16 port{0};
         String user;
         String password;
 

From 47e1ecc05a9aa544b31e0853ebee2ff666e66e1c Mon Sep 17 00:00:00 2001
From: gyuton <40863448+gyuton@users.noreply.github.com>
Date: Thu, 9 Sep 2021 18:40:02 +0300
Subject: [PATCH 105/273] Update
 docs/en/sql-reference/functions/tuple-map-functions.md

Co-authored-by: Nikolay Degterinsky <43110995+evillique@users.noreply.github.com>
---
 docs/en/sql-reference/functions/tuple-map-functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/functions/tuple-map-functions.md b/docs/en/sql-reference/functions/tuple-map-functions.md
index 8a2be922ec7..6e91419b04f 100644
--- a/docs/en/sql-reference/functions/tuple-map-functions.md
+++ b/docs/en/sql-reference/functions/tuple-map-functions.md
@@ -86,7 +86,7 @@ Arguments are [maps](../../sql-reference/data-types/map.md) or [tuples](../../sq
 
 **Example**
 
-Query with a Tuple:
+Query with a tuple:
 
 ```sql
 SELECT mapAdd(([toUInt8(1), 2], [1, 1]), ([toUInt8(1), 2], [1, 1])) as res, toTypeName(res) as type;

From e244239238e192b3a7704d8a79923993f8e3333c Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Thu, 9 Sep 2021 19:35:06 +0300
Subject: [PATCH 106/273] Lower compiled_expression_cache_size to 128MB

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

diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index 4a6d1e206e7..0c834174519 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -962,7 +962,7 @@ if (ThreadFuzzer::instance().isEffective())
         global_context->setMMappedFileCache(mmap_cache_size);
 
 #if USE_EMBEDDED_COMPILER
-    constexpr size_t compiled_expression_cache_size_default = 1024 * 1024 * 1024;
+    constexpr size_t compiled_expression_cache_size_default = 1024 * 1024 * 128;
     size_t compiled_expression_cache_size = config().getUInt64("compiled_expression_cache_size", compiled_expression_cache_size_default);
     CompiledExpressionCacheFactory::instance().init(compiled_expression_cache_size);
 #endif

From e419614d322392d47e6f6b1301efb75f6ee647bb Mon Sep 17 00:00:00 2001
From: tavplubix <tavplubix@gmail.com>
Date: Thu, 9 Sep 2021 21:31:15 +0300
Subject: [PATCH 107/273] remove incorrect code

---
 src/Storages/StorageDictionary.cpp | 4 ----
 src/Storages/StorageDictionary.h   | 1 -
 2 files changed, 5 deletions(-)

diff --git a/src/Storages/StorageDictionary.cpp b/src/Storages/StorageDictionary.cpp
index c8bbb703999..c8bc215dd6c 100644
--- a/src/Storages/StorageDictionary.cpp
+++ b/src/Storages/StorageDictionary.cpp
@@ -193,10 +193,6 @@ void StorageDictionary::startup()
 
 void StorageDictionary::removeDictionaryConfigurationFromRepository()
 {
-    if (remove_repository_callback_executed)
-        return;
-
-    remove_repository_callback_executed = true;
     remove_repository_callback.reset();
 }
 
diff --git a/src/Storages/StorageDictionary.h b/src/Storages/StorageDictionary.h
index d074dec2c34..c7693bdae9a 100644
--- a/src/Storages/StorageDictionary.h
+++ b/src/Storages/StorageDictionary.h
@@ -73,7 +73,6 @@ private:
     Poco::Timestamp update_time;
     LoadablesConfigurationPtr configuration;
 
-    std::atomic<bool> remove_repository_callback_executed = false;
     scope_guard remove_repository_callback;
 
     void removeDictionaryConfigurationFromRepository();

From c76d40443214eb2809603014cabad74f543a79bb Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Thu, 9 Sep 2021 21:36:15 +0300
Subject: [PATCH 108/273] Fix compiled_expression_cache_size setting default
 value in configuration files

---
 programs/server/config.xml          | 2 +-
 programs/server/config.yaml.example | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/server/config.xml b/programs/server/config.xml
index 32207e2b6b3..b8ef17458be 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -331,7 +331,7 @@
     <mmap_cache_size>1000</mmap_cache_size>
 
     <!-- Cache size for compiled expressions.-->
-    <compiled_expression_cache_size>1073741824</compiled_expression_cache_size>
+    <compiled_expression_cache_size>134217728</compiled_expression_cache_size>
 
     <!-- Path to data directory, with trailing slash. -->
     <path>/var/lib/clickhouse/</path>
diff --git a/programs/server/config.yaml.example b/programs/server/config.yaml.example
index 5b2da1d3128..ae4eac49a64 100644
--- a/programs/server/config.yaml.example
+++ b/programs/server/config.yaml.example
@@ -280,7 +280,7 @@ mark_cache_size: 5368709120
 mmap_cache_size: 1000
 
 # Cache size for compiled expressions.
-compiled_expression_cache_size: 1073741824
+compiled_expression_cache_size: 134217728
 
 # Path to data directory, with trailing slash.
 path: /var/lib/clickhouse/

From e160f649171da1337eb3411a7981581ff0e21369 Mon Sep 17 00:00:00 2001
From: olgarev <56617294+olgarev@users.noreply.github.com>
Date: Thu, 9 Sep 2021 22:23:02 +0300
Subject: [PATCH 109/273] Apply suggestions from code review

Co-authored-by: Anna <42538400+adevyatova@users.noreply.github.com>
---
 docs/en/sql-reference/table-functions/s3.md | 2 +-
 docs/ru/sql-reference/table-functions/s3.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/sql-reference/table-functions/s3.md b/docs/en/sql-reference/table-functions/s3.md
index 12d39a2b324..215c9409416 100644
--- a/docs/en/sql-reference/table-functions/s3.md
+++ b/docs/en/sql-reference/table-functions/s3.md
@@ -127,7 +127,7 @@ SELECT name, value FROM existing_table;
 
 ## Partitioned Write {#partitioned-write}
 
-When inserting data into S3 table, you can split it into several files by specifying `PARTITION BY` expression. In this case a separate file is created for each partition value. Splitting the data helps to improve reading operations efficiency.
+If you will specify `PARTITION BY` expression when inserting data into `S3` table, a separate file is created for each partition value. Splitting the data helps to improve reading operations efficiency.
 
 **Examples**
 
diff --git a/docs/ru/sql-reference/table-functions/s3.md b/docs/ru/sql-reference/table-functions/s3.md
index 3a671e2029f..316bab9bf69 100644
--- a/docs/ru/sql-reference/table-functions/s3.md
+++ b/docs/ru/sql-reference/table-functions/s3.md
@@ -135,7 +135,7 @@ SELECT name, value FROM existing_table;
 
 ## Партиционирование при записи данных {#partitioned-write}
 
-При добавлении данных в таблицу S3 вы можете сохранить таблицу в нескольких файлах, указав выражение `PARTITION BY`. В этом случае для каждого значения выражения партиционирования создается отдельный файл. Сохранение таблицы в нескольких отдельных файлах повышает эффективность операций чтения.
+Если при добавлении данных в таблицу S3 вы укажете выражение `PARTITION BY`, то для каждого значения выражения партиционирования будет создан отдельный файл. Это повышает эффективность операций чтения.
 
 **Примеры**
 

From cd687614fa5e6a5efc6fef636da3094e649f7fc3 Mon Sep 17 00:00:00 2001
From: olgarev <56617294+olgarev@users.noreply.github.com>
Date: Thu, 9 Sep 2021 22:25:04 +0300
Subject: [PATCH 110/273] Apply suggestions from code review

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

diff --git a/docs/en/sql-reference/table-functions/s3.md b/docs/en/sql-reference/table-functions/s3.md
index 215c9409416..1d38d4586e3 100644
--- a/docs/en/sql-reference/table-functions/s3.md
+++ b/docs/en/sql-reference/table-functions/s3.md
@@ -127,7 +127,7 @@ SELECT name, value FROM existing_table;
 
 ## Partitioned Write {#partitioned-write}
 
-If you will specify `PARTITION BY` expression when inserting data into `S3` table, a separate file is created for each partition value. Splitting the data helps to improve reading operations efficiency.
+If you specify `PARTITION BY` expression when inserting data into `S3` table, a separate file is created for each partition value. Splitting the data helps to improve reading operations efficiency.
 
 **Examples**
 
diff --git a/docs/ru/sql-reference/table-functions/s3.md b/docs/ru/sql-reference/table-functions/s3.md
index 316bab9bf69..9eec0ab05d2 100644
--- a/docs/ru/sql-reference/table-functions/s3.md
+++ b/docs/ru/sql-reference/table-functions/s3.md
@@ -135,7 +135,7 @@ SELECT name, value FROM existing_table;
 
 ## Партиционирование при записи данных {#partitioned-write}
 
-Если при добавлении данных в таблицу S3 вы укажете выражение `PARTITION BY`, то для каждого значения выражения партиционирования будет создан отдельный файл. Это повышает эффективность операций чтения.
+Если при добавлении данных в таблицу S3 указать выражение `PARTITION BY`, то для каждого значения выражения партиционирования создается отдельный файл. Это повышает эффективность операций чтения.
 
 **Примеры**
 

From 89744e908c5c6ef3baf390e5b4c7951d3d7dc3b7 Mon Sep 17 00:00:00 2001
From: olgarev <56617294+olgarev@users.noreply.github.com>
Date: Thu, 9 Sep 2021 22:26:51 +0300
Subject: [PATCH 111/273] Update docs/en/sql-reference/table-functions/s3.md

---
 docs/en/sql-reference/table-functions/s3.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/table-functions/s3.md b/docs/en/sql-reference/table-functions/s3.md
index 1d38d4586e3..f864ca7eed2 100644
--- a/docs/en/sql-reference/table-functions/s3.md
+++ b/docs/en/sql-reference/table-functions/s3.md
@@ -127,7 +127,7 @@ SELECT name, value FROM existing_table;
 
 ## Partitioned Write {#partitioned-write}
 
-If you specify `PARTITION BY` expression when inserting data into `S3` table, a separate file is created for each partition value. Splitting the data helps to improve reading operations efficiency.
+If you specify `PARTITION BY` expression when inserting data into `S3` table, a separate file is created for each partition value. Splitting the data into separate files helps to improve reading operations efficiency.
 
 **Examples**
 

From b6dea3e8e3b5e174eccf8bd1c78692549868f19d Mon Sep 17 00:00:00 2001
From: olgarev <56617294+olgarev@users.noreply.github.com>
Date: Thu, 9 Sep 2021 22:33:59 +0300
Subject: [PATCH 112/273] Apply suggestions from code review

---
 docs/en/sql-reference/table-functions/s3.md | 8 ++++----
 docs/ru/sql-reference/table-functions/s3.md | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/en/sql-reference/table-functions/s3.md b/docs/en/sql-reference/table-functions/s3.md
index f864ca7eed2..a0176f0151c 100644
--- a/docs/en/sql-reference/table-functions/s3.md
+++ b/docs/en/sql-reference/table-functions/s3.md
@@ -135,17 +135,17 @@ If you specify `PARTITION BY` expression when inserting data into `S3` table, a
 
 ```sql
 INSERT INTO TABLE FUNCTION
-    s3('http://bucket.amazonaws.com/my_bucket/file_{_partition_id}.csv', 'CSV', 'a UInt32, b UInt32, c UInt32')
-    PARTITION BY a VALUES (1, 2, 3), (1, 4, 5), (10, 11, 12), (10, 13, 14), (20, 21, 22), (20, 23, 24)
+    s3('http://bucket.amazonaws.com/my_bucket/file_{_partition_id}.csv', 'CSV', 'a String, b UInt32, c UInt32')
+    PARTITION BY a VALUES ('x', 2, 3), ('x', 4, 5), ('y', 11, 12), ('y', 13, 14), ('z', 21, 22), ('z', 23, 24);
 ```
-As a result, the data is written into three files: `file_1.csv`, `file_10.csv`, and `file_20.csv`.
+As a result, the data is written into three files: `file_x.csv`, `file_y.csv`, and `file_z.csv`.
 
 2. Using partition ID in a bucket name creates files in different buckets:
 
 ```sql
 INSERT INTO TABLE FUNCTION
     s3('http://bucket.amazonaws.com/my_bucket_{_partition_id}/file.csv', 'CSV', 'a UInt32, b UInt32, c UInt32')
-    PARTITION BY a VALUES (1, 2, 3), (1, 4, 5), (10, 11, 12), (10, 13, 14), (20, 21, 22), (20, 23, 24)
+    PARTITION BY a VALUES (1, 2, 3), (1, 4, 5), (10, 11, 12), (10, 13, 14), (20, 21, 22), (20, 23, 24);
 ```
 As a result, the data is written into three files in different buckets: `my_bucket_1/file.csv`, `my_bucket_10/file.csv`, and `my_bucket_20/file.csv`.
 
diff --git a/docs/ru/sql-reference/table-functions/s3.md b/docs/ru/sql-reference/table-functions/s3.md
index 9eec0ab05d2..a4e6151d711 100644
--- a/docs/ru/sql-reference/table-functions/s3.md
+++ b/docs/ru/sql-reference/table-functions/s3.md
@@ -144,16 +144,16 @@ SELECT name, value FROM existing_table;
 ```sql
 INSERT INTO TABLE FUNCTION
     s3('http://bucket.amazonaws.com/my_bucket/file_{_partition_id}.csv', 'CSV', 'a UInt32, b UInt32, c UInt32')
-    PARTITION BY a VALUES (1, 2, 3), (1, 4, 5), (10, 11, 12), (10, 13, 14), (20, 21, 22), (20, 23, 24)
+    PARTITION BY a VALUES ('x', 2, 3), ('x', 4, 5), ('y', 11, 12), ('y', 13, 14), ('z', 21, 22), ('z', 23, 24);
 ```
-В результате данные будут записаны в три файла: `file_1.csv`, `file_10.csv` и `file_20.csv`.
+В результате данные будут записаны в три файла: `file_x.csv`, `file_y.csv` и `file_z.csv`.
 
 2. При использовании ID партиции в названии бакета создаются файлы в разных бакетах:
 
 ```sql
 INSERT INTO TABLE FUNCTION
     s3('http://bucket.amazonaws.com/my_bucket_{_partition_id}/file.csv', 'CSV', 'a UInt32, b UInt32, c UInt32')
-    PARTITION BY a VALUES (1, 2, 3), (1, 4, 5), (10, 11, 12), (10, 13, 14), (20, 21, 22), (20, 23, 24)
+    PARTITION BY a VALUES (1, 2, 3), (1, 4, 5), (10, 11, 12), (10, 13, 14), (20, 21, 22), (20, 23, 24);
 ```
 В результате будут созданы три файла в разных бакетах: `my_bucket_1/file.csv`, `my_bucket_10/file.csv` и `my_bucket_20/file.csv`.
 

From c89bb46a20796b6ac20767cdff2c4d64fa5f577c Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Thu, 9 Sep 2021 22:41:26 +0300
Subject: [PATCH 113/273] Fix shared build with ENABLE_EMBEDDED_COMPILER

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 40b8526e103..b4d4f3a5de3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -261,7 +261,7 @@ dbms_target_include_directories (PUBLIC "${ClickHouse_SOURCE_DIR}/src" "${ClickH
 target_include_directories (clickhouse_common_io PUBLIC "${ClickHouse_SOURCE_DIR}/src" "${ClickHouse_BINARY_DIR}/src")
 
 if (USE_EMBEDDED_COMPILER)
-    dbms_target_link_libraries (PRIVATE ${REQUIRED_LLVM_LIBRARIES})
+    dbms_target_link_libraries (PUBLIC ${REQUIRED_LLVM_LIBRARIES})
     dbms_target_include_directories (SYSTEM BEFORE PUBLIC ${LLVM_INCLUDE_DIRS})
 endif ()
 

From 0562d643687622e6c530f530a9361ed40fd2f239 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Thu, 9 Sep 2021 22:41:26 +0300
Subject: [PATCH 114/273] Do not override ENABLE_EMBEDDED_COMPILER each time

---
 cmake/find/llvm.cmake | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cmake/find/llvm.cmake b/cmake/find/llvm.cmake
index 816164bef10..23b61ab5c68 100644
--- a/cmake/find/llvm.cmake
+++ b/cmake/find/llvm.cmake
@@ -1,8 +1,10 @@
 if (APPLE OR SPLIT_SHARED_LIBRARIES OR NOT ARCH_AMD64 OR SANITIZE STREQUAL "undefined")
-    set (ENABLE_EMBEDDED_COMPILER OFF CACHE INTERNAL "")
+    set (ENABLE_EMBEDDED_COMPILER_DEFAULT OFF)
+else()
+    set (ENABLE_EMBEDDED_COMPILER_DEFAULT ON)
 endif()
 
-option (ENABLE_EMBEDDED_COMPILER "Enable support for 'compile_expressions' option for query execution" ON)
+option (ENABLE_EMBEDDED_COMPILER "Enable support for 'compile_expressions' option for query execution" ${ENABLE_EMBEDDED_COMPILER_DEFAULT})
 
 if (NOT ENABLE_EMBEDDED_COMPILER)
     set (USE_EMBEDDED_COMPILER 0)

From 784d468f4b7b038dda654e21ee9af0e2c650e89b Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Thu, 9 Sep 2021 22:41:26 +0300
Subject: [PATCH 115/273] Include llvm from function to guard
 CMAKE_CXX_STANDARD scope

---
 contrib/CMakeLists.txt | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index e6e098a05b3..b2e97343442 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -206,7 +206,7 @@ elseif(GTEST_SRC_DIR)
     target_compile_definitions(gtest INTERFACE GTEST_HAS_POSIX_RE=0)
 endif()
 
-if (USE_EMBEDDED_COMPILER)
+function(add_llvm)
     # ld: unknown option: --color-diagnostics
     if (APPLE)
         set (LINKER_SUPPORTS_COLOR_DIAGNOSTICS 0 CACHE INTERNAL "")
@@ -219,13 +219,12 @@ if (USE_EMBEDDED_COMPILER)
 
     # Need to use C++17 since the compilation is not possible with C++20 currently, due to ambiguous operator != etc.
     # LLVM project will set its default value for the -std=... but our global setting from CMake will override it.
-    set (CMAKE_CXX_STANDARD_bak ${CMAKE_CXX_STANDARD})
     set (CMAKE_CXX_STANDARD 17)
 
     add_subdirectory (llvm/llvm)
-
-    set (CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD_bak})
-    unset (CMAKE_CXX_STANDARD_bak)
+endfunction()
+if (USE_EMBEDDED_COMPILER)
+    add_llvm()
 endif ()
 
 if (USE_INTERNAL_LIBGSASL_LIBRARY)

From 0d0c19c6170fd33bd536ad16498c8640765bafd4 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Thu, 9 Sep 2021 22:41:27 +0300
Subject: [PATCH 116/273] Fix RPATH for llvm in shared build

Before this patch:

    $ readelf -d contrib/llvm/llvm/bin/llvm-tblgen  | fgrep -i runpath
     0x000000000000001d (RUNPATH)            Library runpath: [$ORIGIN/../lib]

After:

    $ readelf -d contrib/llvm/llvm/bin/llvm-tblgen  | fgrep -i runpath
     0x000000000000001d (RUNPATH)            Library runpath: [/src/ch/clickhouse/.cmake/contrib/llvm/llvm/lib:/src/ch/clickhouse/.cmake/contrib/libcxx-cmake:/src/ch/clickhouse/.cmake/contrib/libcxxabi-cmake:/src/ch/clickhouse/.cmake/contrib/libunwind-cmake]
---
 contrib/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index b2e97343442..383a8510035 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -212,6 +212,8 @@ function(add_llvm)
         set (LINKER_SUPPORTS_COLOR_DIAGNOSTICS 0 CACHE INTERNAL "")
     endif ()
 
+    # Do not adjust RPATH in llvm, since then it will not be able to find libcxx/libcxxabi/libunwind
+    set (CMAKE_INSTALL_RPATH "ON")
     set (LLVM_ENABLE_EH 1 CACHE INTERNAL "")
     set (LLVM_ENABLE_RTTI 1 CACHE INTERNAL "")
     set (LLVM_ENABLE_PIC 0 CACHE INTERNAL "")

From c24a3bb67d9eb55ca0dbec3d333bec1f22b39663 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Thu, 9 Sep 2021 22:42:47 +0300
Subject: [PATCH 117/273] FIx formatting for getCompilableDAG()

---
 src/Interpreters/ExpressionJIT.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Interpreters/ExpressionJIT.cpp b/src/Interpreters/ExpressionJIT.cpp
index 27089ab8d37..de31d8cd7c5 100644
--- a/src/Interpreters/ExpressionJIT.cpp
+++ b/src/Interpreters/ExpressionJIT.cpp
@@ -380,25 +380,25 @@ static CompileDAG getCompilableDAG(
 
         if (!is_compilable_function || is_compilable_constant)
         {
-           CompileDAG::Node compile_node;
-           compile_node.function = node->function_base;
-           compile_node.result_type = node->result_type;
+            CompileDAG::Node compile_node;
+            compile_node.function = node->function_base;
+            compile_node.result_type = node->result_type;
 
-           if (is_compilable_constant)
-           {
-               compile_node.type = CompileDAG::CompileType::CONSTANT;
-               compile_node.column = node->column;
-           }
-           else
-           {
+            if (is_compilable_constant)
+            {
+                compile_node.type = CompileDAG::CompileType::CONSTANT;
+                compile_node.column = node->column;
+            }
+            else
+            {
                 compile_node.type = CompileDAG::CompileType::INPUT;
                 children.emplace_back(node);
-           }
+            }
 
-           visited_node_to_compile_dag_position[node] = dag.getNodesCount();
-           dag.addNode(std::move(compile_node));
-           stack.pop();
-           continue;
+            visited_node_to_compile_dag_position[node] = dag.getNodesCount();
+            dag.addNode(std::move(compile_node));
+            stack.pop();
+            continue;
         }
 
         while (frame.next_child_to_visit < node->children.size())

From 63e14fc38901ebea3aca530169b3012dbe7f8768 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Wed, 8 Sep 2021 22:23:57 +0300
Subject: [PATCH 118/273] Fix expressions compilation with short circuit
 evaluation

Before this patch, you may get the following error:

    Column Function is not a contiguous block of memory

Since under short circuit evaluation you may get Function not the
result.
---
 src/Interpreters/ExpressionJIT.cpp                         | 7 ++++---
 ...ile_expressions_with_short_circuit_evaluation.reference | 3 +++
 ...4_compile_expressions_with_short_circuit_evaluation.sql | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 tests/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.reference
 create mode 100644 tests/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.sql

diff --git a/src/Interpreters/ExpressionJIT.cpp b/src/Interpreters/ExpressionJIT.cpp
index de31d8cd7c5..9005b24b044 100644
--- a/src/Interpreters/ExpressionJIT.cpp
+++ b/src/Interpreters/ExpressionJIT.cpp
@@ -353,7 +353,8 @@ static bool isCompilableFunction(const ActionsDAG::Node & node, const std::unord
 
 static CompileDAG getCompilableDAG(
     const ActionsDAG::Node * root,
-    ActionsDAG::NodeRawConstPtrs & children)
+    ActionsDAG::NodeRawConstPtrs & children,
+    const std::unordered_set<const ActionsDAG::Node *> & lazy_executed_nodes)
 {
     /// Extract CompileDAG from root actions dag node.
 
@@ -376,7 +377,7 @@ static CompileDAG getCompilableDAG(
         const auto * node = frame.node;
 
         bool is_compilable_constant = isCompilableConstant(*node);
-        bool is_compilable_function = isCompilableFunction(*node, {});
+        bool is_compilable_function = isCompilableFunction(*node, lazy_executed_nodes);
 
         if (!is_compilable_function || is_compilable_constant)
         {
@@ -568,7 +569,7 @@ void ActionsDAG::compileFunctions(size_t min_count_to_compile_expression, const
     for (auto & node : nodes_to_compile)
     {
         NodeRawConstPtrs new_children;
-        auto dag = getCompilableDAG(node, new_children);
+        auto dag = getCompilableDAG(node, new_children, lazy_executed_nodes);
 
         if (dag.getInputNodesCount() == 0)
             continue;
diff --git a/tests/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.reference b/tests/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.reference
new file mode 100644
index 00000000000..af23232bb2e
--- /dev/null
+++ b/tests/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.reference
@@ -0,0 +1,3 @@
+-- { echo }
+select 1+number+multiIf(number == 1, cityHash64(number), number) from numbers(1) settings compile_expressions=1, min_count_to_compile_expression=0;
+1
diff --git a/tests/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.sql b/tests/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.sql
new file mode 100644
index 00000000000..113d0d9d4f7
--- /dev/null
+++ b/tests/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.sql
@@ -0,0 +1,2 @@
+-- { echo }
+select 1+number+multiIf(number == 1, cityHash64(number), number) from numbers(1) settings compile_expressions=1, min_count_to_compile_expression=0;

From 2359a222ff10789b8c43515bde1133242ff08313 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Thu, 9 Sep 2021 23:29:42 +0300
Subject: [PATCH 119/273] Fix more tests

---
 docker/test/integration/kerberos_kdc/Dockerfile            | 4 +++-
 .../runner/compose/docker_compose_kerberized_hdfs.yml      | 2 +-
 tests/integration/test_mysql_protocol/golang.reference     | 7 ++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/docker/test/integration/kerberos_kdc/Dockerfile b/docker/test/integration/kerberos_kdc/Dockerfile
index 7805d8f1d1c..a203c33a331 100644
--- a/docker/test/integration/kerberos_kdc/Dockerfile
+++ b/docker/test/integration/kerberos_kdc/Dockerfile
@@ -1,5 +1,7 @@
 # docker build -t clickhouse/kerberos-kdc .
-FROM centos:7
+FROM centos:6
+
+RUN sed -i '/^mirrorlist/s/^/#/;/^#baseurl/{s/#//;s/mirror.centos.org\/centos\/$releasever/vault.centos.org\/6.10/}' /etc/yum.repos.d/*B*
 
 RUN yum install -y ca-certificates krb5-server krb5-libs krb5-auth-dialog krb5-workstation
 
diff --git a/docker/test/integration/runner/compose/docker_compose_kerberized_hdfs.yml b/docker/test/integration/runner/compose/docker_compose_kerberized_hdfs.yml
index 236c4f10b01..88be3e45085 100644
--- a/docker/test/integration/runner/compose/docker_compose_kerberized_hdfs.yml
+++ b/docker/test/integration/runner/compose/docker_compose_kerberized_hdfs.yml
@@ -4,7 +4,7 @@ services:
   kerberizedhdfs1:
     cap_add:
       - DAC_READ_SEARCH
-    image: clickhouse/kerberized-hadoop:16621
+    image: clickhouse/kerberized-hadoop
     hostname: kerberizedhdfs1
     restart: always
     volumes:
diff --git a/tests/integration/test_mysql_protocol/golang.reference b/tests/integration/test_mysql_protocol/golang.reference
index 082149b4644..4069b2a086a 100644
--- a/tests/integration/test_mysql_protocol/golang.reference
+++ b/tests/integration/test_mysql_protocol/golang.reference
@@ -1,7 +1,7 @@
 Columns:
 a
 Column types:
-a BIGINT
+a UNSIGNED BIGINT
 Result:
 0
 1
@@ -10,14 +10,15 @@ name
 a
 Column types:
 name CHAR
-a TINYINT
+a UNSIGNED TINYINT
 Result:
 tables 1
+tables 1
 Columns:
 a
 b
 Column types:
 a CHAR
-b TINYINT
+b UNSIGNED TINYINT
 Result:
 тест 1

From 62b15122ff33482db71e21f5a9bf9dc454a97df9 Mon Sep 17 00:00:00 2001
From: Dmitriy <72220289+sevirov@users.noreply.github.com>
Date: Thu, 9 Sep 2021 23:33:08 +0300
Subject: [PATCH 120/273] DOCSUP-13875: Document the
 replication_wait_for_inactive_replica_timeout setting (#28464)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add documentation of settings

Задокументировал две настройки.

* Fix links

Поправил ссылки.

* Update docs/en/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/en/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/en/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/en/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

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

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

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

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/en/sql-reference/statements/optimize.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/en/sql-reference/statements/truncate.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/en/sql-reference/statements/truncate.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Translate to Russian

Выполнил перевод на русский язык.

* Fix links

Поправил ссылки.

* Update settings.md

Поправил перевод.

* Update docs/en/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

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

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/en/sql-reference/statements/optimize.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/en/sql-reference/statements/truncate.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/ru/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/ru/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/en/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Fix errors

Исправил неточности в описании.

* Update optimize.md

Поправил описание запроса OPTIMIZE.

Co-authored-by: Dmitriy <sevirov@yandex-team.ru>
Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
---
 docs/en/operations/settings/settings.md       | 24 +++++++++++++++++
 .../sql-reference/statements/alter/index.md   |  8 ++++--
 docs/en/sql-reference/statements/optimize.md  |  6 ++++-
 docs/en/sql-reference/statements/truncate.md  |  7 +++++
 docs/ru/operations/settings/settings.md       | 26 ++++++++++++++++++-
 .../sql-reference/statements/alter/index.md   |  9 ++++---
 docs/ru/sql-reference/statements/optimize.md  |  7 ++++-
 docs/ru/sql-reference/statements/truncate.md  |  5 ++++
 8 files changed, 84 insertions(+), 8 deletions(-)

diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index 7bd08549cb8..6c5767d28e0 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -3499,6 +3499,30 @@ Possible values:
 
 Default value: `0`.
 
+## replication_alter_partitions_sync {#replication-alter-partitions-sync}
+
+Allows to set up waiting for actions to be executed on replicas by [ALTER](../../sql-reference/statements/alter/index.md), [OPTIMIZE](../../sql-reference/statements/optimize.md) or [TRUNCATE](../../sql-reference/statements/truncate.md) queries.
+
+Possible values:
+
+-   0 — Do not wait.
+-   1 — Wait for own execution.
+-   2 — Wait for everyone.
+
+Default value: `1`.
+
+## replication_wait_for_inactive_replica_timeout {#replication-wait-for-inactive-replica-timeout}
+
+Specifies how long (in seconds) to wait for inactive replicas to execute [ALTER](../../sql-reference/statements/alter/index.md), [OPTIMIZE](../../sql-reference/statements/optimize.md) or [TRUNCATE](../../sql-reference/statements/truncate.md) queries.
+
+Possible values:
+
+-   0 — Do not wait.
+-   Negative integer — Wait for unlimited time.
+-   Positive integer — The number of seconds to wait.
+
+Default value: `120` seconds.
+
 ## regexp_max_matches_per_row {#regexp-max-matches-per-row}
 
 Sets the maximum number of matches for a single regular expression per row. Use it to protect against memory overload when using greedy regular expression in the [extractAllGroupsHorizontal](../../sql-reference/functions/string-search-functions.md#extractallgroups-horizontal) function.
diff --git a/docs/en/sql-reference/statements/alter/index.md b/docs/en/sql-reference/statements/alter/index.md
index 71333e6fcce..382306016e6 100644
--- a/docs/en/sql-reference/statements/alter/index.md
+++ b/docs/en/sql-reference/statements/alter/index.md
@@ -43,7 +43,11 @@ Entries for finished mutations are not deleted right away (the number of preserv
 
 For non-replicated tables, all `ALTER` queries are performed synchronously. For replicated tables, the query just adds instructions for the appropriate actions to `ZooKeeper`, and the actions themselves are performed as soon as possible. However, the query can wait for these actions to be completed on all the replicas.
 
-For `ALTER ... ATTACH|DETACH|DROP` queries, you can use the `replication_alter_partitions_sync` setting to set up waiting. Possible values: `0` – do not wait; `1` – only wait for own execution (default); `2` – wait for all.
+For all `ALTER` queries, you can use the [replication_alter_partitions_sync](../../../operations/settings/settings.md#replication-alter-partitions-sync) setting to set up waiting.
+
+You can specify how long (in seconds) to wait for inactive replicas to execute all `ALTER` queries with the [replication_wait_for_inactive_replica_timeout](../../../operations/settings/settings.md#replication-wait-for-inactive-replica-timeout) setting.
+
+!!! info "Note"
+    For all `ALTER` queries, if `replication_alter_partitions_sync = 2` and some replicas are not active for more than the time, specified in the `replication_wait_for_inactive_replica_timeout` setting, then an exception `UNFINISHED` is thrown.
 
 For `ALTER TABLE ... UPDATE|DELETE` queries the synchronicity is defined by the [mutations_sync](../../../operations/settings/settings.md#mutations_sync) setting.
-
diff --git a/docs/en/sql-reference/statements/optimize.md b/docs/en/sql-reference/statements/optimize.md
index 864509cec94..4054f373cc1 100644
--- a/docs/en/sql-reference/statements/optimize.md
+++ b/docs/en/sql-reference/statements/optimize.md
@@ -18,13 +18,17 @@ OPTIMIZE TABLE [db.]name [ON CLUSTER cluster] [PARTITION partition | PARTITION I
 
 The `OPTMIZE` query is supported for [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) family, the [MaterializedView](../../engines/table-engines/special/materializedview.md) and the [Buffer](../../engines/table-engines/special/buffer.md) engines. Other table engines aren’t supported.
 
-When `OPTIMIZE` is used with the [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md) family of table engines, ClickHouse creates a task for merging and waits for execution on all nodes (if the `replication_alter_partitions_sync` setting is enabled).
+When `OPTIMIZE` is used with the [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md) family of table engines, ClickHouse creates a task for merging and waits for execution on all replicas (if the [replication_alter_partitions_sync](../../operations/settings/settings.md#replication-alter-partitions-sync) setting is set to `2`) or on current replica (if the [replication_alter_partitions_sync](../../operations/settings/settings.md#replication-alter-partitions-sync) setting is set to `1`).
 
 -   If `OPTIMIZE` does not perform a merge for any reason, it does not notify the client. To enable notifications, use the [optimize_throw_if_noop](../../operations/settings/settings.md#setting-optimize_throw_if_noop) setting.
 -   If you specify a `PARTITION`, only the specified partition is optimized. [How to set partition expression](../../sql-reference/statements/alter/index.md#alter-how-to-specify-part-expr).
 -   If you specify `FINAL`, optimization is performed even when all the data is already in one part. Also merge is forced even if concurrent merges are performed.
 -   If you specify `DEDUPLICATE`, then completely identical rows (unless by-clause is specified) will be deduplicated (all columns are compared), it makes sense only for the MergeTree engine.
 
+You can specify how long (in seconds) to wait for inactive replicas to execute `OPTIMIZE` queries by the [replication_wait_for_inactive_replica_timeout](../../operations/settings/settings.md#replication-wait-for-inactive-replica-timeout) setting.
+
+!!! info "Note"
+    If the `replication_alter_partitions_sync` is set to `2` and some replicas are not active for more than the time, specified by the `replication_wait_for_inactive_replica_timeout` setting, then an exception `UNFINISHED` is thrown.
 
 ## BY expression {#by-expression}
 
diff --git a/docs/en/sql-reference/statements/truncate.md b/docs/en/sql-reference/statements/truncate.md
index f302a8605e2..b5354196fa4 100644
--- a/docs/en/sql-reference/statements/truncate.md
+++ b/docs/en/sql-reference/statements/truncate.md
@@ -12,3 +12,10 @@ TRUNCATE TABLE [IF EXISTS] [db.]name [ON CLUSTER cluster]
 Removes all data from a table. When the clause `IF EXISTS` is omitted, the query returns an error if the table does not exist.
 
 The `TRUNCATE` query is not supported for [View](../../engines/table-engines/special/view.md), [File](../../engines/table-engines/special/file.md), [URL](../../engines/table-engines/special/url.md), [Buffer](../../engines/table-engines/special/buffer.md) and [Null](../../engines/table-engines/special/null.md) table engines.
+
+You can use the [replication_alter_partitions_sync](../../operations/settings/settings.md#replication-alter-partitions-sync) setting to set up waiting for actions to be executed on replicas.
+
+You can specify how long (in seconds) to wait for inactive replicas to execute `TRUNCATE` queries with the [replication_wait_for_inactive_replica_timeout](../../operations/settings/settings.md#replication-wait-for-inactive-replica-timeout) setting.
+
+!!! info "Note"
+    If the `replication_alter_partitions_sync` is set to `2` and some replicas are not active for more than the time, specified by the `replication_wait_for_inactive_replica_timeout` setting, then an exception `UNFINISHED` is thrown.
diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index 9ad300b8c9c..f55edec62d1 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -3308,6 +3308,30 @@ SETTINGS index_granularity = 8192 │
 
 Значение по умолчанию: `0`.
 
+## replication_alter_partitions_sync {#replication-alter-partitions-sync}
+
+Позволяет настроить ожидание выполнения действий на репликах запросами [ALTER](../../sql-reference/statements/alter/index.md), [OPTIMIZE](../../sql-reference/statements/optimize.md) или [TRUNCATE](../../sql-reference/statements/truncate.md).
+
+Возможные значения:
+
+-   0 — не ждать.
+-   1 — ждать выполнения действий на своей реплике.
+-   2 — ждать выполнения действий на всех репликах.
+
+Значение по умолчанию: `1`.
+
+## replication_wait_for_inactive_replica_timeout {#replication-wait-for-inactive-replica-timeout}
+
+Указывает время ожидания (в секундах) выполнения запросов [ALTER](../../sql-reference/statements/alter/index.md), [OPTIMIZE](../../sql-reference/statements/optimize.md) или [TRUNCATE](../../sql-reference/statements/truncate.md) для неактивных реплик.
+
+Возможные значения:
+
+-   0 — не ждать.
+-   Отрицательное целое число — ждать неограниченное время.
+-   Положительное целое число — установить соответствующее количество секунд ожидания.
+
+Значение по умолчанию: `120` секунд.
+
 ## regexp_max_matches_per_row {#regexp-max-matches-per-row}
 
 Задает максимальное количество совпадений для регулярного выражения. Настройка применяется для защиты памяти от перегрузки при использовании "жадных" квантификаторов в регулярном выражении для функции [extractAllGroupsHorizontal](../../sql-reference/functions/string-search-functions.md#extractallgroups-horizontal).
@@ -3316,4 +3340,4 @@ SETTINGS index_granularity = 8192 │
 
 -   Положительное целое число.
 
-Значение по умолчанию: `1000`.
\ No newline at end of file
+Значение по умолчанию: `1000`.
diff --git a/docs/ru/sql-reference/statements/alter/index.md b/docs/ru/sql-reference/statements/alter/index.md
index 043ac3839d9..2b7caa5ad5b 100644
--- a/docs/ru/sql-reference/statements/alter/index.md
+++ b/docs/ru/sql-reference/statements/alter/index.md
@@ -64,8 +64,11 @@ ALTER TABLE [db.]table MATERIALIZE INDEX name IN PARTITION partition_name
 
 Для нереплицируемых таблиц, все запросы `ALTER` выполняются синхронно. Для реплицируемых таблиц, запрос всего лишь добавляет инструкцию по соответствующим действиям в `ZooKeeper`, а сами действия осуществляются при первой возможности. Но при этом, запрос может ждать завершения выполнения этих действий на всех репликах.
 
-Для запросов `ALTER ... ATTACH|DETACH|DROP` можно настроить ожидание, с помощью настройки `replication_alter_partitions_sync`.
-Возможные значения: `0` - не ждать, `1` - ждать выполнения только у себя (по умолчанию), `2` - ждать всех.
+Для всех запросов `ALTER` можно настроить ожидание с помощью настройки [replication_alter_partitions_sync](../../../operations/settings/settings.md#replication-alter-partitions-sync).
+
+Вы можете указать время ожидания (в секундах) выполнения всех запросов `ALTER` для неактивных реплик с помощью настройки [replication_wait_for_inactive_replica_timeout](../../../operations/settings/settings.md#replication-wait-for-inactive-replica-timeout).
+
+!!! info "Примечание"
+    Для всех запросов `ALTER` при `replication_alter_partitions_sync = 2` и неактивности некоторых реплик больше времени, заданного настройкой `replication_wait_for_inactive_replica_timeout`, генерируется исключение `UNFINISHED`.
 
 Для запросов `ALTER TABLE ... UPDATE|DELETE` синхронность выполнения определяется настройкой [mutations_sync](../../../operations/settings/settings.md#mutations_sync).
-
diff --git a/docs/ru/sql-reference/statements/optimize.md b/docs/ru/sql-reference/statements/optimize.md
index 1f0c5a0ebe9..e6a71c4f611 100644
--- a/docs/ru/sql-reference/statements/optimize.md
+++ b/docs/ru/sql-reference/statements/optimize.md
@@ -18,7 +18,7 @@ OPTIMIZE TABLE [db.]name [ON CLUSTER cluster] [PARTITION partition | PARTITION I
 
 Может применяться к таблицам семейства [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md), [MaterializedView](../../engines/table-engines/special/materializedview.md) и [Buffer](../../engines/table-engines/special/buffer.md). Другие движки таблиц не поддерживаются.
 
-Если запрос `OPTIMIZE` применяется к таблицам семейства [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md), ClickHouse создаёт задачу на слияние и ожидает её исполнения на всех узлах (если активирована настройка `replication_alter_partitions_sync`).
+Если запрос `OPTIMIZE` применяется к таблицам семейства [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md), ClickHouse создаёт задачу на слияние и ожидает её исполнения на всех репликах (если значение настройки [replication_alter_partitions_sync](../../operations/settings/settings.md#replication-alter-partitions-sync) равно `2`) или на текущей реплике (если значение настройки [replication_alter_partitions_sync](../../operations/settings/settings.md#replication-alter-partitions-sync) равно `1`).
 
 -   По умолчанию, если запросу `OPTIMIZE` не удалось выполнить слияние, то
 ClickHouse не оповещает клиента. Чтобы включить оповещения, используйте настройку [optimize_throw_if_noop](../../operations/settings/settings.md#setting-optimize_throw_if_noop).
@@ -26,6 +26,11 @@ ClickHouse не оповещает клиента. Чтобы включить 
 -   Если указать `FINAL`, то оптимизация выполняется даже в том случае, если все данные уже лежат в одном куске данных. Кроме того, слияние является принудительным, даже если выполняются параллельные слияния.
 -   Если указать `DEDUPLICATE`, то произойдет схлопывание полностью одинаковых строк (сравниваются значения во всех столбцах), имеет смысл только для движка MergeTree.
 
+Вы можете указать время ожидания (в секундах) выполнения запросов `OPTIMIZE` для неактивных реплик с помощью настройки [replication_wait_for_inactive_replica_timeout](../../operations/settings/settings.md#replication-wait-for-inactive-replica-timeout).
+
+!!! info "Примечание"
+    Если значение настройки `replication_alter_partitions_sync` равно `2` и некоторые реплики не активны больше времени, заданного настройкой `replication_wait_for_inactive_replica_timeout`, то генерируется исключение `UNFINISHED`.
+
 ## Выражение BY {#by-expression}
 
 Чтобы выполнить дедупликацию по произвольному набору столбцов, вы можете явно указать список столбцов или использовать любую комбинацию подстановки [`*`](../../sql-reference/statements/select/index.md#asterisk), выражений [`COLUMNS`](../../sql-reference/statements/select/index.md#columns-expression) и [`EXCEPT`](../../sql-reference/statements/select/index.md#except-modifier).
diff --git a/docs/ru/sql-reference/statements/truncate.md b/docs/ru/sql-reference/statements/truncate.md
index 63f7fa86ea5..028959690cd 100644
--- a/docs/ru/sql-reference/statements/truncate.md
+++ b/docs/ru/sql-reference/statements/truncate.md
@@ -13,4 +13,9 @@ TRUNCATE TABLE [IF EXISTS] [db.]name [ON CLUSTER cluster]
 
 Запрос `TRUNCATE` не поддерживается для следующих движков: [View](../../engines/table-engines/special/view.md), [File](../../engines/table-engines/special/file.md), [URL](../../engines/table-engines/special/url.md), [Buffer](../../engines/table-engines/special/buffer.md) и [Null](../../engines/table-engines/special/null.md).
 
+Вы можете настроить ожидание выполнения действий на репликах с помощью настройки [replication_alter_partitions_sync](../../operations/settings/settings.md#replication-alter-partitions-sync).
 
+Вы можете указать время ожидания (в секундах) выполнения запросов `TRUNCATE` для неактивных реплик с помощью настройки [replication_wait_for_inactive_replica_timeout](../../operations/settings/settings.md#replication-wait-for-inactive-replica-timeout).
+
+!!! info "Примечание"
+    Если значение настройки `replication_alter_partitions_sync` равно `2` и некоторые реплики не активны больше времени, заданного настройкой `replication_wait_for_inactive_replica_timeout`, то генерируется исключение `UNFINISHED`.

From 338020e8ed9c0fce4d9e5590e24f9430bc874518 Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Mon, 23 Aug 2021 19:34:52 +0300
Subject: [PATCH 121/273] rename __lsan_ignore_object --> lsan_ignore_object in
 phdr_cache.cpp

---
 base/common/phdr_cache.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/base/common/phdr_cache.cpp b/base/common/phdr_cache.cpp
index 49d566dac19..4ac9bb2a8c8 100644
--- a/base/common/phdr_cache.cpp
+++ b/base/common/phdr_cache.cpp
@@ -82,9 +82,9 @@ int dl_iterate_phdr(int (*callback) (dl_phdr_info * info, size_t size, void * da
 extern "C"
 {
 #ifdef ADDRESS_SANITIZER
-void __lsan_ignore_object(const void *);
+void lsan_ignore_object(const void *);
 #else
-void __lsan_ignore_object(const void *) {} // NOLINT
+void lsan_ignore_object(const void *) {} // NOLINT
 #endif
 }
 
@@ -107,7 +107,7 @@ void updatePHDRCache()
     phdr_cache.store(new_phdr_cache);
 
     /// Memory is intentionally leaked.
-    __lsan_ignore_object(new_phdr_cache);
+    lsan_ignore_object(new_phdr_cache);
 }
 
 

From a7b2867d3daca18ee174fb2bbbe4e4588634ce07 Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Mon, 23 Aug 2021 19:41:44 +0300
Subject: [PATCH 122/273] fix reserved-identifier in readpassphrase.c

---
 base/readpassphrase/readpassphrase.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/base/readpassphrase/readpassphrase.c b/base/readpassphrase/readpassphrase.c
index 8a7d3153915..3bcad34e481 100644
--- a/base/readpassphrase/readpassphrase.c
+++ b/base/readpassphrase/readpassphrase.c
@@ -27,6 +27,10 @@
 #define _PATH_TTY "/dev/tty"
 #endif
 
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include <termios.h>
 #include <signal.h>
 #include <ctype.h>

From a46d23fa79588d86085c0e9aa3020d46df57f7d0 Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Mon, 23 Aug 2021 20:07:05 +0300
Subject: [PATCH 123/273] ignore reserved-macro-identifier when building lib
 mysqlxx

---
 base/mysqlxx/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/base/mysqlxx/CMakeLists.txt b/base/mysqlxx/CMakeLists.txt
index c5230c2b49f..947f61f9051 100644
--- a/base/mysqlxx/CMakeLists.txt
+++ b/base/mysqlxx/CMakeLists.txt
@@ -49,6 +49,8 @@ if (NOT USE_INTERNAL_MYSQL_LIBRARY AND OPENSSL_INCLUDE_DIR)
     target_include_directories (mysqlxx SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
 endif ()
 
+target_no_warning(mysqlxx reserved-macro-identifier)
+
 if (NOT USE_INTERNAL_MYSQL_LIBRARY AND USE_STATIC_LIBRARIES)
    message(WARNING "Statically linking with system mysql/mariadb only works "
            "if mysql client libraries are built with same openssl version as "

From 39929e52bd1f6c1a554739a5dc8bdb32109cdfad Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Mon, 23 Aug 2021 21:07:42 +0300
Subject: [PATCH 124/273] add ignore of -Wreserved-identifier into
 LineReader.cpp, ThreadFuzzer.cpp, ReadBufferFromFileDescriptor.cpp

---
 base/common/LineReader.cpp              | 4 ++++
 src/Common/ThreadFuzzer.cpp             | 4 ++++
 src/IO/ReadBufferFromFileDescriptor.cpp | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/base/common/LineReader.cpp b/base/common/LineReader.cpp
index a32906dd5a5..7dc37322bb0 100644
--- a/base/common/LineReader.cpp
+++ b/base/common/LineReader.cpp
@@ -16,6 +16,10 @@ extern "C"
 }
 #endif
 
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 namespace
 {
 
diff --git a/src/Common/ThreadFuzzer.cpp b/src/Common/ThreadFuzzer.cpp
index a538ba7a49a..9963a5308c3 100644
--- a/src/Common/ThreadFuzzer.cpp
+++ b/src/Common/ThreadFuzzer.cpp
@@ -31,6 +31,10 @@
         M(int, pthread_mutex_unlock, pthread_mutex_t * arg)
 #endif
 
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 namespace DB
 {
 
diff --git a/src/IO/ReadBufferFromFileDescriptor.cpp b/src/IO/ReadBufferFromFileDescriptor.cpp
index 7e539f94d39..3d981a48979 100644
--- a/src/IO/ReadBufferFromFileDescriptor.cpp
+++ b/src/IO/ReadBufferFromFileDescriptor.cpp
@@ -11,6 +11,10 @@
 #include <sys/stat.h>
 
 
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 namespace ProfileEvents
 {
     extern const Event ReadBufferFromFileDescriptorRead;

From ecff16de4823aa8597399c5710cf727cdba161a1 Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Mon, 23 Aug 2021 22:03:24 +0300
Subject: [PATCH 125/273] ignore diagnostic -Wreserved-identifier in file
 base/common/unit.h

---
 base/common/unit.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/base/common/unit.h b/base/common/unit.h
index d5c8d5c9027..5bf5e00c049 100644
--- a/base/common/unit.h
+++ b/base/common/unit.h
@@ -1,6 +1,10 @@
 #pragma once
 #include <cstddef>
 
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 constexpr size_t KiB = 1024;
 constexpr size_t MiB = 1024 * KiB;
 constexpr size_t GiB = 1024 * MiB;

From f6b613bc6b20a47af2fb5f6e761c00973e5c3b90 Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Mon, 23 Aug 2021 22:14:40 +0300
Subject: [PATCH 126/273] ignore diagnostic -Wreserved-identifier in
 CompressionCodecGorilla.cpp and CompressionCodecDoubleDelta.cpp

---
 src/Compression/CompressionCodecDoubleDelta.cpp | 4 ++++
 src/Compression/CompressionCodecGorilla.cpp     | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/Compression/CompressionCodecDoubleDelta.cpp b/src/Compression/CompressionCodecDoubleDelta.cpp
index 3f96cfa8ff8..57b5a41c6f7 100644
--- a/src/Compression/CompressionCodecDoubleDelta.cpp
+++ b/src/Compression/CompressionCodecDoubleDelta.cpp
@@ -1,3 +1,7 @@
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include <Compression/ICompressionCodec.h>
 #include <Compression/CompressionInfo.h>
 #include <Compression/CompressionFactory.h>
diff --git a/src/Compression/CompressionCodecGorilla.cpp b/src/Compression/CompressionCodecGorilla.cpp
index 1276ac911f1..317116712cb 100644
--- a/src/Compression/CompressionCodecGorilla.cpp
+++ b/src/Compression/CompressionCodecGorilla.cpp
@@ -1,3 +1,7 @@
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include <Compression/ICompressionCodec.h>
 #include <Compression/CompressionInfo.h>
 #include <Compression/CompressionFactory.h>

From 74f6ac8976c476545cfb51cc249b4ffa2315a851 Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Mon, 23 Aug 2021 23:04:37 +0300
Subject: [PATCH 127/273] remove variable total_rows_in_lonely_parts that set
 but not used

---
 src/Processors/QueryPlan/ReadFromMergeTree.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.cpp b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
index ce717021c44..86d4a7c93b1 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.cpp
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
@@ -649,7 +649,6 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
     /// If do_not_merge_across_partitions_select_final is true and num_streams > 1
     /// we will store lonely parts with level > 0 to use parallel select on them.
     std::vector<RangesInDataPart> lonely_parts;
-    size_t total_rows_in_lonely_parts = 0;
     size_t sum_marks_in_lonely_parts = 0;
 
     for (size_t range_index = 0; range_index < parts_to_merge_ranges.size() - 1; ++range_index)
@@ -667,7 +666,6 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
                 std::distance(parts_to_merge_ranges[range_index], parts_to_merge_ranges[range_index + 1]) == 1 &&
                 parts_to_merge_ranges[range_index]->data_part->info.level > 0)
             {
-                total_rows_in_lonely_parts += parts_to_merge_ranges[range_index]->getRowsCount();
                 sum_marks_in_lonely_parts += parts_to_merge_ranges[range_index]->getMarksCount();
                 lonely_parts.push_back(std::move(*parts_to_merge_ranges[range_index]));
                 continue;

From c01bf5980569d0dd6b0f816722b90ce99b20ec48 Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Mon, 23 Aug 2021 23:07:00 +0300
Subject: [PATCH 128/273] ignore diagnostic -Wreserved-identifier in
 ArrowBufferedStreams.cpp

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

diff --git a/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp b/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
index 243f3da5903..e461baba7bc 100644
--- a/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
+++ b/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
@@ -1,3 +1,7 @@
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include "ArrowBufferedStreams.h"
 
 #if USE_ARROW || USE_ORC || USE_PARQUET

From 68e39519b4affd6e4a61c4fa6a2eae78b77dc01e Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Wed, 25 Aug 2021 23:04:41 +0300
Subject: [PATCH 129/273] add necessary constructors in ZooKeeperResponse

---
 src/Common/ZooKeeper/ZooKeeperCommon.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Common/ZooKeeper/ZooKeeperCommon.h b/src/Common/ZooKeeper/ZooKeeperCommon.h
index 16190aa25d3..a51ca9a487e 100644
--- a/src/Common/ZooKeeper/ZooKeeperCommon.h
+++ b/src/Common/ZooKeeper/ZooKeeperCommon.h
@@ -30,6 +30,8 @@ struct ZooKeeperResponse : virtual Response
     XID xid = 0;
     int64_t zxid = 0;
 
+    ZooKeeperResponse() = default;
+    ZooKeeperResponse(const ZooKeeperResponse &) = default;
     virtual ~ZooKeeperResponse() override = default;
     virtual void readImpl(ReadBuffer &) = 0;
     virtual void writeImpl(WriteBuffer &) const = 0;

From 14de0c0b0ffcd831125cb37b5cd14b93845a4349 Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Wed, 25 Aug 2021 23:16:35 +0300
Subject: [PATCH 130/273] solve problem with FunctionsCodingIP.cpp

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

diff --git a/src/Functions/FunctionsCodingIP.cpp b/src/Functions/FunctionsCodingIP.cpp
index 1a217217787..3a1b04a4790 100644
--- a/src/Functions/FunctionsCodingIP.cpp
+++ b/src/Functions/FunctionsCodingIP.cpp
@@ -1,3 +1,7 @@
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnFixedString.h>

From 212182a87c33cc5c3a620dbb3b65bf831fe87f08 Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Wed, 25 Aug 2021 23:34:53 +0300
Subject: [PATCH 131/273] solve problem with TargetSpecific.h

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

diff --git a/src/Functions/TargetSpecific.h b/src/Functions/TargetSpecific.h
index e6d3fe6d665..f8e850dc36d 100644
--- a/src/Functions/TargetSpecific.h
+++ b/src/Functions/TargetSpecific.h
@@ -106,7 +106,7 @@ String toString(TargetArch arch);
 /* Clang shows warning when there aren't any objects to apply pragma.
  * To prevent this warning we define this function inside every macros with pragmas.
  */
-#   define DUMMY_FUNCTION_DEFINITION [[maybe_unused]] void __dummy_function_definition();
+#   define DUMMY_FUNCTION_DEFINITION [[maybe_unused]] void _dummy_function_definition();
 #else
 #   define BEGIN_AVX512F_SPECIFIC_CODE \
         _Pragma("GCC push_options") \

From f92e720d1890ae0dceea536dce1280cf45dc697a Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Thu, 26 Aug 2021 00:33:09 +0300
Subject: [PATCH 132/273] fix gtest_bit_io.cpp

---
 src/IO/tests/gtest_bit_io.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/IO/tests/gtest_bit_io.cpp b/src/IO/tests/gtest_bit_io.cpp
index 2302a6c6135..53bc4c9ae82 100644
--- a/src/IO/tests/gtest_bit_io.cpp
+++ b/src/IO/tests/gtest_bit_io.cpp
@@ -1,3 +1,7 @@
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include <string.h>
 #include <IO/BitHelpers.h>
 
@@ -158,7 +162,6 @@ TEST_P(BitIO, WriteAndRead)
 
         BitReader reader(data.data(), data.size());
 
-        int bitpos = 0;
         int item = 0;
         for (const auto & bv : bits_and_vals)
         {
@@ -172,7 +175,6 @@ TEST_P(BitIO, WriteAndRead)
             ASSERT_TRUE(BinaryEqual(getBits(bv.first, bv.second), reader.readBits(bv.first)));
 
             ++item;
-            bitpos += bv.first;
         }
     }
 }

From 2fbd4605100b2e014a675f39e23dbc15a8298b1e Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Thu, 26 Aug 2021 01:22:38 +0300
Subject: [PATCH 133/273] solve problem with memcpy-bench.cpp

---
 utils/memcpy-bench/memcpy-bench.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/utils/memcpy-bench/memcpy-bench.cpp b/utils/memcpy-bench/memcpy-bench.cpp
index 025c9100f75..3cd2323672a 100644
--- a/utils/memcpy-bench/memcpy-bench.cpp
+++ b/utils/memcpy-bench/memcpy-bench.cpp
@@ -1,3 +1,7 @@
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include <memory>
 #include <cstddef>
 #include <stdexcept>

From 61d46c09ee285fa45af18ea0d921327322f87c43 Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Fri, 27 Aug 2021 00:12:37 +0300
Subject: [PATCH 134/273] fix problem with phdr_cache.cpp (second try)

---
 base/common/phdr_cache.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/base/common/phdr_cache.cpp b/base/common/phdr_cache.cpp
index 4ac9bb2a8c8..8ca9137cd29 100644
--- a/base/common/phdr_cache.cpp
+++ b/base/common/phdr_cache.cpp
@@ -1,3 +1,7 @@
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 /// This code was based on the code by Fedor Korotkiy (prime@yandex-team.ru) for YT product in Yandex.
 
 #include <common/defines.h>
@@ -82,9 +86,9 @@ int dl_iterate_phdr(int (*callback) (dl_phdr_info * info, size_t size, void * da
 extern "C"
 {
 #ifdef ADDRESS_SANITIZER
-void lsan_ignore_object(const void *);
+void __lsan_ignore_object(const void *);
 #else
-void lsan_ignore_object(const void *) {} // NOLINT
+void __lsan_ignore_object(const void *) {} // NOLINT
 #endif
 }
 
@@ -107,7 +111,7 @@ void updatePHDRCache()
     phdr_cache.store(new_phdr_cache);
 
     /// Memory is intentionally leaked.
-    lsan_ignore_object(new_phdr_cache);
+    __lsan_ignore_object(new_phdr_cache);
 }
 
 

From b9bdaf0e7bafc637c9dfb4301585c6c3daa6ea80 Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Fri, 27 Aug 2021 11:21:19 +0300
Subject: [PATCH 135/273] fix problem with MemoryTracker

---
 src/Common/MemoryTracker.cpp | 6 +++---
 src/Common/MemoryTracker.h   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Common/MemoryTracker.cpp b/src/Common/MemoryTracker.cpp
index 50ddcb5a9eb..ad8647d6da4 100644
--- a/src/Common/MemoryTracker.cpp
+++ b/src/Common/MemoryTracker.cpp
@@ -15,7 +15,7 @@
 
 
 #ifdef MEMORY_TRACKER_DEBUG_CHECKS
-thread_local bool _memory_tracker_always_throw_logical_error_on_allocation = false;
+thread_local bool memory_tracker_always_throw_logical_error_on_allocation = false;
 #endif
 
 namespace
@@ -173,9 +173,9 @@ void MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceeded)
     }
 
 #ifdef MEMORY_TRACKER_DEBUG_CHECKS
-    if (unlikely(_memory_tracker_always_throw_logical_error_on_allocation))
+    if (unlikely(memory_tracker_always_throw_logical_error_on_allocation))
     {
-        _memory_tracker_always_throw_logical_error_on_allocation = false;
+        memory_tracker_always_throw_logical_error_on_allocation = false;
         throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "Memory tracker: allocations not allowed.");
     }
 #endif
diff --git a/src/Common/MemoryTracker.h b/src/Common/MemoryTracker.h
index d87e922ef09..adba0b42f57 100644
--- a/src/Common/MemoryTracker.h
+++ b/src/Common/MemoryTracker.h
@@ -15,11 +15,11 @@
 /// DENY_ALLOCATIONS_IN_SCOPE in the inner scope. In Release builds these macros do nothing.
 #ifdef MEMORY_TRACKER_DEBUG_CHECKS
 #include <common/scope_guard.h>
-extern thread_local bool _memory_tracker_always_throw_logical_error_on_allocation;
+extern thread_local bool memory_tracker_always_throw_logical_error_on_allocation;
 #define ALLOCATIONS_IN_SCOPE_IMPL_CONCAT(n, val) \
-        bool _allocations_flag_prev_val##n = _memory_tracker_always_throw_logical_error_on_allocation; \
-        _memory_tracker_always_throw_logical_error_on_allocation = val; \
-        SCOPE_EXIT({ _memory_tracker_always_throw_logical_error_on_allocation = _allocations_flag_prev_val##n; })
+        bool _allocations_flag_prev_val##n = memory_tracker_always_throw_logical_error_on_allocation; \
+        memory_tracker_always_throw_logical_error_on_allocation = val; \
+        SCOPE_EXIT({ memory_tracker_always_throw_logical_error_on_allocation = _allocations_flag_prev_val##n; })
 #define ALLOCATIONS_IN_SCOPE_IMPL(n, val) ALLOCATIONS_IN_SCOPE_IMPL_CONCAT(n, val)
 #define DENY_ALLOCATIONS_IN_SCOPE ALLOCATIONS_IN_SCOPE_IMPL(__LINE__, true)
 #define ALLOW_ALLOCATIONS_IN_SCOPE ALLOCATIONS_IN_SCOPE_IMPL(__LINE__, false)

From ff635bcab8b222d46379530f05ef73eed6688639 Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Fri, 27 Aug 2021 22:53:27 +0300
Subject: [PATCH 136/273] add build with clang-13

---
 docker/packager/binary/Dockerfile |  4 ++++
 tests/ci/ci_config.json           | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index f5d496ce97f..51fa6f3296a 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -62,6 +62,10 @@ RUN apt-get update \
         tzdata \
         --yes --no-install-recommends
 
+RUN wget https://apt.llvm.org/llvm.sh \
+    && chmod +x llvm.sh \
+    &&  ./llvm.sh 13
+
 # This symlink required by gcc to find lld compiler
 RUN ln -s /usr/bin/lld-${LLVM_VERSION} /usr/bin/ld.lld
 
diff --git a/tests/ci/ci_config.json b/tests/ci/ci_config.json
index 26c8d560312..9e8a9c5eec7 100644
--- a/tests/ci/ci_config.json
+++ b/tests/ci/ci_config.json
@@ -100,6 +100,16 @@
             "splitted": "unsplitted",
             "tidy": "disable",
             "with_coverage": false
+        },
+        {
+            "compiler": "clang-13",
+            "build-type": "debug",
+            "sanitizer": "",
+            "package-type": "binary",
+            "bundled": "bundled",
+            "splitted": "unsplitted",
+            "tidy": "disable",
+            "with_coverage": false
         }
     ],
     "special_build_config": [

From 63b3b90d1e5042924e93d465687ac25856149580 Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Tue, 7 Sep 2021 00:51:41 +0300
Subject: [PATCH 137/273] up LLVM_VERSION and don't use script for llvm setup

---
 docker/packager/binary/Dockerfile | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index 51fa6f3296a..eef86b3534b 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -1,7 +1,7 @@
 #  docker build -t yandex/clickhouse-binary-builder .
 FROM ubuntu:20.04
 
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=12
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
@@ -48,11 +48,11 @@ RUN apt-get update \
         gperf \
         libicu-dev \
         libreadline-dev \
-        clang-12 \
-        clang-tidy-12 \
-        lld-12 \
-        llvm-12 \
-        llvm-12-dev \
+        clang-${LLVM_VERSION} \
+        clang-tidy-${LLVM_VERSION} \
+        lld-${LLVM_VERSION} \
+        llvm-${LLVM_VERSION} \
+        llvm-${LLVM_VERSION}-dev \
         libicu-dev \
         libreadline-dev \
         moreutils \
@@ -62,10 +62,6 @@ RUN apt-get update \
         tzdata \
         --yes --no-install-recommends
 
-RUN wget https://apt.llvm.org/llvm.sh \
-    && chmod +x llvm.sh \
-    &&  ./llvm.sh 13
-
 # This symlink required by gcc to find lld compiler
 RUN ln -s /usr/bin/lld-${LLVM_VERSION} /usr/bin/ld.lld
 

From 0f2954ee97abc3334a03083f6066eee515962fcf Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Tue, 7 Sep 2021 00:54:36 +0300
Subject: [PATCH 138/273] remove extra clang-13 config

---
 tests/ci/ci_config.json | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/tests/ci/ci_config.json b/tests/ci/ci_config.json
index 9e8a9c5eec7..26c8d560312 100644
--- a/tests/ci/ci_config.json
+++ b/tests/ci/ci_config.json
@@ -100,16 +100,6 @@
             "splitted": "unsplitted",
             "tidy": "disable",
             "with_coverage": false
-        },
-        {
-            "compiler": "clang-13",
-            "build-type": "debug",
-            "sanitizer": "",
-            "package-type": "binary",
-            "bundled": "bundled",
-            "splitted": "unsplitted",
-            "tidy": "disable",
-            "with_coverage": false
         }
     ],
     "special_build_config": [

From b739d1cc92b874b888a39b3fc8a7f81a73f0b9ec Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Tue, 7 Sep 2021 01:08:57 +0300
Subject: [PATCH 139/273] make changes analog to
 https://github.com/ClickHouse/ClickHouse/pull/20495/files but for clang-13

---
 docker/builder/Dockerfile          |   2 +-
 docker/builder/build.sh            |   2 +-
 docker/packager/binary/Dockerfile  |   2 -
 docker/packager/deb/Dockerfile     |  12 +--
 docker/packager/packager           |   3 +-
 docker/test/base/Dockerfile        |   2 +-
 docker/test/codebrowser/Dockerfile |   4 +-
 docker/test/fasttest/Dockerfile    |   2 +-
 docker/test/fasttest/run.sh        |   2 +-
 docker/test/fuzzer/run-fuzzer.sh   |   2 +-
 docker/test/keeper-jepsen/run.sh   |   2 +-
 docs/en/development/build.md       |   8 +-
 tests/ci/ci_config.json            | 114 ++++++++++++++---------------
 13 files changed, 78 insertions(+), 79 deletions(-)

diff --git a/docker/builder/Dockerfile b/docker/builder/Dockerfile
index 9a1041ee743..5a998ffbe3e 100644
--- a/docker/builder/Dockerfile
+++ b/docker/builder/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=12
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
diff --git a/docker/builder/build.sh b/docker/builder/build.sh
index 7c7a8893751..1025af3f96e 100755
--- a/docker/builder/build.sh
+++ b/docker/builder/build.sh
@@ -4,7 +4,7 @@ set -e
 #ccache -s # uncomment to display CCache statistics
 mkdir -p /server/build_docker
 cd /server/build_docker
-cmake -G Ninja /server "-DCMAKE_C_COMPILER=$(command -v clang-12)" "-DCMAKE_CXX_COMPILER=$(command -v clang++-12)"
+cmake -G Ninja /server "-DCMAKE_C_COMPILER=$(command -v clang-13)" "-DCMAKE_CXX_COMPILER=$(command -v clang++-13)"
 
 # Set the number of build jobs to the half of number of virtual CPU cores (rounded up).
 # By default, ninja use all virtual CPU cores, that leads to very high memory consumption without much improvement in build time.
diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index eef86b3534b..71a7b7b07d8 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -53,8 +53,6 @@ RUN apt-get update \
         lld-${LLVM_VERSION} \
         llvm-${LLVM_VERSION} \
         llvm-${LLVM_VERSION}-dev \
-        libicu-dev \
-        libreadline-dev \
         moreutils \
         ninja-build \
         pigz \
diff --git a/docker/packager/deb/Dockerfile b/docker/packager/deb/Dockerfile
index 22bba94f250..8b10f662fcc 100644
--- a/docker/packager/deb/Dockerfile
+++ b/docker/packager/deb/Dockerfile
@@ -1,7 +1,7 @@
 # docker build -t yandex/clickhouse-deb-builder .
 FROM ubuntu:20.04
 
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=12
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
@@ -37,17 +37,17 @@ RUN curl -O https://clickhouse-datasets.s3.yandex.net/utils/1/dpkg-deb \
 RUN apt-get update \
     && apt-get install \
         alien \
-        clang-12 \
-        clang-tidy-12 \
+        clang-${LLVM_VERSION} \
+        clang-tidy-${LLVM_VERSION} \
         cmake \
         debhelper \
         devscripts \
         gdb  \
         git \
         gperf \
-        lld-12 \
-        llvm-12 \
-        llvm-12-dev \
+        lld-${LLVM_VERSION} \
+        llvm-${LLVM_VERSION} \
+        llvm-${LLVM_VERSION}-dev \
         moreutils \
         ninja-build \
         perl \
diff --git a/docker/packager/packager b/docker/packager/packager
index f37d64e9949..f6cbd78756b 100755
--- a/docker/packager/packager
+++ b/docker/packager/packager
@@ -205,7 +205,8 @@ if __name__ == "__main__":
     parser.add_argument("--build-type", choices=("debug", ""), default="")
     parser.add_argument("--compiler", choices=("clang-11", "clang-11-darwin", "clang-11-darwin-aarch64", "clang-11-aarch64",
                                                "clang-12", "clang-12-darwin", "clang-12-darwin-aarch64", "clang-12-aarch64",
-                                               "clang-11-freebsd", "clang-12-freebsd", "gcc-10"), default="clang-12")
+						 "clang-13", "clang-13-darwin", "clang-13-darwin-aarch64", "clang-13-aarch64",
+                                               "clang-11-freebsd", "clang-12-freebsd", "clang-13-freebsd", "gcc-10"), default="clang-13")
     parser.add_argument("--sanitizer", choices=("address", "thread", "memory", "undefined", ""), default="")
     parser.add_argument("--unbundled", action="store_true")
     parser.add_argument("--split-binary", action="store_true")
diff --git a/docker/test/base/Dockerfile b/docker/test/base/Dockerfile
index 88c9e1ae06e..4435d7fa06b 100644
--- a/docker/test/base/Dockerfile
+++ b/docker/test/base/Dockerfile
@@ -1,7 +1,7 @@
 # docker build -t yandex/clickhouse-test-base .
 FROM ubuntu:20.04
 
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=12
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
diff --git a/docker/test/codebrowser/Dockerfile b/docker/test/codebrowser/Dockerfile
index ae2aafa76c8..1beadb49a65 100644
--- a/docker/test/codebrowser/Dockerfile
+++ b/docker/test/codebrowser/Dockerfile
@@ -11,7 +11,7 @@ RUN apt-get update && apt-get --yes --allow-unauthenticated install clang-9 libl
 # https://github.com/ClickHouse-Extras/woboq_codebrowser/commit/37e15eaf377b920acb0b48dbe82471be9203f76b
 RUN git clone https://github.com/ClickHouse-Extras/woboq_codebrowser
 
-RUN cd woboq_codebrowser && cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang\+\+-12 -DCMAKE_C_COMPILER=clang-12 && make -j
+RUN cd woboq_codebrowser && cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang\+\+-13 -DCMAKE_C_COMPILER=clang-13 && make -j
 
 ENV CODEGEN=/woboq_codebrowser/generator/codebrowser_generator
 ENV CODEINDEX=/woboq_codebrowser/indexgenerator/codebrowser_indexgenerator
@@ -24,7 +24,7 @@ ENV SHA=nosha
 ENV DATA="data"
 
 CMD mkdir -p $BUILD_DIRECTORY && cd $BUILD_DIRECTORY && \
-    cmake $SOURCE_DIRECTORY -DCMAKE_CXX_COMPILER=/usr/bin/clang\+\+-12 -DCMAKE_C_COMPILER=/usr/bin/clang-12 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DENABLE_EMBEDDED_COMPILER=0 -DENABLE_S3=0 && \
+    cmake $SOURCE_DIRECTORY -DCMAKE_CXX_COMPILER=/usr/bin/clang\+\+-13 -DCMAKE_C_COMPILER=/usr/bin/clang-13 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DENABLE_EMBEDDED_COMPILER=0 -DENABLE_S3=0 && \
     mkdir -p $HTML_RESULT_DIRECTORY && \
     $CODEGEN -b $BUILD_DIRECTORY -a -o $HTML_RESULT_DIRECTORY -p ClickHouse:$SOURCE_DIRECTORY:$SHA -d $DATA | ts '%Y-%m-%d %H:%M:%S' && \
     cp -r $STATIC_DATA $HTML_RESULT_DIRECTORY/ &&\
diff --git a/docker/test/fasttest/Dockerfile b/docker/test/fasttest/Dockerfile
index 9443cbf496e..789e19fa4ed 100644
--- a/docker/test/fasttest/Dockerfile
+++ b/docker/test/fasttest/Dockerfile
@@ -1,7 +1,7 @@
 #  docker build -t yandex/clickhouse-fasttest .
 FROM ubuntu:20.04
 
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=12
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
 
 RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index 8a6b7f70cba..7116bff797d 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -9,7 +9,7 @@ trap 'kill $(jobs -pr) ||:' EXIT
 stage=${stage:-}
 
 # Compiler version, normally set by Dockerfile
-export LLVM_VERSION=${LLVM_VERSION:-12}
+export LLVM_VERSION=${LLVM_VERSION:-13}
 
 # A variable to pass additional flags to CMake.
 # Here we explicitly default it to nothing so that bash doesn't complain about
diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index 2247c6a22be..0b26476c20e 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -12,7 +12,7 @@ stage=${stage:-}
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 echo "$script_dir"
 repo_dir=ch
-BINARY_TO_DOWNLOAD=${BINARY_TO_DOWNLOAD:="clang-12_debug_none_bundled_unsplitted_disable_False_binary"}
+BINARY_TO_DOWNLOAD=${BINARY_TO_DOWNLOAD:="clang-13_debug_none_bundled_unsplitted_disable_False_binary"}
 
 function clone
 {
diff --git a/docker/test/keeper-jepsen/run.sh b/docker/test/keeper-jepsen/run.sh
index 8d31b5b7f1c..d7534270e2c 100644
--- a/docker/test/keeper-jepsen/run.sh
+++ b/docker/test/keeper-jepsen/run.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 
 
-CLICKHOUSE_PACKAGE=${CLICKHOUSE_PACKAGE:="https://clickhouse-builds.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/clang-12_relwithdebuginfo_none_bundled_unsplitted_disable_False_binary/clickhouse"}
+CLICKHOUSE_PACKAGE=${CLICKHOUSE_PACKAGE:="https://clickhouse-builds.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/clang-13_relwithdebuginfo_none_bundled_unsplitted_disable_False_binary/clickhouse"}
 CLICKHOUSE_REPO_PATH=${CLICKHOUSE_REPO_PATH:=""}
 
 
diff --git a/docs/en/development/build.md b/docs/en/development/build.md
index 8d1aae13957..a246d3dea0a 100644
--- a/docs/en/development/build.md
+++ b/docs/en/development/build.md
@@ -23,7 +23,7 @@ $ sudo apt-get install git cmake python ninja-build
 
 Or cmake3 instead of cmake on older systems.
 
-### Install clang-12 (recommended) {#install-clang-12}
+### Install clang-13 (recommended) {#install-clang-13}
 
 On Ubuntu/Debian you can use the automatic installation script (check [official webpage](https://apt.llvm.org/))
 
@@ -33,11 +33,11 @@ sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
 
 For other Linux distribution - check the availability of the [prebuild packages](https://releases.llvm.org/download.html) or build clang [from sources](https://clang.llvm.org/get_started.html).
 
-#### Use clang-12 for Builds
+#### Use clang-13 for Builds
 
 ``` bash
-$ export CC=clang-12
-$ export CXX=clang++-12
+$ export CC=clang-13
+$ export CXX=clang++-13
 ```
 
 Gcc can also be used though it is discouraged.
diff --git a/tests/ci/ci_config.json b/tests/ci/ci_config.json
index 26c8d560312..773dfef7f68 100644
--- a/tests/ci/ci_config.json
+++ b/tests/ci/ci_config.json
@@ -1,7 +1,7 @@
 {
     "build_config": [
         {
-            "compiler": "clang-12",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "",
             "package-type": "deb",
@@ -12,7 +12,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-12",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "",
             "package-type": "performance",
@@ -32,7 +32,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-12",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "address",
             "package-type": "deb",
@@ -42,7 +42,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-12",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "undefined",
             "package-type": "deb",
@@ -52,7 +52,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-12",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "thread",
             "package-type": "deb",
@@ -62,7 +62,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-12",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "memory",
             "package-type": "deb",
@@ -72,7 +72,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-12",
+            "compiler": "clang-13",
             "build-type": "debug",
             "sanitizer": "",
             "package-type": "deb",
@@ -92,7 +92,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-12",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "",
             "package-type": "binary",
@@ -104,7 +104,7 @@
     ],
     "special_build_config": [
         {
-            "compiler": "clang-12",
+            "compiler": "clang-13",
             "build-type": "debug",
             "sanitizer": "",
             "package-type": "deb",
@@ -114,7 +114,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-12",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "",
             "package-type": "binary",
@@ -124,7 +124,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-12-darwin",
+            "compiler": "clang-13-darwin",
             "build-type": "",
             "sanitizer": "",
             "package-type": "binary",
@@ -134,7 +134,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-12-aarch64",
+            "compiler": "clang-13-aarch64",
             "build-type": "",
             "sanitizer": "",
             "package-type": "binary",
@@ -144,7 +144,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-12-freebsd",
+            "compiler": "clang-13-freebsd",
             "build-type": "",
             "sanitizer": "",
             "package-type": "binary",
@@ -154,7 +154,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-12-darwin-aarch64",
+            "compiler": "clang-13-darwin-aarch64",
             "build-type": "",
             "sanitizer": "",
             "package-type": "binary",
@@ -167,7 +167,7 @@
     "tests_config": {
         "Functional stateful tests (address)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -179,7 +179,7 @@
         },
         "Functional stateful tests (thread)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "thread",
@@ -191,7 +191,7 @@
         },
         "Functional stateful tests (memory)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "memory",
@@ -203,7 +203,7 @@
         },
         "Functional stateful tests (ubsan)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "undefined",
@@ -215,7 +215,7 @@
         },
         "Functional stateful tests (debug)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "debug",
                 "sanitizer": "none",
@@ -227,7 +227,7 @@
         },
         "Functional stateful tests (release)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -239,7 +239,7 @@
         },
         "Functional stateful tests (release, DatabaseOrdinary)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -251,7 +251,7 @@
         },
         "Functional stateful tests (release, DatabaseReplicated)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -263,7 +263,7 @@
         },
         "Functional stateless tests (address)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -275,7 +275,7 @@
         },
         "Functional stateless tests (thread)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "thread",
@@ -287,7 +287,7 @@
         },
         "Functional stateless tests (memory)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "memory",
@@ -299,7 +299,7 @@
         },
         "Functional stateless tests (ubsan)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "undefined",
@@ -311,7 +311,7 @@
         },
         "Functional stateless tests (debug)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "debug",
                 "sanitizer": "none",
@@ -323,7 +323,7 @@
         },
         "Functional stateless tests (release)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -335,7 +335,7 @@
         },
         "Functional stateless tests (pytest)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -359,7 +359,7 @@
         },
         "Functional stateless tests (release, wide parts enabled)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -371,7 +371,7 @@
         },
         "Functional stateless tests (release, DatabaseOrdinary)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -383,7 +383,7 @@
         },
         "Functional stateless tests (release, DatabaseReplicated)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -395,7 +395,7 @@
         },
         "Stress test (address)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -407,7 +407,7 @@
         },
         "Stress test (thread)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "thread",
@@ -419,7 +419,7 @@
         },
         "Stress test (undefined)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "undefined",
@@ -431,7 +431,7 @@
         },
         "Stress test (memory)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "memory",
@@ -443,7 +443,7 @@
         },
         "Stress test (debug)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "debug",
                 "sanitizer": "none",
@@ -455,7 +455,7 @@
         },
         "Integration tests (asan)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -467,7 +467,7 @@
         },
         "Integration tests (thread)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "thread",
@@ -479,7 +479,7 @@
         },
         "Integration tests (release)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -491,7 +491,7 @@
         },
         "Integration tests (memory)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "memory",
@@ -503,7 +503,7 @@
         },
         "Integration tests flaky check (asan)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -515,7 +515,7 @@
         },
         "Compatibility check": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -527,7 +527,7 @@
         },
         "Split build smoke test": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -539,7 +539,7 @@
         },
         "Testflows check": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -563,7 +563,7 @@
         },
         "Unit tests release clang": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -575,7 +575,7 @@
         },
         "Unit tests ASAN": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -587,7 +587,7 @@
         },
         "Unit tests MSAN": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "memory",
@@ -599,7 +599,7 @@
         },
         "Unit tests TSAN": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "thread",
@@ -611,7 +611,7 @@
         },
         "Unit tests UBSAN": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "thread",
@@ -623,7 +623,7 @@
         },
         "AST fuzzer (debug)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "debug",
                 "sanitizer": "none",
@@ -635,7 +635,7 @@
         },
         "AST fuzzer (ASan)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -647,7 +647,7 @@
         },
         "AST fuzzer (MSan)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "memory",
@@ -659,7 +659,7 @@
         },
         "AST fuzzer (TSan)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "thread",
@@ -671,7 +671,7 @@
         },
         "AST fuzzer (UBSan)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "undefined",
@@ -683,7 +683,7 @@
         },
         "Release": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -695,7 +695,7 @@
         },
         "Functional stateless tests flaky check (address)": {
             "required_build_properties": {
-                "compiler": "clang-12",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",

From 5a291c13c7c112951093c8f5e910f72aa4b21d84 Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Tue, 7 Sep 2021 23:45:16 +0300
Subject: [PATCH 140/273] solve problem with linker

---
 cmake/tools.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/tools.cmake b/cmake/tools.cmake
index f94f4b289a3..25c39f7f80e 100644
--- a/cmake/tools.cmake
+++ b/cmake/tools.cmake
@@ -78,7 +78,7 @@ if (OS_LINUX AND NOT LINKER_NAME)
 endif ()
 
 if (LINKER_NAME)
-    if (COMPILER_CLANG AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 12.0.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 12.0.0))
+    if (COMPILER_CLANG AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 13.0.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 13.0.0))
         find_program (LLD_PATH NAMES ${LINKER_NAME})
         set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --ld-path=${LLD_PATH}")
         set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --ld-path=${LLD_PATH}")

From c12fc30e4a3041e280a75a9d34dce6de9dc3e84d Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Wed, 8 Sep 2021 23:26:57 +0300
Subject: [PATCH 141/273] fix compiler version in cmake/tools.cmake to support
 both clang-12 and clang-13

---
 cmake/tools.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/tools.cmake b/cmake/tools.cmake
index 25c39f7f80e..f94f4b289a3 100644
--- a/cmake/tools.cmake
+++ b/cmake/tools.cmake
@@ -78,7 +78,7 @@ if (OS_LINUX AND NOT LINKER_NAME)
 endif ()
 
 if (LINKER_NAME)
-    if (COMPILER_CLANG AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 13.0.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 13.0.0))
+    if (COMPILER_CLANG AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 12.0.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 12.0.0))
         find_program (LLD_PATH NAMES ${LINKER_NAME})
         set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --ld-path=${LLD_PATH}")
         set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --ld-path=${LLD_PATH}")

From ffc529feb186844474f6b64e86e6603cd8a3e365 Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Thu, 9 Sep 2021 01:38:22 +0300
Subject: [PATCH 142/273] use clang-13 in pvs docker image

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

diff --git a/docker/test/pvs/Dockerfile b/docker/test/pvs/Dockerfile
index 438f0bd07ec..e6923fb47e9 100644
--- a/docker/test/pvs/Dockerfile
+++ b/docker/test/pvs/Dockerfile
@@ -38,7 +38,7 @@ RUN set -x \
     && dpkg -i "${PKG_VERSION}.deb"
 
 CMD echo "Running PVS version $PKG_VERSION" && cd /repo_folder && pvs-studio-analyzer credentials $LICENCE_NAME $LICENCE_KEY -o ./licence.lic  \
-    && cmake . -D"ENABLE_EMBEDDED_COMPILER"=OFF -D"USE_INTERNAL_PROTOBUF_LIBRARY"=OFF -D"USE_INTERNAL_GRPC_LIBRARY"=OFF -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang\+\+-12 \
+    && cmake . -D"ENABLE_EMBEDDED_COMPILER"=OFF -D"USE_INTERNAL_PROTOBUF_LIBRARY"=OFF -D"USE_INTERNAL_GRPC_LIBRARY"=OFF -DCMAKE_C_COMPILER=clang-13 -DCMAKE_CXX_COMPILER=clang\+\+-13 \
     && ninja re2_st clickhouse_grpc_protos \
     && pvs-studio-analyzer analyze -o pvs-studio.log -e contrib -j 4 -l ./licence.lic; \
     cp /repo_folder/pvs-studio.log /test_output; \

From e575cc88fc3173350a0c049890f40c03e0b2f80b Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <mikhaylovnikitka@gmail.com>
Date: Thu, 9 Sep 2021 21:11:00 +0000
Subject: [PATCH 143/273] Better

---
 CMakeLists.txt                    | 6 +++---
 docker/packager/binary/Dockerfile | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e765ca02a4f..23a7800266c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,7 +192,7 @@ endif ()
 # Make sure the final executable has symbols exported
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic")
 
-find_program (OBJCOPY_PATH NAMES "llvm-objcopy" "llvm-objcopy-12" "llvm-objcopy-11" "llvm-objcopy-10" "llvm-objcopy-9" "llvm-objcopy-8" "objcopy")
+find_program (OBJCOPY_PATH NAMES "llvm-objcopy" "llvm-objcopy-13" "llvm-objcopy-12" "llvm-objcopy-11" "llvm-objcopy-10" "llvm-objcopy-9" "llvm-objcopy-8" "objcopy")
 
 if (NOT OBJCOPY_PATH AND OS_DARWIN)
     find_program (BREW_PATH NAMES "brew")
@@ -379,7 +379,7 @@ if (COMPILER_CLANG)
     endif ()
 
     # Always prefer llvm tools when using clang. For instance, we cannot use GNU ar when llvm LTO is enabled
-    find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-12" "llvm-ar-11" "llvm-ar-10" "llvm-ar-9" "llvm-ar-8")
+    find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-13" "llvm-ar-12" "llvm-ar-11" "llvm-ar-10" "llvm-ar-9" "llvm-ar-8")
 
     if (LLVM_AR_PATH)
         message(STATUS "Using llvm-ar: ${LLVM_AR_PATH}.")
@@ -388,7 +388,7 @@ if (COMPILER_CLANG)
         message(WARNING "Cannot find llvm-ar. System ar will be used instead. It does not work with ThinLTO.")
     endif ()
 
-    find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-12" "llvm-ranlib-11" "llvm-ranlib-10" "llvm-ranlib-9" "llvm-ranlib-8")
+    find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-13" "llvm-ranlib-12" "llvm-ranlib-11" "llvm-ranlib-10" "llvm-ranlib-9" "llvm-ranlib-8")
 
     if (LLVM_RANLIB_PATH)
         message(STATUS "Using llvm-ranlib: ${LLVM_RANLIB_PATH}.")
diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index 71a7b7b07d8..eef86b3534b 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -53,6 +53,8 @@ RUN apt-get update \
         lld-${LLVM_VERSION} \
         llvm-${LLVM_VERSION} \
         llvm-${LLVM_VERSION}-dev \
+        libicu-dev \
+        libreadline-dev \
         moreutils \
         ninja-build \
         pigz \

From a796b9f03918164427322be7b2b8bfb5573d7f62 Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <mikhaylovnikitka@gmail.com>
Date: Thu, 9 Sep 2021 21:17:22 +0000
Subject: [PATCH 144/273] Fix build

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

diff --git a/contrib/abseil-cpp b/contrib/abseil-cpp
index 4f3b686f86c..6cc37166d58 160000
--- a/contrib/abseil-cpp
+++ b/contrib/abseil-cpp
@@ -1 +1 @@
-Subproject commit 4f3b686f86c3ebaba7e4e926e62a79cb1c659a54
+Subproject commit 6cc37166d5806c4eeed7a78a43217493a3ca2a8d

From b1edf77904300e2439f5ff7de76cff6bfd015d91 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Fri, 10 Sep 2021 01:04:52 +0300
Subject: [PATCH 145/273] Executable added option send_chunk_header

---
 .../ExecutableDictionarySource.cpp            | 10 ++++++-
 src/Dictionaries/ExecutableDictionarySource.h | 12 +++++----
 .../ExecutablePoolDictionarySource.cpp        | 10 ++++++-
 .../ExecutablePoolDictionarySource.h          | 14 +++++-----
 ...oolSettings.cpp => ExecutableSettings.cpp} |  6 ++---
 ...blePoolSettings.h => ExecutableSettings.h} |  7 ++---
 src/Storages/StorageExecutable.cpp            | 26 +++++++++++++------
 src/Storages/StorageExecutable.h              |  6 ++---
 8 files changed, 61 insertions(+), 30 deletions(-)
 rename src/Storages/{ExecutablePoolSettings.cpp => ExecutableSettings.cpp} (79%)
 rename src/Storages/{ExecutablePoolSettings.h => ExecutableSettings.h} (62%)

diff --git a/src/Dictionaries/ExecutableDictionarySource.cpp b/src/Dictionaries/ExecutableDictionarySource.cpp
index a274e820e65..ba624f8e2a2 100644
--- a/src/Dictionaries/ExecutableDictionarySource.cpp
+++ b/src/Dictionaries/ExecutableDictionarySource.cpp
@@ -120,6 +120,13 @@ Pipe ExecutableDictionarySource::getStreamForBlock(const Block & block)
     ShellCommandSource::SendDataTask task = {[process_in, block, this]()
     {
         auto & out = *process_in;
+
+        if (configuration.send_chunk_header)
+        {
+            writeText(block.rows(), out);
+            writeChar('\n', out);
+        }
+
         auto output_stream = context->getOutputStream(configuration.format, out, block.cloneEmpty());
         formatBlock(output_stream, block);
         out.close();
@@ -188,7 +195,8 @@ void registerDictionarySourceExecutable(DictionarySourceFactory & factory)
             .format = config.getString(settings_config_prefix + ".format"),
             .update_field = config.getString(settings_config_prefix + ".update_field", ""),
             .update_lag = config.getUInt64(settings_config_prefix + ".update_lag", 1),
-            .implicit_key = config.getBool(settings_config_prefix + ".implicit_key", false)
+            .implicit_key = config.getBool(settings_config_prefix + ".implicit_key", false),
+            .send_chunk_header = config.getBool(settings_config_prefix + ".implicit_key", false)
         };
 
         return std::make_unique<ExecutableDictionarySource>(dict_struct, configuration, sample_block, context);
diff --git a/src/Dictionaries/ExecutableDictionarySource.h b/src/Dictionaries/ExecutableDictionarySource.h
index 3133bc12b09..5b20deceb28 100644
--- a/src/Dictionaries/ExecutableDictionarySource.h
+++ b/src/Dictionaries/ExecutableDictionarySource.h
@@ -19,13 +19,15 @@ public:
 
     struct Configuration
     {
-        const std::string command;
-        const std::string format;
-        const std::string update_field;
-        const UInt64 update_lag;
+        std::string command;
+        std::string format;
+        std::string update_field;
+        UInt64 update_lag;
         /// Implicit key means that the source script will return only values,
         /// and the correspondence to the requested keys is determined implicitly - by the order of rows in the result.
-        const bool implicit_key;
+        bool implicit_key;
+        /// Send number_of_rows\n before sending chunk to process
+        bool send_chunk_header;
     };
 
     ExecutableDictionarySource(
diff --git a/src/Dictionaries/ExecutablePoolDictionarySource.cpp b/src/Dictionaries/ExecutablePoolDictionarySource.cpp
index c5d081bb3e6..0981fb762c8 100644
--- a/src/Dictionaries/ExecutablePoolDictionarySource.cpp
+++ b/src/Dictionaries/ExecutablePoolDictionarySource.cpp
@@ -100,7 +100,7 @@ Pipe ExecutablePoolDictionarySource::getStreamForBlock(const Block & block)
         config.terminate_in_destructor_strategy = ShellCommand::DestructorStrategy{ true /*terminate_in_destructor*/, configuration.command_termination_timeout };
         auto shell_command = ShellCommand::execute(config);
         return shell_command;
-    }, configuration.max_command_execution_time * 10000);
+    }, configuration.max_command_execution_time * 1000);
 
     if (!result)
         throw Exception(ErrorCodes::TIMEOUT_EXCEEDED,
@@ -112,6 +112,13 @@ Pipe ExecutablePoolDictionarySource::getStreamForBlock(const Block & block)
     ShellCommandSource::SendDataTask task = [process_in, block, this]() mutable
     {
         auto & out = *process_in;
+
+        if (configuration.send_chunk_header)
+        {
+            writeText(block.rows(), out);
+            writeChar('\n', out);
+        }
+
         auto output_stream = context->getOutputStream(configuration.format, out, block.cloneEmpty());
         formatBlock(output_stream, block);
     };
@@ -190,6 +197,7 @@ void registerDictionarySourceExecutablePool(DictionarySourceFactory & factory)
             .command_termination_timeout = config.getUInt64(settings_config_prefix + ".command_termination_timeout", 10),
             .max_command_execution_time = max_command_execution_time,
             .implicit_key = config.getBool(settings_config_prefix + ".implicit_key", false),
+            .send_chunk_header = config.getBool(settings_config_prefix + ".send_chunk_header", false)
         };
 
         return std::make_unique<ExecutablePoolDictionarySource>(dict_struct, configuration, sample_block, context);
diff --git a/src/Dictionaries/ExecutablePoolDictionarySource.h b/src/Dictionaries/ExecutablePoolDictionarySource.h
index b80122fb56f..2ccb4ce4b8d 100644
--- a/src/Dictionaries/ExecutablePoolDictionarySource.h
+++ b/src/Dictionaries/ExecutablePoolDictionarySource.h
@@ -27,14 +27,16 @@ class ExecutablePoolDictionarySource final : public IDictionarySource
 public:
     struct Configuration
     {
-        const String command;
-        const String format;
-        const size_t pool_size;
-        const size_t command_termination_timeout;
-        const size_t max_command_execution_time;
+        String command;
+        String format;
+        size_t pool_size;
+        size_t command_termination_timeout;
+        size_t max_command_execution_time;
         /// Implicit key means that the source script will return only values,
         /// and the correspondence to the requested keys is determined implicitly - by the order of rows in the result.
-        const bool implicit_key;
+        bool implicit_key;
+        /// Send number_of_rows\n before sending chunk to process
+        bool send_chunk_header;
     };
 
     ExecutablePoolDictionarySource(
diff --git a/src/Storages/ExecutablePoolSettings.cpp b/src/Storages/ExecutableSettings.cpp
similarity index 79%
rename from src/Storages/ExecutablePoolSettings.cpp
rename to src/Storages/ExecutableSettings.cpp
index 8951c8edabf..136357eb6f8 100644
--- a/src/Storages/ExecutablePoolSettings.cpp
+++ b/src/Storages/ExecutableSettings.cpp
@@ -1,4 +1,4 @@
-#include "ExecutablePoolSettings.h"
+#include "ExecutableSettings.h"
 
 #include <Common/Exception.h>
 
@@ -14,9 +14,9 @@ namespace ErrorCodes
     extern const int UNKNOWN_SETTING;
 }
 
-IMPLEMENT_SETTINGS_TRAITS(ExecutablePoolSettingsTraits, LIST_OF_EXECUTABLE_POOL_SETTINGS);
+IMPLEMENT_SETTINGS_TRAITS(ExecutableSettingsTraits, LIST_OF_EXECUTABLE_SETTINGS);
 
-void ExecutablePoolSettings::loadFromQuery(ASTStorage & storage_def)
+void ExecutableSettings::loadFromQuery(ASTStorage & storage_def)
 {
     if (storage_def.settings)
     {
diff --git a/src/Storages/ExecutablePoolSettings.h b/src/Storages/ExecutableSettings.h
similarity index 62%
rename from src/Storages/ExecutablePoolSettings.h
rename to src/Storages/ExecutableSettings.h
index 6de9b0f0e6c..9c0cfc05fa5 100644
--- a/src/Storages/ExecutablePoolSettings.h
+++ b/src/Storages/ExecutableSettings.h
@@ -8,15 +8,16 @@ namespace DB
 
 class ASTStorage;
 
-#define LIST_OF_EXECUTABLE_POOL_SETTINGS(M) \
+#define LIST_OF_EXECUTABLE_SETTINGS(M) \
+    M(UInt64, send_chunk_header, false, "Send number_of_rows\n before sending chunk to process", 0) \
     M(UInt64, pool_size, 16, "Processes pool size. If size == 0, then there is no size restrictions", 0) \
     M(UInt64, max_command_execution_time, 10, "Max command execution time in seconds.", 0) \
     M(UInt64, command_termination_timeout, 10, "Command termination timeout in seconds.", 0) \
 
-DECLARE_SETTINGS_TRAITS(ExecutablePoolSettingsTraits, LIST_OF_EXECUTABLE_POOL_SETTINGS)
+DECLARE_SETTINGS_TRAITS(ExecutableSettingsTraits, LIST_OF_EXECUTABLE_SETTINGS)
 
 /// Settings for ExecutablePool engine.
-struct ExecutablePoolSettings : public BaseSettings<ExecutablePoolSettingsTraits>
+struct ExecutableSettings : public BaseSettings<ExecutableSettingsTraits>
 {
     void loadFromQuery(ASTStorage & storage_def);
 };
diff --git a/src/Storages/StorageExecutable.cpp b/src/Storages/StorageExecutable.cpp
index 4b0aaf6caea..2af2661d8af 100644
--- a/src/Storages/StorageExecutable.cpp
+++ b/src/Storages/StorageExecutable.cpp
@@ -56,7 +56,7 @@ StorageExecutable::StorageExecutable(
     const std::vector<String> & arguments_,
     const String & format_,
     const std::vector<ASTPtr> & input_queries_,
-    const ExecutablePoolSettings & pool_settings_,
+    const ExecutableSettings & settings_,
     const ColumnsDescription & columns,
     const ConstraintsDescription & constraints)
     : IStorage(table_id_)
@@ -64,9 +64,9 @@ StorageExecutable::StorageExecutable(
     , arguments(arguments_)
     , format(format_)
     , input_queries(input_queries_)
-    , pool_settings(pool_settings_)
+    , settings(settings_)
     /// If pool size == 0 then there is no size restrictions. Poco max size of semaphore is integer type.
-    , process_pool(std::make_shared<ProcessPool>(pool_settings.pool_size == 0 ? std::numeric_limits<int>::max() : pool_settings.pool_size))
+    , process_pool(std::make_shared<ProcessPool>(settings.pool_size == 0 ? std::numeric_limits<int>::max() : settings.pool_size))
     , log(&Poco::Logger::get("StorageExecutablePool"))
 {
     StorageInMemoryMetadata storage_metadata;
@@ -114,15 +114,15 @@ Pipe StorageExecutable::read(
     {
         bool result = process_pool->tryBorrowObject(process, [&config, this]()
         {
-            config.terminate_in_destructor_strategy = ShellCommand::DestructorStrategy{ true /*terminate_in_destructor*/, pool_settings.command_termination_timeout };
+            config.terminate_in_destructor_strategy = ShellCommand::DestructorStrategy{ true /*terminate_in_destructor*/, settings.command_termination_timeout };
             auto shell_command = ShellCommand::execute(config);
             return shell_command;
-        }, pool_settings.max_command_execution_time * 10000);
+        }, settings.max_command_execution_time * 1000);
 
         if (!result)
             throw Exception(ErrorCodes::TIMEOUT_EXCEEDED,
                 "Could not get process from pool, max command execution timeout exceeded {} seconds",
-                pool_settings.max_command_execution_time);
+                settings.max_command_execution_time);
     }
     else
     {
@@ -137,6 +137,8 @@ Pipe StorageExecutable::read(
         BlockInputStreamPtr input_stream = inputs[i];
         WriteBufferFromFile * write_buffer = nullptr;
 
+        bool send_chunk_header = settings.send_chunk_header;
+
         if (i == 0)
         {
             write_buffer = &process->in;
@@ -151,14 +153,22 @@ Pipe StorageExecutable::read(
             write_buffer = &it->second;
         }
 
-        ShellCommandSource::SendDataTask task = [input_stream, write_buffer, context, is_executable_pool, this]()
+        ShellCommandSource::SendDataTask task = [input_stream, write_buffer, context, is_executable_pool, send_chunk_header, this]()
         {
             auto output_stream = context->getOutputStream(format, *write_buffer, input_stream->getHeader().cloneEmpty());
             input_stream->readPrefix();
             output_stream->writePrefix();
 
             while (auto block = input_stream->read())
+            {
+                if (send_chunk_header)
+                {
+                    writeText(block.rows(), *write_buffer);
+                    writeChar('\n', *write_buffer);
+                }
+
                 output_stream->write(block);
+            }
 
             input_stream->readSuffix();
             output_stream->writeSuffix();
@@ -232,7 +242,7 @@ void registerStorageExecutable(StorageFactory & factory)
             if (max_execution_time_seconds != 0 && max_command_execution_time > max_execution_time_seconds)
                 max_command_execution_time = max_execution_time_seconds;
 
-            ExecutablePoolSettings pool_settings;
+            ExecutableSettings pool_settings;
             pool_settings.max_command_execution_time = max_command_execution_time;
             if (args.storage_def->settings)
                 pool_settings.loadFromQuery(*args.storage_def);
diff --git a/src/Storages/StorageExecutable.h b/src/Storages/StorageExecutable.h
index dd986ee3956..c67891d876f 100644
--- a/src/Storages/StorageExecutable.h
+++ b/src/Storages/StorageExecutable.h
@@ -4,7 +4,7 @@
 #include <common/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 #include <DataStreams/ShellCommandSource.h>
-#include <Storages/ExecutablePoolSettings.h>
+#include <Storages/ExecutableSettings.h>
 
 
 namespace DB
@@ -55,7 +55,7 @@ protected:
         const std::vector<String> & arguments_,
         const String & format_,
         const std::vector<ASTPtr> & input_queries_,
-        const ExecutablePoolSettings & pool_settings_,
+        const ExecutableSettings & settings_,
         const ColumnsDescription & columns,
         const ConstraintsDescription & constraints);
 
@@ -64,7 +64,7 @@ private:
     std::vector<String> arguments;
     String format;
     std::vector<ASTPtr> input_queries;
-    ExecutablePoolSettings pool_settings;
+    ExecutableSettings settings;
     std::shared_ptr<ProcessPool> process_pool;
     Poco::Logger * log;
 };

From a8c61f1d63bc69ffbe2c283a5e0a54fbc92c1780 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 10 Sep 2021 01:10:57 +0300
Subject: [PATCH 146/273] Build w/ ENABLE_EMBEDDED_COMPILER in shared build on
 CI

---
 cmake/find/llvm.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/find/llvm.cmake b/cmake/find/llvm.cmake
index 23b61ab5c68..84ac29991ab 100644
--- a/cmake/find/llvm.cmake
+++ b/cmake/find/llvm.cmake
@@ -1,4 +1,4 @@
-if (APPLE OR SPLIT_SHARED_LIBRARIES OR NOT ARCH_AMD64 OR SANITIZE STREQUAL "undefined")
+if (APPLE OR NOT ARCH_AMD64 OR SANITIZE STREQUAL "undefined")
     set (ENABLE_EMBEDDED_COMPILER_DEFAULT OFF)
 else()
     set (ENABLE_EMBEDDED_COMPILER_DEFAULT ON)

From 21d33c3c2ee20d1220c56527161457825a7e1f9e Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Fri, 10 Sep 2021 01:28:22 +0300
Subject: [PATCH 147/273] ShellCommandSource fix logging

---
 src/DataStreams/ShellCommandSource.h                | 5 -----
 src/Dictionaries/ExecutableDictionarySource.cpp     | 6 +++---
 src/Dictionaries/ExecutablePoolDictionarySource.cpp | 2 +-
 src/Storages/StorageExecutable.cpp                  | 2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/DataStreams/ShellCommandSource.h b/src/DataStreams/ShellCommandSource.h
index befdbc796ba..21d0acaf81a 100644
--- a/src/DataStreams/ShellCommandSource.h
+++ b/src/DataStreams/ShellCommandSource.h
@@ -52,14 +52,12 @@ public:
         const std::string & format,
         const Block & sample_block,
         std::unique_ptr<ShellCommand> && command_,
-        Poco::Logger * log_,
         std::vector<SendDataTask> && send_data_tasks = {},
         const ShellCommandSourceConfiguration & configuration_ = {},
         std::shared_ptr<ProcessPool> process_pool_ = nullptr)
         : SourceWithProgress(sample_block)
         , command(std::move(command_))
         , configuration(configuration_)
-        , log(log_)
         , process_pool(process_pool_)
     {
         for (auto && send_data_task : send_data_tasks)
@@ -133,7 +131,6 @@ protected:
         }
         catch (...)
         {
-            tryLogCurrentException(log);
             command = nullptr;
             throw;
         }
@@ -176,8 +173,6 @@ private:
 
     size_t current_read_rows = 0;
 
-    Poco::Logger * log;
-
     std::shared_ptr<ProcessPool> process_pool;
 
     QueryPipeline pipeline;
diff --git a/src/Dictionaries/ExecutableDictionarySource.cpp b/src/Dictionaries/ExecutableDictionarySource.cpp
index a274e820e65..ca0c45a9b6c 100644
--- a/src/Dictionaries/ExecutableDictionarySource.cpp
+++ b/src/Dictionaries/ExecutableDictionarySource.cpp
@@ -72,7 +72,7 @@ Pipe ExecutableDictionarySource::loadAll()
     ShellCommand::Config config(configuration.command);
     auto process = ShellCommand::execute(config);
 
-    Pipe pipe(std::make_unique<ShellCommandSource>(context, configuration.format, sample_block, std::move(process), log));
+    Pipe pipe(std::make_unique<ShellCommandSource>(context, configuration.format, sample_block, std::move(process)));
     return pipe;
 }
 
@@ -91,7 +91,7 @@ Pipe ExecutableDictionarySource::loadUpdatedAll()
     LOG_TRACE(log, "loadUpdatedAll {}", command_with_update_field);
     ShellCommand::Config config(command_with_update_field);
     auto process = ShellCommand::execute(config);
-    Pipe pipe(std::make_unique<ShellCommandSource>(context, configuration.format, sample_block, std::move(process), log));
+    Pipe pipe(std::make_unique<ShellCommandSource>(context, configuration.format, sample_block, std::move(process)));
     return pipe;
 }
 
@@ -126,7 +126,7 @@ Pipe ExecutableDictionarySource::getStreamForBlock(const Block & block)
     }};
     std::vector<ShellCommandSource::SendDataTask> tasks = {std::move(task)};
 
-    Pipe pipe(std::make_unique<ShellCommandSource>(context, configuration.format, sample_block, std::move(process), log, std::move(tasks)));
+    Pipe pipe(std::make_unique<ShellCommandSource>(context, configuration.format, sample_block, std::move(process), std::move(tasks)));
 
     if (configuration.implicit_key)
         pipe.addTransform(std::make_shared<TransformWithAdditionalColumns>(block, pipe.getHeader()));
diff --git a/src/Dictionaries/ExecutablePoolDictionarySource.cpp b/src/Dictionaries/ExecutablePoolDictionarySource.cpp
index c5d081bb3e6..160ac022a70 100644
--- a/src/Dictionaries/ExecutablePoolDictionarySource.cpp
+++ b/src/Dictionaries/ExecutablePoolDictionarySource.cpp
@@ -120,7 +120,7 @@ Pipe ExecutablePoolDictionarySource::getStreamForBlock(const Block & block)
     ShellCommandSourceConfiguration command_configuration;
     command_configuration.read_fixed_number_of_rows = true;
     command_configuration.number_of_rows_to_read = rows_to_read;
-    Pipe pipe(std::make_unique<ShellCommandSource>(context, configuration.format, sample_block, std::move(process), log, std::move(tasks), command_configuration, process_pool));
+    Pipe pipe(std::make_unique<ShellCommandSource>(context, configuration.format, sample_block, std::move(process), std::move(tasks), command_configuration, process_pool));
 
     if (configuration.implicit_key)
         pipe.addTransform(std::make_shared<TransformWithAdditionalColumns>(block, pipe.getHeader()));
diff --git a/src/Storages/StorageExecutable.cpp b/src/Storages/StorageExecutable.cpp
index 4b0aaf6caea..3a14c16bae4 100644
--- a/src/Storages/StorageExecutable.cpp
+++ b/src/Storages/StorageExecutable.cpp
@@ -183,7 +183,7 @@ Pipe StorageExecutable::read(
         configuration.read_number_of_rows_from_process_output = true;
     }
 
-    Pipe pipe(std::make_unique<ShellCommandSource>(context, format, std::move(sample_block), std::move(process), log, std::move(tasks), configuration, process_pool));
+    Pipe pipe(std::make_unique<ShellCommandSource>(context, format, std::move(sample_block), std::move(process), std::move(tasks), configuration, process_pool));
     return pipe;
 }
 

From ac7330b805df8b9be829aec1b43e533eb86126e3 Mon Sep 17 00:00:00 2001
From: yeer <yeerkunth+github@gmail.com>
Date: Fri, 10 Sep 2021 11:41:46 +0800
Subject: [PATCH 148/273] Update where.md

type: expluded => excluded
---
 docs/en/sql-reference/statements/select/where.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/statements/select/where.md b/docs/en/sql-reference/statements/select/where.md
index f1532115e55..69505a51db4 100644
--- a/docs/en/sql-reference/statements/select/where.md
+++ b/docs/en/sql-reference/statements/select/where.md
@@ -6,7 +6,7 @@ toc_title: WHERE
 
 `WHERE` clause allows to filter the data that is coming from [FROM](../../../sql-reference/statements/select/from.md) clause of `SELECT`.
 
-If there is a `WHERE` clause, it must contain an expression with the `UInt8` type. This is usually an expression with comparison and logical operators. Rows where this expression evaluates to 0 are expluded from further transformations or result.
+If there is a `WHERE` clause, it must contain an expression with the `UInt8` type. This is usually an expression with comparison and logical operators. Rows where this expression evaluates to 0 are excluded from further transformations or result.
 
 `WHERE` expression is evaluated on the ability to use indexes and partition pruning, if the underlying table engine supports that.
 

From 4d82e8918bbd325b8f06b9e27f1790436be06f70 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 10 Sep 2021 08:39:56 +0300
Subject: [PATCH 149/273] Update comments for ENABLE_CHECK_HEAVY_BUILDS

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e765ca02a4f..972c47fe666 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,7 @@ include (cmake/find/ccache.cmake)
 # ccache ignore it.
 option(ENABLE_CHECK_HEAVY_BUILDS "Don't allow C++ translation units to compile too long or to take too much memory while compiling." OFF)
 if (ENABLE_CHECK_HEAVY_BUILDS)
-    # set DATA (since RSS does not work since 2.6.x+) to 2G
+    # set DATA (since RSS does not work since 2.6.x+) to 5G
     set (RLIMIT_DATA 5000000000)
     # set VIRT (RLIMIT_AS) to 10G (DATA*10)
     set (RLIMIT_AS 10000000000)
@@ -89,7 +89,7 @@ if (ENABLE_CHECK_HEAVY_BUILDS)
 
     # gcc10/gcc10/clang -fsanitize=memory is too heavy
     if (SANITIZE STREQUAL "memory" OR COMPILER_GCC)
-       set (RLIMIT_DATA 10000000000)
+       set (RLIMIT_DATA 10000000000) # 10G
     endif()
 
     set (CMAKE_CXX_COMPILER_LAUNCHER prlimit --as=${RLIMIT_AS} --data=${RLIMIT_DATA} --cpu=${RLIMIT_CPU} ${CMAKE_CXX_COMPILER_LAUNCHER})

From 1ec0295c6f35480f64903853acb97401221c4c1b Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 10 Sep 2021 08:51:43 +0300
Subject: [PATCH 150/273] Increase RLIMIT_CPU for ENABLE_CHECK_HEAVY_BUILDS to
 fix UBsan build

Right now CI fails to compile UBsan while trying to compile src/AggregateFunctions/CMakeFiles/clickhouse_aggregate_functions.dir/AggregateFunctionSumMap.cpp.o:

    2021-09-09 23:02:28 FAILED: src/AggregateFunctions/CMakeFiles/clickhouse_aggregate_functions.dir/AggregateFunctionSumMap.cpp.o
    2021-09-09 23:02:28 prlimit --as=10000000000 --data=5000000000 --cpu=600 /usr/bin/ccache /usr/bin/clang++-12  -DAWS_SDK_VERSION_MAJOR=1 -DAWS_SDK_VERSION_MINOR=7 -DAWS_SDK_VERSION_PATCH=231 -DBOOST_ASIO_STANDALONE=1 -DCARES_STATICLIB -DENABLE_OPENSSL_ENCRYPTION -DPOCO_ENABLE_CPP11 -DPOCO_HAVE_FD_EPOLL -DPOCO_OS_FAMILY_UNIX -DSTD_EXCEPTION_HAS_STACK_TRACE=1 -DUNALIGNED_OK -DUSE_REPLXX=1 -DWITH_COVERAGE=0 -DWITH_GZFILEOP -DX86_64 -DZLIB_COMPAT -DZ_TLS=__thread -D__CLANG_SUPPORT_DYN_ANNOTATION__ -I../contrib/sentry-native/include -Iincludes/configs -I../base/glibc-compatibility/memcpy -I../src -Isrc -Isrc/Core/include -I../base/common/.. -Ibase/common/.. -I../contrib/cityhash102/include -I../contrib/cctz/include -Icontrib/zlib-ng -I../contrib/zlib-ng -I../base/pcg-random/. -I../contrib/aws-c-common/include -I../contrib/aws-c-event-stream/include -Icontrib/aws-s3-cmake/include -I../base/mysqlxx/.. -I../contrib/mariadb-connector-c/include -Icontrib/mariadb-connector-c/include -Icontrib/grpc/third_party/cares/cares -I../contrib/grpc/third_party/cares/cares -I../contrib/abseil-cpp -I../contrib/libpq -I../contrib/libpq/include -I../contrib/libstemmer_c/include -I../contrib/wordnet-blast -I../contrib/lemmagen-c/include -isystem ../contrib/datasketches-cpp/common/include -isystem ../contrib/datasketches-cpp/theta/include -isystem ../contrib/libcxx/include -isystem ../contrib/libcxxabi/include -isystem ../contrib/libunwind/include -isystem ../contrib/libpqxx/include -isystem ../contrib/rocksdb/include -isystem ../contrib/orc/c++/include -isystem contrib/orc/c++/include -isystem ../contrib/AMQP-CPP/include -isystem ../contrib/libuv/include -isystem ../contrib/AMQP-CPP -isystem ../contrib/s2geometry/src/s2 -isystem ../contrib/libhdfs3/include -isystem ../contrib/miniselect/include -isystem ../contrib/pdqsort -isystem ../contrib/croaring/cpp -isystem ../contrib/croaring/include -isystem ../contrib/fast_float/include -isystem ../contrib/msgpack-c/include -isystem ../contrib/aws/aws-cpp-sdk-s3/include -isystem ../contrib/aws/aws-cpp-sdk-core/include -isystem ../contrib/xz/src/liblzma/api -isystem ../contrib/zstd/lib -isystem ../contrib/re2 -isystem ../contrib/boost -isystem ../contrib/poco/Net/include -isystem ../contrib/poco/Foundation/include -isystem ../contrib/poco/NetSSL_OpenSSL/include -isystem ../contrib/poco/Crypto/include -isystem ../contrib/boringssl/include -isystem ../contrib/poco/Util/include -isystem ../contrib/poco/JSON/include -isystem ../contrib/poco/XML/include -isystem ../contrib/replxx/include -isystem ../contrib/fmtlib-cmake/../fmtlib/include -isystem ../contrib/double-conversion -isystem ../contrib/dragonbox/include -isystem contrib/re2_st -isystem ../contrib/NuRaft/include -isystem ../contrib/grpc/include -isystem ../contrib/protobuf/src -isystem src/Server/grpc_protos -isystem ../contrib/s2geometry/src -isystem ../contrib/sqlite-amalgamation -isystem ../contrib/libc-headers/x86_64-linux-gnu -isystem ../contrib/libc-headers -g -O2 -fdebug-prefix-map=/build=. -specs=/usr/share/dpkg/no-pie-compile.specs -Wdate-time  -g -fno-omit-frame-pointer -DSANITIZER -fsanitize=undefined -fno-sanitize-recover=all -fno-sanitize=float-divide-by-zero -fsanitize-blacklist=/build/tests/ubsan_suppressions.txt -fdiagnostics-color=always -Xclang -fuse-ctor-homing -fsized-deallocation  -gdwarf-aranges -pipe -mssse3 -msse4.1 -msse4.2 -mpclmul -mpopcnt -fasynchronous-unwind-tables -falign-functions=32   -Wall -Wno-unused-command-line-argument  -fdiagnostics-absolute-paths -fexperimental-new-pass-manager -Werror -Wextra -Wpedantic -Wno-vla-extension -Wno-zero-length-array -Wno-c11-extensions -Wcomma -Wconditional-uninitialized -Wcovered-switch-default -Wdeprecated -Wembedded-directive -Wempty-init-stmt -Wextra-semi-stmt -Wextra-semi -Wgnu-case-range -Winconsistent-missing-destructor-override -Wnewline-eof -Wold-style-cast -Wrange-loop-analysis -Wredundant-parens -Wreserved-id-macro -Wshadow-field -Wshadow-uncaptured-local -Wshadow -Wstring-plus-int -Wundef -Wunreachable-code-return -Wunreachable-code -Wunused-exception-parameter -Wunused-macros -Wunused-member-function -Wzero-as-null-pointer-constant -Weverything -Wno-c++98-compat-pedantic -Wno-c++98-compat -Wno-c99-extensions -Wno-conversion -Wno-ctad-maybe-unsupported -Wno-deprecated-dynamic-exception-spec -Wno-disabled-macro-expansion -Wno-documentation-unknown-command -Wno-double-promotion -Wno-exit-time-destructors -Wno-float-equal -Wno-global-constructors -Wno-missing-prototypes -Wno-missing-variable-declarations -Wno-nested-anon-types -Wno-packed -Wno-padded -Wno-return-std-move-in-c++11 -Wno-shift-sign-overflow -Wno-sign-conversion -Wno-switch-enum -Wno-undefined-func-template -Wno-unused-template -Wno-vla -Wno-weak-template-vtables -Wno-weak-vtables -O2 -g -DNDEBUG -O3  -fno-pie   -D OS_LINUX -nostdinc++ -std=gnu++2a -MD -MT src/AggregateFunctions/CMakeFiles/clickhouse_aggregate_functions.dir/AggregateFunctionSumMap.cpp.o -MF src/AggregateFunctions/CMakeFiles/clickhouse_aggregate_functions.dir/AggregateFunctionSumMap.cpp.o.d -o src/AggregateFunctions/CMakeFiles/clickhouse_aggregate_functions.dir/AggregateFunctionSumMap.cpp.o -c ../src/AggregateFunctions/AggregateFunctionSumMap.cpp

I guess the problem is CPU time, since looks like memory is fine (I
cannot reproduce it right now locally, maybe because I have clang-11).
---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 972c47fe666..ddb7c85d539 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,8 +84,8 @@ if (ENABLE_CHECK_HEAVY_BUILDS)
     set (RLIMIT_DATA 5000000000)
     # set VIRT (RLIMIT_AS) to 10G (DATA*10)
     set (RLIMIT_AS 10000000000)
-    # set CPU time limit to 600 seconds
-    set (RLIMIT_CPU 600)
+    # set CPU time limit to 800 seconds
+    set (RLIMIT_CPU 800)
 
     # gcc10/gcc10/clang -fsanitize=memory is too heavy
     if (SANITIZE STREQUAL "memory" OR COMPILER_GCC)

From 27cd75eaa17db73ee4754debe1b51ed5ba613b21 Mon Sep 17 00:00:00 2001
From: Vladimir C <vdimir@yandex-team.ru>
Date: Fri, 10 Sep 2021 09:31:49 +0300
Subject: [PATCH 151/273] Apply suggestions from code review

---
 docs/en/sql-reference/table-functions/s3.md | 2 +-
 docs/ru/sql-reference/table-functions/s3.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/en/sql-reference/table-functions/s3.md b/docs/en/sql-reference/table-functions/s3.md
index a0176f0151c..ffba8f5c6d3 100644
--- a/docs/en/sql-reference/table-functions/s3.md
+++ b/docs/en/sql-reference/table-functions/s3.md
@@ -131,7 +131,7 @@ If you specify `PARTITION BY` expression when inserting data into `S3` table, a
 
 **Examples**
 
-1. Using partition ID in a file name creates separate files:
+1. Using partition ID in a key creates separate files:
 
 ```sql
 INSERT INTO TABLE FUNCTION
diff --git a/docs/ru/sql-reference/table-functions/s3.md b/docs/ru/sql-reference/table-functions/s3.md
index a4e6151d711..c8dbcf81559 100644
--- a/docs/ru/sql-reference/table-functions/s3.md
+++ b/docs/ru/sql-reference/table-functions/s3.md
@@ -135,11 +135,11 @@ SELECT name, value FROM existing_table;
 
 ## Партиционирование при записи данных {#partitioned-write}
 
-Если при добавлении данных в таблицу S3 указать выражение `PARTITION BY`, то для каждого значения выражения партиционирования создается отдельный файл. Это повышает эффективность операций чтения.
+Если при добавлении данных в таблицу S3 указать выражение `PARTITION BY`, то для каждого значения ключа партиционирования создается отдельный файл. Это повышает эффективность операций чтения.
 
 **Примеры**
 
-1. При использовании ID партиции в названии файла создаются отдельные файлы:
+1. При использовании ID партиции в имени ключа создаются отдельные файлы:
 
 ```sql
 INSERT INTO TABLE FUNCTION

From baa725367791b74bfeb41e75779a3307abf3b456 Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Fri, 10 Sep 2021 11:34:29 +0300
Subject: [PATCH 152/273] fix -Wreserved-identifier in
 base/daemon/BaseDaemon.cpp

---
 base/daemon/BaseDaemon.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/base/daemon/BaseDaemon.cpp b/base/daemon/BaseDaemon.cpp
index 745e020c8bb..141b7b7bbc6 100644
--- a/base/daemon/BaseDaemon.cpp
+++ b/base/daemon/BaseDaemon.cpp
@@ -1,3 +1,7 @@
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include <daemon/BaseDaemon.h>
 #include <daemon/SentryWriter.h>
 

From 0b37de02e069086f16cc56e012ee97066388f197 Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Fri, 10 Sep 2021 12:47:12 +0300
Subject: [PATCH 153/273] Fixed tests

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

diff --git a/src/Dictionaries/ExecutableDictionarySource.cpp b/src/Dictionaries/ExecutableDictionarySource.cpp
index ba624f8e2a2..06ded2d3bd3 100644
--- a/src/Dictionaries/ExecutableDictionarySource.cpp
+++ b/src/Dictionaries/ExecutableDictionarySource.cpp
@@ -196,7 +196,7 @@ void registerDictionarySourceExecutable(DictionarySourceFactory & factory)
             .update_field = config.getString(settings_config_prefix + ".update_field", ""),
             .update_lag = config.getUInt64(settings_config_prefix + ".update_lag", 1),
             .implicit_key = config.getBool(settings_config_prefix + ".implicit_key", false),
-            .send_chunk_header = config.getBool(settings_config_prefix + ".implicit_key", false)
+            .send_chunk_header = config.getBool(settings_config_prefix + ".send_chunk_header", false)
         };
 
         return std::make_unique<ExecutableDictionarySource>(dict_struct, configuration, sample_block, context);

From d82a794e8cfeb08cc0d673f72557259ff85d470b Mon Sep 17 00:00:00 2001
From: Alexander Tokmakov <avtokmakov@yandex-team.ru>
Date: Fri, 10 Sep 2021 12:54:22 +0300
Subject: [PATCH 154/273] fix logical race on dictionaries loading

---
 src/Interpreters/ExternalLoader.cpp | 29 ++++++++++++++++++++++-------
 src/Interpreters/ExternalLoader.h   |  8 ++++++++
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/Interpreters/ExternalLoader.cpp b/src/Interpreters/ExternalLoader.cpp
index eb7824a1124..09d0ea3a4b7 100644
--- a/src/Interpreters/ExternalLoader.cpp
+++ b/src/Interpreters/ExternalLoader.cpp
@@ -1198,8 +1198,8 @@ class ExternalLoader::PeriodicUpdater : private boost::noncopyable
 public:
     static constexpr UInt64 check_period_sec = 5;
 
-    PeriodicUpdater(LoadablesConfigReader & config_files_reader_, LoadingDispatcher & loading_dispatcher_)
-        : config_files_reader(config_files_reader_), loading_dispatcher(loading_dispatcher_)
+    PeriodicUpdater(LoadablesConfigReader & config_files_reader_, LoadingDispatcher & loading_dispatcher_, std::recursive_mutex & config_mutex_)
+        : config_files_reader(config_files_reader_), loading_dispatcher(loading_dispatcher_), config_mutex(config_mutex_)
     {
     }
 
@@ -1242,8 +1242,11 @@ private:
         while (!event.wait_for(lock, std::chrono::seconds(check_period_sec), pred))
         {
             lock.unlock();
-            loading_dispatcher.setConfiguration(config_files_reader.read());
-            loading_dispatcher.reloadOutdated();
+            {
+                std::lock_guard config_lock{config_mutex};
+                loading_dispatcher.setConfiguration(config_files_reader.read());
+                loading_dispatcher.reloadOutdated();
+            }
             lock.lock();
         }
     }
@@ -1251,6 +1254,7 @@ private:
     LoadablesConfigReader & config_files_reader;
     LoadingDispatcher & loading_dispatcher;
 
+    std::recursive_mutex & config_mutex;
     mutable std::mutex mutex;
     bool enabled = false;
     ThreadFromGlobalPool thread;
@@ -1264,7 +1268,7 @@ ExternalLoader::ExternalLoader(const String & type_name_, Poco::Logger * log_)
           [this](auto && a, auto && b, auto && c) { return createObject(a, b, c); },
           type_name_,
           log_))
-    , periodic_updater(std::make_unique<PeriodicUpdater>(*config_files_reader, *loading_dispatcher))
+    , periodic_updater(std::make_unique<PeriodicUpdater>(*config_files_reader, *loading_dispatcher, config_mutex))
     , type_name(type_name_)
     , log(log_)
 {
@@ -1276,11 +1280,13 @@ scope_guard ExternalLoader::addConfigRepository(std::unique_ptr<IExternalLoaderC
 {
     auto * ptr = repository.get();
     String name = ptr->getName();
+    std::lock_guard lock{config_mutex};
     config_files_reader->addConfigRepository(std::move(repository));
     reloadConfig(name);
 
     return [this, ptr, name]()
     {
+        std::lock_guard config_lock{config_mutex};
         config_files_reader->removeConfigRepository(ptr);
         reloadConfig(name);
     };
@@ -1379,7 +1385,10 @@ ReturnType ExternalLoader::load(const FilterByNameFunction & filter) const
 template <typename ReturnType, typename>
 ReturnType ExternalLoader::loadOrReload(const String & name) const
 {
-    loading_dispatcher->setConfiguration(config_files_reader->read());
+    {
+        std::lock_guard lock{config_mutex};
+        loading_dispatcher->setConfiguration(config_files_reader->read());
+    }
     auto result = loading_dispatcher->tryLoadOrReload<LoadResult>(name, WAIT);
     checkLoaded(result, true);
     return convertTo<ReturnType>(result);
@@ -1388,7 +1397,10 @@ ReturnType ExternalLoader::loadOrReload(const String & name) const
 template <typename ReturnType, typename>
 ReturnType ExternalLoader::loadOrReload(const FilterByNameFunction & filter) const
 {
-    loading_dispatcher->setConfiguration(config_files_reader->read());
+    {
+        std::lock_guard lock{config_mutex};
+        loading_dispatcher->setConfiguration(config_files_reader->read());
+    }
     auto results = loading_dispatcher->tryLoadOrReload<LoadResults>(filter, WAIT);
     checkLoaded(results, true);
     return convertTo<ReturnType>(results);
@@ -1476,16 +1488,19 @@ void ExternalLoader::checkLoaded(const ExternalLoader::LoadResults & results,
 
 void ExternalLoader::reloadConfig() const
 {
+    std::lock_guard lock{config_mutex};
     loading_dispatcher->setConfiguration(config_files_reader->read());
 }
 
 void ExternalLoader::reloadConfig(const String & repository_name) const
 {
+    std::lock_guard lock{config_mutex};
     loading_dispatcher->setConfiguration(config_files_reader->read(repository_name));
 }
 
 void ExternalLoader::reloadConfig(const String & repository_name, const String & path) const
 {
+    std::lock_guard lock{config_mutex};
     loading_dispatcher->setConfiguration(config_files_reader->read(repository_name, path));
 }
 
diff --git a/src/Interpreters/ExternalLoader.h b/src/Interpreters/ExternalLoader.h
index 2ea79d3aade..1fa11807eba 100644
--- a/src/Interpreters/ExternalLoader.h
+++ b/src/Interpreters/ExternalLoader.h
@@ -219,6 +219,14 @@ private:
 
     LoadablePtr createObject(const String & name, const ObjectConfig & config, const LoadablePtr & previous_version) const;
 
+    /// We have to read configuration from LoadablesConfigReader and load configuration using LoadingDispatcher atomically.
+    /// Otherwise we can read configuration in one thread, then read and load newer configuration in another thread,
+    /// and then load outdated configuration from the first thread.
+    /// Remarkably, each class (LoadablesConfigReader, LoadingDispatcher, PeriodicUpdater) has own mutex for own purposes,
+    /// but it does not save from complex logical race conditions.
+    /// TODO Refactor dictionaries loading and get rid of this.
+    mutable std::recursive_mutex config_mutex;
+
     class LoadablesConfigReader;
     std::unique_ptr<LoadablesConfigReader> config_files_reader;
 

From 939032b0eb7dea5b54889e3b9ba939d5c1a5eb3c Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Fri, 10 Sep 2021 11:21:49 +0300
Subject: [PATCH 155/273] Slightly better

---
 src/Disks/DiskWebServer.cpp               | 48 ++++++++++++++++++-----
 src/Disks/DiskWebServer.h                 |  2 +
 src/Interpreters/InterpreterDropQuery.cpp |  2 -
 3 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/src/Disks/DiskWebServer.cpp b/src/Disks/DiskWebServer.cpp
index fc86763f4d3..5c20ff6a0b4 100644
--- a/src/Disks/DiskWebServer.cpp
+++ b/src/Disks/DiskWebServer.cpp
@@ -1,19 +1,22 @@
 #include "DiskWebServer.h"
 
 #include <common/logger_useful.h>
-
 #include <Common/escapeForFileName.h>
-#include <IO/ReadWriteBufferFromHTTP.h>
+
+#include <Access/AccessControlManager.h>
+
+#include <Disks/IDiskRemote.h>
+#include <Disks/ReadIndirectBufferFromRemoteFS.h>
 #include <Disks/ReadIndirectBufferFromWebServer.h>
+
+#include <IO/ReadWriteBufferFromHTTP.h>
 #include <IO/SeekAvoidingReadBuffer.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 
-#include <Disks/ReadIndirectBufferFromRemoteFS.h>
-#include <Disks/IDiskRemote.h>
-#include <Access/AccessControlManager.h>
-#include <Poco/Exception.h>
+#include <Storages/MergeTree/MergeTreeData.h>
 
+#include <Poco/Exception.h>
 #include <re2/re2.h>
 
 
@@ -62,14 +65,16 @@ void DiskWebServer::initialize(const String & uri_path) const
             file_data.type = is_directory ? FileType::Directory : FileType::File;
             String file_path = fs::path(uri_path) / file_name;
             if (file_data.type == FileType::Directory)
+            {
                 directories_to_load.push_back(file_path);
-            file_path = file_path.substr(url.size());
+                // file_path = fs::path(file_path) / "";
+            }
 
+            file_path = file_path.substr(url.size());
             files.emplace(std::make_pair(file_path, file_data));
             LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Adding file: {}, size: {}", file_path, file_data.size);
         }
 
-        LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Adding directory: {}", dir_name);
         files.emplace(std::make_pair(dir_name, FileData({ .type = FileType::Directory })));
     }
     catch (Exception & e)
@@ -149,8 +154,31 @@ DiskWebServer::DiskWebServer(
 
 bool DiskWebServer::exists(const String & path) const
 {
-    /// TODO: Actually on server startup we always return false for format_version.txt.
-    return files.find(path) != files.end();
+    LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Checking existence of path: {}", path);
+
+    if (files.find(path) != files.end())
+        return true;
+
+    if (path.ends_with(MergeTreeData::FORMAT_VERSION_FILE_NAME) && files.find(fs::path(path).parent_path() / "") == files.end())
+    {
+        try
+        {
+            initialize(fs::path(url) / fs::path(path).parent_path());
+            return files.find(path) != files.end();
+        }
+        catch (...)
+        {
+            const auto message = getCurrentExceptionMessage(false);
+            bool can_throw = CurrentThread::isInitialized() && CurrentThread::get().getQueryContext();
+            if (can_throw)
+                throw Exception(ErrorCodes::NETWORK_ERROR, "Cannot load disk metadata. Error: {}", message);
+
+            LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Cannot load disk metadata. Error: {}", message);
+            return false;
+        }
+    }
+
+    return false;
 }
 
 
diff --git a/src/Disks/DiskWebServer.h b/src/Disks/DiskWebServer.h
index 1d2f00fe483..2ed8e531ede 100644
--- a/src/Disks/DiskWebServer.h
+++ b/src/Disks/DiskWebServer.h
@@ -46,6 +46,8 @@ struct DiskWebServerSettings
  *       </policies>
  *   </storage_configuration>
  *
+ * If query timeouts -- need to adjust settings: http_connection_timeout, http_receive_timeout, http_receive_timeout.
+ *
  * To get files for upload run:
  * clickhouse static-files-disk-uploader --metadata-path <path> --output-dir <dir>
  * (--metadata-path can be found in query: `select data_paths from system.tables where name='<table_name>';`)
diff --git a/src/Interpreters/InterpreterDropQuery.cpp b/src/Interpreters/InterpreterDropQuery.cpp
index fc0d318be8b..8ad9b658fba 100644
--- a/src/Interpreters/InterpreterDropQuery.cpp
+++ b/src/Interpreters/InterpreterDropQuery.cpp
@@ -163,8 +163,6 @@ BlockIO InterpreterDropQuery::executeToTableImpl(ASTDropQuery & query, DatabaseP
         if (query.kind == ASTDropQuery::Kind::Detach)
         {
             getContext()->checkAccess(drop_storage, table_id);
-            if (table->isStaticStorage())
-                throw Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is read-only");
 
             if (table->isDictionary())
             {

From d7dafd6d2ff2ad01d47a5260523e8d1b918ab9fd Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <mikhaylovnikitka@gmail.com>
Date: Fri, 10 Sep 2021 11:10:16 +0000
Subject: [PATCH 156/273] Switch performance and merge contrib

---
 contrib/abseil-cpp      | 2 +-
 contrib/fastops         | 2 +-
 contrib/llvm            | 2 +-
 contrib/rocksdb         | 2 +-
 tests/ci/ci_config.json | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/abseil-cpp b/contrib/abseil-cpp
index 6cc37166d58..b004a8a0241 160000
--- a/contrib/abseil-cpp
+++ b/contrib/abseil-cpp
@@ -1 +1 @@
-Subproject commit 6cc37166d5806c4eeed7a78a43217493a3ca2a8d
+Subproject commit b004a8a02418b83de8b686caa0b0f6e39ac2191f
diff --git a/contrib/fastops b/contrib/fastops
index ac7ca889858..012b777df9e 160000
--- a/contrib/fastops
+++ b/contrib/fastops
@@ -1 +1 @@
-Subproject commit ac7ca8898589f63f0e7e904199469730d96aefa5
+Subproject commit 012b777df9e2d145a24800a6c8c3d4a0249bb09e
diff --git a/contrib/llvm b/contrib/llvm
index 80b3a6fd1be..f30bbecef78 160000
--- a/contrib/llvm
+++ b/contrib/llvm
@@ -1 +1 @@
-Subproject commit 80b3a6fd1be8249f613b945ff49c24d3ee31d6e6
+Subproject commit f30bbecef78b75b527e257c1304d0be2f2f95975
diff --git a/contrib/rocksdb b/contrib/rocksdb
index 22690ed890f..5ea892c8673 160000
--- a/contrib/rocksdb
+++ b/contrib/rocksdb
@@ -1 +1 @@
-Subproject commit 22690ed890fc99873089abcdfc0977182e757c91
+Subproject commit 5ea892c8673e6c5a052887653673b967d44cc59b
diff --git a/tests/ci/ci_config.json b/tests/ci/ci_config.json
index fbb2c1d41a9..cbae9a86fdf 100644
--- a/tests/ci/ci_config.json
+++ b/tests/ci/ci_config.json
@@ -12,7 +12,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "gcc-11",
+            "compiler": "clang-12",
             "build-type": "",
             "sanitizer": "",
             "package-type": "performance",

From 56abedfb2bbe90e4b9272eb60d4c29c685792771 Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <mikhaylovnikitka@gmail.com>
Date: Fri, 10 Sep 2021 12:04:43 +0000
Subject: [PATCH 157/273] Clang tidy

---
 cmake/analysis.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/analysis.cmake b/cmake/analysis.cmake
index 24d8168e2c0..d1b9c86f15f 100644
--- a/cmake/analysis.cmake
+++ b/cmake/analysis.cmake
@@ -6,7 +6,7 @@ if (ENABLE_CLANG_TIDY)
         message(FATAL_ERROR "clang-tidy requires CMake version at least 3.6.")
     endif()
 
-    find_program (CLANG_TIDY_PATH NAMES "clang-tidy" "clang-tidy-12" "clang-tidy-11" "clang-tidy-10" "clang-tidy-9" "clang-tidy-8")
+    find_program (CLANG_TIDY_PATH NAMES "clang-tidy" "clang-tidy-13" "clang-tidy-12" "clang-tidy-11" "clang-tidy-10" "clang-tidy-9" "clang-tidy-8")
 
     if (CLANG_TIDY_PATH)
         message(STATUS

From 518f542c3e755783b1016c23aca1a96c80d3a343 Mon Sep 17 00:00:00 2001
From: Alexander Tokmakov <avtokmakov@yandex-team.ru>
Date: Fri, 10 Sep 2021 17:32:45 +0300
Subject: [PATCH 158/273] fix reordering of REPLACE_RANGE and DROP PART

---
 .../MergeTree/ReplicatedMergeTreeQueue.cpp    | 31 +++++++++++++++++++
 src/Storages/StorageReplicatedMergeTree.cpp   |  4 +++
 2 files changed, 35 insertions(+)

diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
index 88bade29759..04e71cb36f3 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
@@ -1254,6 +1254,37 @@ bool ReplicatedMergeTreeQueue::shouldExecuteLogEntry(
             out_postpone_reason = fmt::format(format_str, entry.znode_name, entry.typeToString(), entry.new_part_name);
             return false;
         }
+
+        if (entry.isDropPart(format_version))
+        {
+            /// We should avoid reordering of REPLACE_RANGE and DROP PART (DROP_RANGE),
+            /// because if replace_range_entry->new_part_names contains drop_range_entry->new_part_name
+            /// and we execute DROP PART before REPLACE_RANGE, then DROP PART will be no-op
+            /// (because part is not created yet, so there is nothing to drop;
+            /// DROP_RANGE does not cover all parts of REPLACE_RANGE, so removePartProducingOpsInRange(...) will not remove anything too)
+            /// and part will never be removed. Replicas may diverge due to such reordering.
+            /// We don't need to do anything for other entry types, because removePartProducingOpsInRange(...) will remove them as expected.
+
+            auto drop_part_info = MergeTreePartInfo::fromPartName(entry.new_part_name, format_version);
+            for (const auto & replace_entry : queue)
+            {
+                if (replace_entry->type != LogEntry::REPLACE_RANGE)
+                    continue;
+
+                for (const auto & new_part_name : replace_entry->replace_range_entry->new_part_names)
+                {
+                    auto new_part_info = MergeTreePartInfo::fromPartName(new_part_name, format_version);
+                    if (!new_part_info.isDisjoint(drop_part_info))
+                    {
+                        const char * format_str = "Not executing log entry {} of type {} for part {} "
+                                                  "because it probably depends on {} (REPLACE_RANGE).";
+                        LOG_TRACE(log, format_str, entry.znode_name, entry.typeToString(), entry.new_part_name, replace_entry->znode_name);
+                        out_postpone_reason = fmt::format(format_str, entry.znode_name, entry.typeToString(), entry.new_part_name, replace_entry->znode_name);
+                        return false;
+                    }
+                }
+            }
+        }
     }
 
     return true;
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index 7e10e9ee62f..f26e42d5a35 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -2199,7 +2199,11 @@ void StorageReplicatedMergeTree::executeDropRange(const LogEntry & entry)
         auto data_parts_lock = lockParts();
         parts_to_remove = removePartsInRangeFromWorkingSet(drop_range_info, true, data_parts_lock);
         if (parts_to_remove.empty())
+        {
+            if (!drop_range_info.isFakeDropRangePart())
+                LOG_INFO(log, "Log entry {} tried to drop single part {}, but part does not exist", entry.znode_name, entry.new_part_name);
             return;
+        }
     }
 
     if (entry.detach)

From a87ffdff921d180d4d02de4bdd779c084a11f09b Mon Sep 17 00:00:00 2001
From: Maksim Kita <maksim-kita@yandex-team.ru>
Date: Fri, 10 Sep 2021 17:41:09 +0300
Subject: [PATCH 159/273] Column default dictGet identifier fix

---
 src/Interpreters/inplaceBlockConversions.cpp  |  5 ++-
 ...lumn_default_dict_get_identifier.reference |  1 +
 ...015_column_default_dict_get_identifier.sql | 37 +++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 tests/queries/0_stateless/2015_column_default_dict_get_identifier.reference
 create mode 100644 tests/queries/0_stateless/2015_column_default_dict_get_identifier.sql

diff --git a/src/Interpreters/inplaceBlockConversions.cpp b/src/Interpreters/inplaceBlockConversions.cpp
index e40e0635a85..4ba924821d7 100644
--- a/src/Interpreters/inplaceBlockConversions.cpp
+++ b/src/Interpreters/inplaceBlockConversions.cpp
@@ -63,8 +63,11 @@ void addDefaultRequiredExpressionsRecursively(
         for (const auto & next_required_column_name : required_columns_names)
             addDefaultRequiredExpressionsRecursively(block, next_required_column_name, required_column_type, columns, default_expr_list_accum, added_columns, null_as_default);
     }
-    else
+    else if (columns.has(required_column_name))
     {
+        /// In case of dictGet function we allow to use it with identifier dictGet(identifier, 'column_name', key_expression)
+        /// and this identifier will be in required columns. If such column is not in ColumnsDescription we ignore it.
+
         /// This column is required, but doesn't have default expression, so lets use "default default"
         auto column = columns.get(required_column_name);
         auto default_value = column.type->getDefault();
diff --git a/tests/queries/0_stateless/2015_column_default_dict_get_identifier.reference b/tests/queries/0_stateless/2015_column_default_dict_get_identifier.reference
new file mode 100644
index 00000000000..29e04d559e1
--- /dev/null
+++ b/tests/queries/0_stateless/2015_column_default_dict_get_identifier.reference
@@ -0,0 +1 @@
+5	0
diff --git a/tests/queries/0_stateless/2015_column_default_dict_get_identifier.sql b/tests/queries/0_stateless/2015_column_default_dict_get_identifier.sql
new file mode 100644
index 00000000000..292f53952d0
--- /dev/null
+++ b/tests/queries/0_stateless/2015_column_default_dict_get_identifier.sql
@@ -0,0 +1,37 @@
+DROP TABLE IF EXISTS test_table;
+CREATE TABLE test_table
+(
+    key_column UInt64,
+    data_column_1 UInt64,
+    data_column_2 UInt8
+)
+ENGINE = MergeTree
+ORDER BY key_column;
+
+INSERT INTO test_table VALUES (0, 0, 0);
+
+DROP DICTIONARY IF EXISTS test_dictionary;
+CREATE DICTIONARY test_dictionary
+(
+    key_column UInt64 DEFAULT 0,
+    data_column_1 UInt64 DEFAULT 1,
+    data_column_2 UInt8 DEFAULT 1
+)
+PRIMARY KEY key_column
+LAYOUT(DIRECT())
+SOURCE(CLICKHOUSE(TABLE 'test_table'));
+
+DROP TABLE IF EXISTS test_table_default;
+CREATE TABLE test_table_default
+(
+    data_1 DEFAULT dictGetUInt64('test_dictionary', 'data_column_1', toUInt64(0)),
+    data_2 DEFAULT dictGet(test_dictionary, 'data_column_2', toUInt64(0))
+)
+ENGINE=TinyLog;
+
+INSERT INTO test_table_default(data_1) VALUES (5);
+SELECT * FROM test_table_default;
+
+DROP DICTIONARY test_dictionary;
+DROP TABLE test_table;
+DROP TABLE test_table_default;

From 32b61a4bb62a26d6d0eb44294715e476f4e916bd Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Fri, 10 Sep 2021 18:33:53 +0300
Subject: [PATCH 160/273] Update
 docs/ru/operations/settings/merge-tree-settings.md

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

diff --git a/docs/ru/operations/settings/merge-tree-settings.md b/docs/ru/operations/settings/merge-tree-settings.md
index 3d1217996fb..33070a0f52f 100644
--- a/docs/ru/operations/settings/merge-tree-settings.md
+++ b/docs/ru/operations/settings/merge-tree-settings.md
@@ -203,7 +203,7 @@ Eсли суммарное число активных кусков во все
 
 ## max_replicated_fetches_network_bandwidth {#max_replicated_fetches_network_bandwidth}
 
-Ограничивает максимальную скорость обмена данными в сети (в байтах в секунду) для синхронизаций между [репликами](../../engines/table-engines/mergetree-family/replication.md). Настройка применяется к конкретной таблице, в отличие от [max_replicated_fetches_network_bandwidth_for_server](settings.md#max_replicated_fetches_network_bandwidth_for_server), которая применяется к серверу.
+Ограничивает максимальную скорость скачивания данных в сети (в байтах в секунду) для синхронизаций между [репликами](../../engines/table-engines/mergetree-family/replication.md). Настройка применяется к конкретной таблице, в отличие от [max_replicated_fetches_network_bandwidth_for_server](settings.md#max_replicated_fetches_network_bandwidth_for_server), которая применяется к серверу.
 
 Можно ограничить скорость обмена данными как для всего сервера, так и для конкретной таблицы, но для этого значение табличной настройки должно быть меньше серверной. Иначе сервер будет учитывать только настройку `max_replicated_fetches_network_bandwidth_for_server`.
 

From 21af80baf5131ec63c2db8c6709e635415700f7b Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Fri, 10 Sep 2021 18:33:58 +0300
Subject: [PATCH 161/273] Update
 docs/ru/operations/settings/merge-tree-settings.md

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

diff --git a/docs/ru/operations/settings/merge-tree-settings.md b/docs/ru/operations/settings/merge-tree-settings.md
index 33070a0f52f..08ea9979426 100644
--- a/docs/ru/operations/settings/merge-tree-settings.md
+++ b/docs/ru/operations/settings/merge-tree-settings.md
@@ -222,7 +222,7 @@ Eсли суммарное число активных кусков во все
 
 ## max_replicated_sends_network_bandwidth {#max_replicated_sends_network_bandwidth}
 
-Ограничивает максимальную скорость обмена данными в сети (в байтах в секунду) для синхронизации между [репликами](../../engines/table-engines/mergetree-family/replication.md). Настройка применяется к конкретной таблице, в отличие от [max_replicated_sends_network_bandwidth_for_server](settings.md#max_replicated_sends_network_bandwidth_for_server), которая применяется к серверу.
+Ограничивает максимальную скорость отправки данных по сети (в байтах в секунду) для синхронизации между [репликами](../../engines/table-engines/mergetree-family/replication.md). Настройка применяется к конкретной таблице, в отличие от [max_replicated_sends_network_bandwidth_for_server](settings.md#max_replicated_sends_network_bandwidth_for_server), которая применяется к серверу.
 
 Можно ограничить скорость обмена данными как для всего сервера, так и для конкретной таблицы, но для этого значение табличной настройки должно быть меньше серверной. Иначе сервер будет учитывать только настройку `max_replicated_sends_network_bandwidth_for_server`.
 

From a63887413c20f730ff74a71f235922e05bf67b9e Mon Sep 17 00:00:00 2001
From: Anton Popov <pad11rus@gmail.com>
Date: Fri, 10 Sep 2021 20:19:18 +0300
Subject: [PATCH 162/273] fix reading of subcolumns from compact parts

---
 src/Storages/MergeTree/MergeTreeReaderCompact.cpp  |  8 +++++++-
 .../02025_subcolumns_compact_parts.reference       |  8 ++++++++
 .../0_stateless/02025_subcolumns_compact_parts.sql | 14 ++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 tests/queries/0_stateless/02025_subcolumns_compact_parts.reference
 create mode 100644 tests/queries/0_stateless/02025_subcolumns_compact_parts.sql

diff --git a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
index 3a8119863cb..05592cf3dac 100644
--- a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
@@ -219,7 +219,13 @@ void MergeTreeReaderCompact::readData(
         auto serialization = type_in_storage->getDefaultSerialization();
         serialization->deserializeBinaryBulkStatePrefix(deserialize_settings, state);
         serialization->deserializeBinaryBulkWithMultipleStreams(temp_column, rows_to_read, deserialize_settings, state, nullptr);
-        column = type_in_storage->getSubcolumn(name_and_type.getSubcolumnName(), *temp_column);
+
+        auto subcolumn = type_in_storage->getSubcolumn(name_and_type.getSubcolumnName(), *temp_column);
+
+        if (column->empty())
+            column = subcolumn;
+        else
+            column->assumeMutable()->insertRangeFrom(*subcolumn, 0, subcolumn->size());
     }
     else
     {
diff --git a/tests/queries/0_stateless/02025_subcolumns_compact_parts.reference b/tests/queries/0_stateless/02025_subcolumns_compact_parts.reference
new file mode 100644
index 00000000000..431d62da742
--- /dev/null
+++ b/tests/queries/0_stateless/02025_subcolumns_compact_parts.reference
@@ -0,0 +1,8 @@
+0
+0
+0
+0
+0
+0
+40000
+219970
diff --git a/tests/queries/0_stateless/02025_subcolumns_compact_parts.sql b/tests/queries/0_stateless/02025_subcolumns_compact_parts.sql
new file mode 100644
index 00000000000..7d1957a1efc
--- /dev/null
+++ b/tests/queries/0_stateless/02025_subcolumns_compact_parts.sql
@@ -0,0 +1,14 @@
+DROP TABLE IF EXISTS t_comp_subcolumns;
+
+CREATE TABLE t_comp_subcolumns (id UInt32, n Nullable(String), arr Array(Array(UInt32)))
+ENGINE = MergeTree ORDER BY id;
+
+INSERT INTO t_comp_subcolumns SELECT number, 'a', [range(number % 11), range(number % 13)] FROM numbers(20000);
+
+SELECT sum(n.null) FROM t_comp_subcolumns;
+SELECT n.null FROM t_comp_subcolumns LIMIT 10000, 5;
+
+SELECT sum(arr.size0) FROM t_comp_subcolumns;
+SELECT sumArray(arr.size1) FROM t_comp_subcolumns;
+
+DROP TABLE t_comp_subcolumns;

From 8999a83320caf050a9c62d87cca17746323cf932 Mon Sep 17 00:00:00 2001
From: Anton Popov <pad11rus@gmail.com>
Date: Fri, 10 Sep 2021 20:22:28 +0300
Subject: [PATCH 163/273] add comment

---
 src/Storages/MergeTree/MergeTreeReaderCompact.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
index 05592cf3dac..122e7932507 100644
--- a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
@@ -222,6 +222,7 @@ void MergeTreeReaderCompact::readData(
 
         auto subcolumn = type_in_storage->getSubcolumn(name_and_type.getSubcolumnName(), *temp_column);
 
+        /// TODO: Avoid extra copying.
         if (column->empty())
             column = subcolumn;
         else

From 62a29420bd0baa61bd0598e2c7bdc6fc15976707 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Thu, 9 Sep 2021 08:45:05 +0300
Subject: [PATCH 164/273] Fix signed integer overflow for nth_value() window
 function

CI report [1]:

    ../src/Processors/Transforms/WindowTransform.cpp:1699:54: runtime error: signed integer overflow: -9223372036854775808 - 1 cannot be represented in type 'long' Received signal -3 Received signal Unknown signal (-3)

In query:

    SELECT
        number,
        nth_value(number, 2147483648) OVER w,
        anyOrNull(number) OVER (ORDER BY -2147483648 - intDiv(number, 1024) DESC NULLS FIRST, number DESC ROWS BETWEEN 65535 FOLLOWING AND UNBOUNDED FOLLOWING),
        nth_value(number, 65537) OVER w AS firstValue,
        nth_value(number, -9223372036854775808) OVER w AS secondValue,
        nth_value(number, 1048576) OVER w AS thirdValue
    FROM numbers(1)
    WINDOW w AS (ORDER BY number DESC)
    ORDER BY number DESC

  [1]: https://clickhouse-test-reports.s3.yandex.net/28532/7623af5513e12aa8dfa1bee963caffe00185c31a/fuzzer_ubsan/report.html#fail1
---
 src/Processors/Transforms/WindowTransform.cpp      | 14 ++++----------
 .../0_stateless/01591_window_functions.reference   |  8 ++++++++
 .../queries/0_stateless/01591_window_functions.sql |  9 ++++++++-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/Processors/Transforms/WindowTransform.cpp b/src/Processors/Transforms/WindowTransform.cpp
index 132bdb7b327..b685248be01 100644
--- a/src/Processors/Transforms/WindowTransform.cpp
+++ b/src/Processors/Transforms/WindowTransform.cpp
@@ -1696,22 +1696,16 @@ struct WindowFunctionNthValue final : public WindowFunction
 
         int64_t offset = (*current_block.input_columns[
                 workspace.argument_column_indices[1]])[
-            transform->current_row.row].get<Int64>() - 1;
+            transform->current_row.row].get<Int64>();
 
-        if (offset < 0)
+        if (offset > INT_MAX || offset <= 0)
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                "The offset for function {} must be non-negative, {} given",
-                getName(), offset);
-        }
-
-        if (offset > INT_MAX)
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                "The offset for function {} must be less than {}, {} given",
+                "The offset for function {} must be in (0, {}], {} given",
                 getName(), INT_MAX, offset);
         }
 
+        --offset;
         const auto [target_row, offset_left] = transform->moveRowNumber(transform->frame_start, offset);
         if (offset_left != 0
             || target_row < transform->frame_start
diff --git a/tests/queries/0_stateless/01591_window_functions.reference b/tests/queries/0_stateless/01591_window_functions.reference
index 26e9e500c3c..48f6a91b92a 100644
--- a/tests/queries/0_stateless/01591_window_functions.reference
+++ b/tests/queries/0_stateless/01591_window_functions.reference
@@ -1150,6 +1150,14 @@ WINDOW w AS (ORDER BY number ASC)
 2	0	2
 3	0	2
 4	0	2
+-- UBsan
+SELECT nth_value(number, -9223372036854775808) OVER w AS v FROM numbers(1) WINDOW w AS (ORDER BY number DESC); -- { serverError BAD_ARGUMENTS }
+SELECT nth_value(number, 0) OVER w AS v FROM numbers(1) WINDOW w AS (ORDER BY number DESC); -- { serverError BAD_ARGUMENTS }
+SELECT nth_value(number, /* INT_MAX+1 */ 2147483648) OVER w AS v FROM numbers(1) WINDOW w AS (ORDER BY number DESC); -- { serverError BAD_ARGUMENTS }
+SELECT nth_value(number, /* INT_MAX */ 2147483647) OVER w AS v FROM numbers(1) WINDOW w AS (ORDER BY number DESC);
+0
+SELECT nth_value(number, 1) OVER w AS v FROM numbers(1) WINDOW w AS (ORDER BY number DESC);
+0
 -- In this case, we had a problem with PartialSortingTransform returning zero-row
 -- chunks for input chunks w/o columns.
 select count() over () from numbers(4) where number < 2;
diff --git a/tests/queries/0_stateless/01591_window_functions.sql b/tests/queries/0_stateless/01591_window_functions.sql
index 3075c1ddb46..1004f80efce 100644
--- a/tests/queries/0_stateless/01591_window_functions.sql
+++ b/tests/queries/0_stateless/01591_window_functions.sql
@@ -434,7 +434,14 @@ SELECT
 FROM numbers(5)
 WINDOW w AS (ORDER BY number ASC)
 ;
-    
+
+-- UBsan
+SELECT nth_value(number, -9223372036854775808) OVER w AS v FROM numbers(1) WINDOW w AS (ORDER BY number DESC); -- { serverError BAD_ARGUMENTS }
+SELECT nth_value(number, 0) OVER w AS v FROM numbers(1) WINDOW w AS (ORDER BY number DESC); -- { serverError BAD_ARGUMENTS }
+SELECT nth_value(number, /* INT_MAX+1 */ 2147483648) OVER w AS v FROM numbers(1) WINDOW w AS (ORDER BY number DESC); -- { serverError BAD_ARGUMENTS }
+SELECT nth_value(number, /* INT_MAX */ 2147483647) OVER w AS v FROM numbers(1) WINDOW w AS (ORDER BY number DESC);
+SELECT nth_value(number, 1) OVER w AS v FROM numbers(1) WINDOW w AS (ORDER BY number DESC);
+
 -- In this case, we had a problem with PartialSortingTransform returning zero-row
 -- chunks for input chunks w/o columns.
 select count() over () from numbers(4) where number < 2;

From b38311538979c0ffe27f6c8c5732b4afc18c4d35 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 10 Sep 2021 21:01:25 +0300
Subject: [PATCH 165/273] Allow values up to INT64_MAX for
 nth_value/lagInFrame/leadInFrame

---
 src/Processors/Transforms/WindowTransform.cpp | 16 +++++-----
 src/Processors/Transforms/WindowTransform.h   |  4 +--
 .../01591_window_functions.reference          | 30 +++++++++++++++----
 .../0_stateless/01591_window_functions.sql    | 26 ++++++++++++----
 4 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/src/Processors/Transforms/WindowTransform.cpp b/src/Processors/Transforms/WindowTransform.cpp
index b685248be01..d731d4048b1 100644
--- a/src/Processors/Transforms/WindowTransform.cpp
+++ b/src/Processors/Transforms/WindowTransform.cpp
@@ -423,7 +423,7 @@ void WindowTransform::advancePartitionEnd()
     assert(!partition_ended && partition_end == blocksEnd());
 }
 
-auto WindowTransform::moveRowNumberNoCheck(const RowNumber & _x, int offset) const
+auto WindowTransform::moveRowNumberNoCheck(const RowNumber & _x, int64_t offset) const
 {
     RowNumber x = _x;
 
@@ -461,9 +461,9 @@ auto WindowTransform::moveRowNumberNoCheck(const RowNumber & _x, int offset) con
             assertValid(x);
             assert(offset <= 0);
 
-            // abs(offset) is less than INT_MAX, as checked in the parser, so
+            // abs(offset) is less than INT64_MAX, as checked in the parser, so
             // this negation should always work.
-            assert(offset >= -INT_MAX);
+            assert(offset >= -INT64_MAX);
             if (x.row >= static_cast<uint64_t>(-offset))
             {
                 x.row -= -offset;
@@ -493,7 +493,7 @@ auto WindowTransform::moveRowNumberNoCheck(const RowNumber & _x, int offset) con
     return std::tuple{x, offset};
 }
 
-auto WindowTransform::moveRowNumber(const RowNumber & _x, int offset) const
+auto WindowTransform::moveRowNumber(const RowNumber & _x, int64_t offset) const
 {
     auto [x, o] = moveRowNumberNoCheck(_x, offset);
 
@@ -1620,11 +1620,11 @@ struct WindowFunctionLagLeadInFrame final : public WindowFunction
                     "The offset for function {} must be nonnegative, {} given",
                     getName(), offset);
             }
-            if (offset > INT_MAX)
+            if (offset > INT64_MAX)
             {
                 throw Exception(ErrorCodes::BAD_ARGUMENTS,
                     "The offset for function {} must be less than {}, {} given",
-                    getName(), INT_MAX, offset);
+                    getName(), INT64_MAX, offset);
             }
         }
 
@@ -1698,11 +1698,11 @@ struct WindowFunctionNthValue final : public WindowFunction
                 workspace.argument_column_indices[1]])[
             transform->current_row.row].get<Int64>();
 
-        if (offset > INT_MAX || offset <= 0)
+        if (offset > INT64_MAX || offset <= 0)
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "The offset for function {} must be in (0, {}], {} given",
-                getName(), INT_MAX, offset);
+                getName(), INT64_MAX, offset);
         }
 
         --offset;
diff --git a/src/Processors/Transforms/WindowTransform.h b/src/Processors/Transforms/WindowTransform.h
index 5dc78a34f78..650a0b5a4d3 100644
--- a/src/Processors/Transforms/WindowTransform.h
+++ b/src/Processors/Transforms/WindowTransform.h
@@ -218,8 +218,8 @@ public:
 #endif
     }
 
-    auto moveRowNumber(const RowNumber & _x, int offset) const;
-    auto moveRowNumberNoCheck(const RowNumber & _x, int offset) const;
+    auto moveRowNumber(const RowNumber & _x, int64_t offset) const;
+    auto moveRowNumberNoCheck(const RowNumber & _x, int64_t offset) const;
 
     void assertValid(const RowNumber & x) const
     {
diff --git a/tests/queries/0_stateless/01591_window_functions.reference b/tests/queries/0_stateless/01591_window_functions.reference
index 48f6a91b92a..92671805436 100644
--- a/tests/queries/0_stateless/01591_window_functions.reference
+++ b/tests/queries/0_stateless/01591_window_functions.reference
@@ -1150,13 +1150,31 @@ WINDOW w AS (ORDER BY number ASC)
 2	0	2
 3	0	2
 4	0	2
--- UBsan
-SELECT nth_value(number, -9223372036854775808) OVER w AS v FROM numbers(1) WINDOW w AS (ORDER BY number DESC); -- { serverError BAD_ARGUMENTS }
-SELECT nth_value(number, 0) OVER w AS v FROM numbers(1) WINDOW w AS (ORDER BY number DESC); -- { serverError BAD_ARGUMENTS }
-SELECT nth_value(number, /* INT_MAX+1 */ 2147483648) OVER w AS v FROM numbers(1) WINDOW w AS (ORDER BY number DESC); -- { serverError BAD_ARGUMENTS }
-SELECT nth_value(number, /* INT_MAX */ 2147483647) OVER w AS v FROM numbers(1) WINDOW w AS (ORDER BY number DESC);
+-- nth_value UBsan
+SELECT nth_value(1, -1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT nth_value(1, 0) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT nth_value(1, /* INT64_MAX+1 */ 0x7fffffffffffffff+1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT nth_value(1, /* INT64_MAX */ 0x7fffffffffffffff) OVER ();
 0
-SELECT nth_value(number, 1) OVER w AS v FROM numbers(1) WINDOW w AS (ORDER BY number DESC);
+SELECT nth_value(1, 1) OVER ();
+1
+-- lagInFrame UBsan
+SELECT lagInFrame(1, -1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT lagInFrame(1, 0) OVER ();
+1
+SELECT lagInFrame(1, /* INT64_MAX+1 */ 0x7fffffffffffffff+1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT lagInFrame(1, /* INT64_MAX */ 0x7fffffffffffffff) OVER ();
+0
+SELECT lagInFrame(1, 1) OVER ();
+0
+-- leadInFrame UBsan
+SELECT leadInFrame(1, -1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT leadInFrame(1, 0) OVER ();
+1
+SELECT leadInFrame(1, /* INT64_MAX+1 */ 0x7fffffffffffffff+1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT leadInFrame(1, /* INT64_MAX */ 0x7fffffffffffffff) OVER ();
+0
+SELECT leadInFrame(1, 1) OVER ();
 0
 -- In this case, we had a problem with PartialSortingTransform returning zero-row
 -- chunks for input chunks w/o columns.
diff --git a/tests/queries/0_stateless/01591_window_functions.sql b/tests/queries/0_stateless/01591_window_functions.sql
index 1004f80efce..43946ddb3fe 100644
--- a/tests/queries/0_stateless/01591_window_functions.sql
+++ b/tests/queries/0_stateless/01591_window_functions.sql
@@ -435,12 +435,26 @@ FROM numbers(5)
 WINDOW w AS (ORDER BY number ASC)
 ;
 
--- UBsan
-SELECT nth_value(number, -9223372036854775808) OVER w AS v FROM numbers(1) WINDOW w AS (ORDER BY number DESC); -- { serverError BAD_ARGUMENTS }
-SELECT nth_value(number, 0) OVER w AS v FROM numbers(1) WINDOW w AS (ORDER BY number DESC); -- { serverError BAD_ARGUMENTS }
-SELECT nth_value(number, /* INT_MAX+1 */ 2147483648) OVER w AS v FROM numbers(1) WINDOW w AS (ORDER BY number DESC); -- { serverError BAD_ARGUMENTS }
-SELECT nth_value(number, /* INT_MAX */ 2147483647) OVER w AS v FROM numbers(1) WINDOW w AS (ORDER BY number DESC);
-SELECT nth_value(number, 1) OVER w AS v FROM numbers(1) WINDOW w AS (ORDER BY number DESC);
+-- nth_value UBsan
+SELECT nth_value(1, -1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT nth_value(1, 0) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT nth_value(1, /* INT64_MAX+1 */ 0x7fffffffffffffff+1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT nth_value(1, /* INT64_MAX */ 0x7fffffffffffffff) OVER ();
+SELECT nth_value(1, 1) OVER ();
+
+-- lagInFrame UBsan
+SELECT lagInFrame(1, -1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT lagInFrame(1, 0) OVER ();
+SELECT lagInFrame(1, /* INT64_MAX+1 */ 0x7fffffffffffffff+1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT lagInFrame(1, /* INT64_MAX */ 0x7fffffffffffffff) OVER ();
+SELECT lagInFrame(1, 1) OVER ();
+
+-- leadInFrame UBsan
+SELECT leadInFrame(1, -1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT leadInFrame(1, 0) OVER ();
+SELECT leadInFrame(1, /* INT64_MAX+1 */ 0x7fffffffffffffff+1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT leadInFrame(1, /* INT64_MAX */ 0x7fffffffffffffff) OVER ();
+SELECT leadInFrame(1, 1) OVER ();
 
 -- In this case, we had a problem with PartialSortingTransform returning zero-row
 -- chunks for input chunks w/o columns.

From af5072db5067dd87164188bdcf47d9773fb10461 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Thu, 9 Sep 2021 23:39:37 +0300
Subject: [PATCH 166/273] client: print full query in case of test hints
 failures

---
 programs/client/Client.cpp | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 87ae03161a9..58fc80ef958 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -1244,13 +1244,17 @@ private:
                     if (!server_exception)
                     {
                         error_matches_hint = false;
-                        fmt::print(stderr, "Expected server error code '{}' but got no server error.\n", test_hint.serverError());
+                        fmt::print(stderr, "Expected server error code '{}' but got no server error (query: {}).\n",
+                            test_hint.serverError(),
+                            full_query);
                     }
                     else if (server_exception->code() != test_hint.serverError())
                     {
                         error_matches_hint = false;
-                        std::cerr << "Expected server error code: " << test_hint.serverError() << " but got: " << server_exception->code()
-                                  << "." << std::endl;
+                        fmt::print(stderr, "Expected server error code: {} but got: {} (query: {}).\n",
+                            test_hint.serverError(),
+                            server_exception->code(),
+                            full_query);
                     }
                 }
 
@@ -1259,13 +1263,17 @@ private:
                     if (!client_exception)
                     {
                         error_matches_hint = false;
-                        fmt::print(stderr, "Expected client error code '{}' but got no client error.\n", test_hint.clientError());
+                        fmt::print(stderr, "Expected client error code '{}' but got no client error (query: {}).\n",
+                            test_hint.clientError(),
+                            full_query);
                     }
                     else if (client_exception->code() != test_hint.clientError())
                     {
                         error_matches_hint = false;
-                        fmt::print(
-                            stderr, "Expected client error code '{}' but got '{}'.\n", test_hint.clientError(), client_exception->code());
+                        fmt::print(stderr, "Expected client error code '{}' but got '{}' (query: {}).\n",
+                            test_hint.clientError(),
+                            client_exception->code(),
+                            full_query);
                     }
                 }
 
@@ -1281,13 +1289,17 @@ private:
             {
                 if (test_hint.clientError())
                 {
-                    fmt::print(stderr, "The query succeeded but the client error '{}' was expected.\n", test_hint.clientError());
+                    fmt::print(stderr, "The query succeeded but the client error '{}' was expected (query: {}).\n",
+                        test_hint.clientError(),
+                        full_query);
                     error_matches_hint = false;
                 }
 
                 if (test_hint.serverError())
                 {
-                    fmt::print(stderr, "The query succeeded but the server error '{}' was expected.\n", test_hint.serverError());
+                    fmt::print(stderr, "The query succeeded but the server error '{}' was expected (query: {}).\n",
+                        test_hint.serverError(),
+                        full_query);
                     error_matches_hint = false;
                 }
             }

From f0f31ab8f39a11670f87a54e86869831d8d4aab2 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Thu, 9 Sep 2021 23:53:24 +0300
Subject: [PATCH 167/273] client: print full query in case of server exception

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

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 58fc80ef958..4e59cca2024 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -1031,10 +1031,17 @@ private:
         if (server_exception)
         {
             bool print_stack_trace = config().getBool("stacktrace", false);
-            std::cerr << "Received exception from server (version " << server_version << "):" << std::endl
-                << getExceptionMessage(*server_exception, print_stack_trace, true) << std::endl;
+            fmt::print(stderr, "Received exception from server (version {}):\n{}\n",
+                server_version,
+                getExceptionMessage(*server_exception, print_stack_trace, true));
             if (is_interactive)
-                std::cerr << std::endl;
+            {
+                fmt::print(stderr, "\n");
+            }
+            else
+            {
+                fmt::print(stderr, "(query: {})\n", full_query);
+            }
         }
 
         if (client_exception)

From 09f43d21a843d10cd0d8f0e5430ac083598714e3 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 10 Sep 2021 00:02:04 +0300
Subject: [PATCH 168/273] client: print query on client exception only in
 non-interactive mode

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

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 4e59cca2024..c594f01861b 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -1046,11 +1046,15 @@ private:
 
         if (client_exception)
         {
-            fmt::print(stderr, "Error on processing query '{}':\n{}\n", full_query, client_exception->message());
+            fmt::print(stderr, "Error on processing query: {}\n", client_exception->message());
             if (is_interactive)
             {
                 fmt::print(stderr, "\n");
             }
+            else
+            {
+                fmt::print(stderr, "(query: {})\n", full_query);
+            }
         }
 
         // A debug check -- at least some exception must be set, if the error

From c4a24c7696ce5a70aaa8cf5ec1702a305710e54d Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 10 Sep 2021 21:02:31 +0300
Subject: [PATCH 169/273] tests: update reference after client started printing
 query

---
 tests/queries/0_stateless/00602_throw_if.sh          |  2 +-
 tests/queries/0_stateless/00763_lock_buffer.sh       |  2 +-
 .../0_stateless/00956_sensitive_data_masking.sh      |  6 +++---
 tests/queries/0_stateless/01150_ddl_guard_rwr.sh     | 12 ++++++------
 .../queries/0_stateless/01529_bad_memory_tracking.sh |  3 ++-
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/tests/queries/0_stateless/00602_throw_if.sh b/tests/queries/0_stateless/00602_throw_if.sh
index fe8feab0303..1e8850028c4 100755
--- a/tests/queries/0_stateless/00602_throw_if.sh
+++ b/tests/queries/0_stateless/00602_throw_if.sh
@@ -8,5 +8,5 @@ default_exception_message="Value passed to 'throwIf' function is non zero"
 custom_exception_message="Number equals 1000000"
 
 ${CLICKHOUSE_CLIENT} --server_logs_file /dev/null --query="SELECT throwIf(number = 1000000) FROM system.numbers" 2>&1 | grep -cF "$default_exception_message"
-${CLICKHOUSE_CLIENT} --server_logs_file /dev/null --query="SELECT throwIf(number = 1000000, '$custom_exception_message') FROM system.numbers" 2>&1 | grep -cF "$custom_exception_message"
+${CLICKHOUSE_CLIENT} --server_logs_file /dev/null --query="SELECT throwIf(number = 1000000, '$custom_exception_message') FROM system.numbers" 2>&1 | grep -v '^(query: ' | grep -cF "$custom_exception_message"
 ${CLICKHOUSE_CLIENT} --server_logs_file /dev/null --query="SELECT sum(x = 0) FROM (SELECT throwIf(number = 1000000) AS x FROM numbers(1000000))" 2>&1
diff --git a/tests/queries/0_stateless/00763_lock_buffer.sh b/tests/queries/0_stateless/00763_lock_buffer.sh
index 44660035208..363e3803983 100755
--- a/tests/queries/0_stateless/00763_lock_buffer.sh
+++ b/tests/queries/0_stateless/00763_lock_buffer.sh
@@ -18,7 +18,7 @@ function thread1()
 
 function thread2()
 {
-    seq 1 1000 | sed -r -e 's/.+/SELECT count() FROM buffer_00763_2;/' | ${CLICKHOUSE_CLIENT} --multiquery --server_logs_file='/dev/null' --ignore-error 2>&1 | grep -vP '^0$|^10$|^Received exception|^Code: 60|^Code: 218|^Code: 473'
+    seq 1 1000 | sed -r -e 's/.+/SELECT count() FROM buffer_00763_2;/' | ${CLICKHOUSE_CLIENT} --multiquery --server_logs_file='/dev/null' --ignore-error 2>&1 | grep -vP '^0$|^10$|^Received exception|^Code: 60|^Code: 218|^Code: 473' | grep -v '(query: '
 }
 
 thread1 &
diff --git a/tests/queries/0_stateless/00956_sensitive_data_masking.sh b/tests/queries/0_stateless/00956_sensitive_data_masking.sh
index 7462dfd5585..e7179e1e002 100755
--- a/tests/queries/0_stateless/00956_sensitive_data_masking.sh
+++ b/tests/queries/0_stateless/00956_sensitive_data_masking.sh
@@ -37,7 +37,7 @@ echo 3
 # failure at before query start
 $CLICKHOUSE_CLIENT \
   --query="SELECT 'find_me_TOPSECRET=TOPSECRET' FROM non_existing_table FORMAT Null" \
-  --log_queries=1 --ignore-error --multiquery >"$tmp_file" 2>&1
+  --log_queries=1 --ignore-error --multiquery |& grep -v '^(query: ' > "$tmp_file"
 
 grep -F 'find_me_[hidden]' "$tmp_file" >/dev/null || echo 'fail 3a'
 grep -F 'TOPSECRET' "$tmp_file" && echo 'fail 3b'
@@ -47,7 +47,7 @@ echo 4
 # failure at the end of query
 $CLICKHOUSE_CLIENT \
   --query="SELECT 'find_me_TOPSECRET=TOPSECRET', intDiv( 100, number - 10) FROM numbers(11) FORMAT Null" \
-  --log_queries=1 --ignore-error --max_block_size=2 --multiquery >"$tmp_file" 2>&1
+  --log_queries=1 --ignore-error --max_block_size=2 --multiquery |& grep -v '^(query: ' > "$tmp_file"
 
 grep -F 'find_me_[hidden]' "$tmp_file" >/dev/null || echo 'fail 4a'
 grep -F 'TOPSECRET' "$tmp_file" && echo 'fail 4b'
@@ -57,7 +57,7 @@ echo 5
 rm -f "$tmp_file2" >/dev/null 2>&1
 bash -c "$CLICKHOUSE_CLIENT \
   --query=\"select sleepEachRow(1) from numbers(10) where ignore('find_me_TOPSECRET=TOPSECRET')=0 and ignore('fwerkh_that_magic_string_make_me_unique') = 0 FORMAT Null\" \
-  --log_queries=1 --ignore-error --multiquery >$tmp_file2 2>&1" &
+  --log_queries=1 --ignore-error --multiquery |& grep -v '^(query: ' > $tmp_file2" &
 
 rm -f "$tmp_file" >/dev/null 2>&1
 # check that executing query doesn't expose secrets in processlist
diff --git a/tests/queries/0_stateless/01150_ddl_guard_rwr.sh b/tests/queries/0_stateless/01150_ddl_guard_rwr.sh
index 6355f790e23..27c9ba55858 100755
--- a/tests/queries/0_stateless/01150_ddl_guard_rwr.sh
+++ b/tests/queries/0_stateless/01150_ddl_guard_rwr.sh
@@ -14,20 +14,20 @@ $CLICKHOUSE_CLIENT --query "CREATE TABLE test_01150.t2 (x UInt64, s Array(Nullab
 
 function thread_detach_attach {
     while true; do
-        $CLICKHOUSE_CLIENT --query "DETACH DATABASE test_01150" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (219)'
+        $CLICKHOUSE_CLIENT --query "DETACH DATABASE test_01150" 2>&1 | grep -v -F -e 'Received exception from server' -e 'Code: (219)' -e '(query: '
         sleep 0.0$RANDOM
-        $CLICKHOUSE_CLIENT --query "ATTACH DATABASE test_01150" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (82)'
+        $CLICKHOUSE_CLIENT --query "ATTACH DATABASE test_01150" 2>&1 | grep -v -F -e 'Received exception from server' -e 'Code: (219)' -e '(query: '
         sleep 0.0$RANDOM
     done
 }
 
 function thread_rename {
     while true; do
-        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t1 TO test_01150.t2_tmp, test_01150.t2 TO test_01150.t1, test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (81|60|57|521)'
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t1 TO test_01150.t2_tmp, test_01150.t2 TO test_01150.t1, test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F -e 'Received exception from server' -e '(query: ' | grep -v -P 'Code: (81|60|57|521)'
         sleep 0.0$RANDOM
-        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t2 TO test_01150.t1, test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (81|60|57|521)'
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t2 TO test_01150.t1, test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F -e 'Received exception from server' -e '(query: ' | grep -v -P 'Code: (81|60|57|521)'
         sleep 0.0$RANDOM
-        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (81|60|57|521)'
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F -e 'Received exception from server' -e '(query: ' | grep -v -P 'Code: (81|60|57|521)'
         sleep 0.0$RANDOM
     done
 }
@@ -42,4 +42,4 @@ sleep 1
 
 $CLICKHOUSE_CLIENT --query "DETACH DATABASE IF EXISTS test_01150"
 $CLICKHOUSE_CLIENT --query "ATTACH DATABASE IF NOT EXISTS test_01150"
-$CLICKHOUSE_CLIENT --query "DROP DATABASE test_01150";
+$CLICKHOUSE_CLIENT --query "DROP DATABASE test_01150"
diff --git a/tests/queries/0_stateless/01529_bad_memory_tracking.sh b/tests/queries/0_stateless/01529_bad_memory_tracking.sh
index 5ad2535074a..6f614d8329f 100755
--- a/tests/queries/0_stateless/01529_bad_memory_tracking.sh
+++ b/tests/queries/0_stateless/01529_bad_memory_tracking.sh
@@ -7,5 +7,6 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 for _ in {1..10}; do
-    ${CLICKHOUSE_CLIENT} --max_memory_usage '10G' --query "SELECT i FROM generateRandom('i Array(Int8)', 1, 1, 1048577) LIMIT 65536" 2>&1 | grep -v -P '^(Received exception from server|Code: 241)' ||:
+    ${CLICKHOUSE_CLIENT} --max_memory_usage '10G' --query "SELECT i FROM generateRandom('i Array(Int8)', 1, 1, 1048577) LIMIT 65536" |& grep -v -e 'Received exception from server' -e 'Code: 241' -e '(query: '
 done
+exit 0

From 60df1e880029120221fd1be20ff9db8294dec188 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 10 Sep 2021 00:10:25 +0300
Subject: [PATCH 170/273] Relax nested function for If-combinator check

Second If combinator can be useful to add condition based on another
column, when Merge combinator is applied for example (i.e.
uniqCombinedIfMergeIf(state_of_merge_that_is_stored_in_table, event_date = today())).
---
 src/AggregateFunctions/AggregateFunctionIf.cpp           | 4 ----
 .../0_stateless/02001_select_with_filter.reference       | 2 ++
 tests/queries/0_stateless/02001_select_with_filter.sql   | 3 ++-
 .../02025_nested_func_for_if_combinator.reference        | 9 +++++++++
 .../0_stateless/02025_nested_func_for_if_combinator.sql  | 7 +++++++
 5 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 tests/queries/0_stateless/02025_nested_func_for_if_combinator.reference
 create mode 100644 tests/queries/0_stateless/02025_nested_func_for_if_combinator.sql

diff --git a/src/AggregateFunctions/AggregateFunctionIf.cpp b/src/AggregateFunctions/AggregateFunctionIf.cpp
index 5082952f386..4ed4b5552e0 100644
--- a/src/AggregateFunctions/AggregateFunctionIf.cpp
+++ b/src/AggregateFunctions/AggregateFunctionIf.cpp
@@ -37,10 +37,6 @@ public:
         const DataTypes & arguments,
         const Array & params) const override
     {
-        if (nested_function->getName().find(getName()) != String::npos)
-        {
-            throw Exception(ErrorCodes::ILLEGAL_AGGREGATION, "nested function for {0}-combinator must not have {0}-combinator", getName());
-        }
         return std::make_shared<AggregateFunctionIf>(nested_function, arguments, params);
     }
 };
diff --git a/tests/queries/0_stateless/02001_select_with_filter.reference b/tests/queries/0_stateless/02001_select_with_filter.reference
index 9d104af5e8c..92af7d1d38f 100644
--- a/tests/queries/0_stateless/02001_select_with_filter.reference
+++ b/tests/queries/0_stateless/02001_select_with_filter.reference
@@ -1,2 +1,4 @@
 98
 2450
+\N
+2500
diff --git a/tests/queries/0_stateless/02001_select_with_filter.sql b/tests/queries/0_stateless/02001_select_with_filter.sql
index 4d10f86ed96..70152db83f8 100644
--- a/tests/queries/0_stateless/02001_select_with_filter.sql
+++ b/tests/queries/0_stateless/02001_select_with_filter.sql
@@ -1,3 +1,4 @@
 SELECT argMax(number, number + 1) FILTER(WHERE number != 99) FROM numbers(100) ;
 SELECT sum(number) FILTER(WHERE number % 2 == 0) FROM numbers(100);
-SELECT sumIfOrNull(number, number % 2 == 1) FILTER(WHERE number % 2 == 0) FROM numbers(100); -- { serverError 184 }
+SELECT sumIfOrNull(number, number % 2 == 1) FILTER(WHERE 0) FROM numbers(100);
+SELECT sumIfOrNull(number, number % 2 == 1) FILTER(WHERE 1) FROM numbers(100);
diff --git a/tests/queries/0_stateless/02025_nested_func_for_if_combinator.reference b/tests/queries/0_stateless/02025_nested_func_for_if_combinator.reference
new file mode 100644
index 00000000000..292da6c5525
--- /dev/null
+++ b/tests/queries/0_stateless/02025_nested_func_for_if_combinator.reference
@@ -0,0 +1,9 @@
+-- { echo }
+SELECT uniqCombinedIfMerge(n) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+5
+SELECT uniqCombinedIfMergeIf(n, last > 50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+0
+SELECT uniqCombinedIfMergeIf(n, last > 50) FILTER(WHERE last>50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+0
+SELECT uniqCombinedIfMergeIf(n, last > 5) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+5
diff --git a/tests/queries/0_stateless/02025_nested_func_for_if_combinator.sql b/tests/queries/0_stateless/02025_nested_func_for_if_combinator.sql
new file mode 100644
index 00000000000..0b5bb54b121
--- /dev/null
+++ b/tests/queries/0_stateless/02025_nested_func_for_if_combinator.sql
@@ -0,0 +1,7 @@
+-- { echo }
+SELECT uniqCombinedIfMerge(n) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+SELECT uniqCombinedIfMergeIf(n, last > 50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+SELECT uniqCombinedIfMergeIf(n, last > 50) FILTER(WHERE last>50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+SELECT uniqCombinedIfMergeIf(n, last > 5) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+SELECT uniqCombinedIfMergeIfIf(n, last > 5) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT uniqCombinedIfMergeIfIf(n, last > 5, 1) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10)); -- { serverError ILLEGAL_AGGREGATION }

From 1e7714d56d21ed8a225c59d0ce3e0c013e356bf6 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 10 Sep 2021 00:10:25 +0300
Subject: [PATCH 171/273] Forbid nested identical (only) combinators

Nested identical combinators (i.e. uniqCombinedIfIf) is not
supported (since they even don't work -- silently).

But non-identical does supported and works, for example
uniqCombinedIfMergeIf, it is useful in case when the underlying
storage stores AggregateFunction(uniqCombinedIf) and in SELECT you
need to filter aggregation result based on another column for
example.
---
 .../AggregateFunctionFactory.cpp              | 24 ++++++++++++++++---
 ...25_nested_func_for_if_combinator.reference |  5 +++-
 .../02025_nested_func_for_if_combinator.sql   |  5 ++--
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/AggregateFunctions/AggregateFunctionFactory.cpp b/src/AggregateFunctions/AggregateFunctionFactory.cpp
index c9dcdb54424..d295fb1e85a 100644
--- a/src/AggregateFunctions/AggregateFunctionFactory.cpp
+++ b/src/AggregateFunctions/AggregateFunctionFactory.cpp
@@ -29,6 +29,7 @@ namespace ErrorCodes
 {
     extern const int UNKNOWN_AGGREGATE_FUNCTION;
     extern const int LOGICAL_ERROR;
+    extern const int ILLEGAL_AGGREGATION;
 }
 
 const String & getAggregateFunctionCanonicalNameIfAny(const String & name)
@@ -159,13 +160,30 @@ AggregateFunctionPtr AggregateFunctionFactory::getImpl(
 
     if (AggregateFunctionCombinatorPtr combinator = AggregateFunctionCombinatorFactory::instance().tryFindSuffix(name))
     {
+        const std::string & combinator_name = combinator->getName();
+
         if (combinator->isForInternalUsageOnly())
-            throw Exception("Aggregate function combinator '" + combinator->getName() + "' is only for internal usage", ErrorCodes::UNKNOWN_AGGREGATE_FUNCTION);
+            throw Exception(ErrorCodes::UNKNOWN_AGGREGATE_FUNCTION,
+                "Aggregate function combinator '{}' is only for internal usage",
+                combinator_name);
 
         if (query_context && query_context->getSettingsRef().log_queries)
-            query_context->addQueryFactoriesInfo(Context::QueryLogFactories::AggregateFunctionCombinator, combinator->getName());
+            query_context->addQueryFactoriesInfo(Context::QueryLogFactories::AggregateFunctionCombinator, combinator_name);
+
+        String nested_name = name.substr(0, name.size() - combinator_name.size());
+        /// Nested identical combinators (i.e. uniqCombinedIfIf) is not
+        /// supported (since they even don't work -- silently).
+        ///
+        /// But non-identical does supported and works, for example
+        /// uniqCombinedIfMergeIf, it is useful in case when the underlying
+        /// storage stores AggregateFunction(uniqCombinedIf) and in SELECT you
+        /// need to filter aggregation result based on another column for
+        /// example.
+        if (nested_name.ends_with(combinator_name))
+            throw Exception(ErrorCodes::ILLEGAL_AGGREGATION,
+                "Nested identical combinator '{}' is not supported",
+                combinator_name);
 
-        String nested_name = name.substr(0, name.size() - combinator->getName().size());
         DataTypes nested_types = combinator->transformArguments(argument_types);
         Array nested_parameters = combinator->transformParameters(parameters);
 
diff --git a/tests/queries/0_stateless/02025_nested_func_for_if_combinator.reference b/tests/queries/0_stateless/02025_nested_func_for_if_combinator.reference
index 292da6c5525..2b3b5b30715 100644
--- a/tests/queries/0_stateless/02025_nested_func_for_if_combinator.reference
+++ b/tests/queries/0_stateless/02025_nested_func_for_if_combinator.reference
@@ -3,7 +3,10 @@ SELECT uniqCombinedIfMerge(n) FROM (SELECT uniqCombinedIfState(number, number %
 5
 SELECT uniqCombinedIfMergeIf(n, last > 50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
 0
-SELECT uniqCombinedIfMergeIf(n, last > 50) FILTER(WHERE last>50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+SELECT uniqCombinedIfMergeIf(n, last > 50) FILTER(WHERE last>50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10)); -- { serverError ILLEGAL_AGGREGATION }
+SELECT uniqCombinedIfMerge(n) FILTER(WHERE last>50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
 0
 SELECT uniqCombinedIfMergeIf(n, last > 5) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
 5
+SELECT uniqCombinedIfMergeIfIf(n, last > 5) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10)); -- { serverError ILLEGAL_AGGREGATION }
+SELECT uniqCombinedIfMergeIfIf(n, last > 5, 1) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10)); -- { serverError ILLEGAL_AGGREGATION }
diff --git a/tests/queries/0_stateless/02025_nested_func_for_if_combinator.sql b/tests/queries/0_stateless/02025_nested_func_for_if_combinator.sql
index 0b5bb54b121..4811023c198 100644
--- a/tests/queries/0_stateless/02025_nested_func_for_if_combinator.sql
+++ b/tests/queries/0_stateless/02025_nested_func_for_if_combinator.sql
@@ -1,7 +1,8 @@
 -- { echo }
 SELECT uniqCombinedIfMerge(n) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
 SELECT uniqCombinedIfMergeIf(n, last > 50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
-SELECT uniqCombinedIfMergeIf(n, last > 50) FILTER(WHERE last>50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+SELECT uniqCombinedIfMergeIf(n, last > 50) FILTER(WHERE last>50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10)); -- { serverError ILLEGAL_AGGREGATION }
+SELECT uniqCombinedIfMerge(n) FILTER(WHERE last>50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
 SELECT uniqCombinedIfMergeIf(n, last > 5) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
-SELECT uniqCombinedIfMergeIfIf(n, last > 5) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT uniqCombinedIfMergeIfIf(n, last > 5) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10)); -- { serverError ILLEGAL_AGGREGATION }
 SELECT uniqCombinedIfMergeIfIf(n, last > 5, 1) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10)); -- { serverError ILLEGAL_AGGREGATION }

From 4e9b2c5d69b6e803d2fe3ee0d96db41e6914e58f Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 10 Sep 2021 21:02:18 +0300
Subject: [PATCH 172/273] Relax ENABLE_CHECK_HEAVY_BUILDS restrictions on
 systems under pressure (increase RLIMIT_CPU)

The problem was with compiling src/AggregateFunctions/AggregateFunctionQuantile.cpp
---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddb7c85d539..e0fa6d8e197 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,8 +84,8 @@ if (ENABLE_CHECK_HEAVY_BUILDS)
     set (RLIMIT_DATA 5000000000)
     # set VIRT (RLIMIT_AS) to 10G (DATA*10)
     set (RLIMIT_AS 10000000000)
-    # set CPU time limit to 800 seconds
-    set (RLIMIT_CPU 800)
+    # set CPU time limit to 1000 seconds
+    set (RLIMIT_CPU 1000)
 
     # gcc10/gcc10/clang -fsanitize=memory is too heavy
     if (SANITIZE STREQUAL "memory" OR COMPILER_GCC)

From d8bf2f81ec04cceb1211030807925fe3f7503604 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 10 Sep 2021 21:03:15 +0300
Subject: [PATCH 173/273] Allow Array/OrNull combinators regardless nesting

---
 .../AggregateFunctionFactory.cpp               | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/AggregateFunctions/AggregateFunctionFactory.cpp b/src/AggregateFunctions/AggregateFunctionFactory.cpp
index d295fb1e85a..875c505df03 100644
--- a/src/AggregateFunctions/AggregateFunctionFactory.cpp
+++ b/src/AggregateFunctions/AggregateFunctionFactory.cpp
@@ -180,9 +180,21 @@ AggregateFunctionPtr AggregateFunctionFactory::getImpl(
         /// need to filter aggregation result based on another column for
         /// example.
         if (nested_name.ends_with(combinator_name))
-            throw Exception(ErrorCodes::ILLEGAL_AGGREGATION,
-                "Nested identical combinator '{}' is not supported",
-                combinator_name);
+        {
+            /// But the following combinators are allowed regardless nesting:
+            /// - Array
+            /// - OrNull (due to aggregate_functions_null_for_empty)
+            if (combinator_name == "Array" || combinator_name == "OrNull")
+            {
+                /// Is supported.
+            }
+            else
+            {
+                throw Exception(ErrorCodes::ILLEGAL_AGGREGATION,
+                    "Nested identical combinator '{}' is not supported",
+                    combinator_name);
+            }
+        }
 
         DataTypes nested_types = combinator->transformArguments(argument_types);
         Array nested_parameters = combinator->transformParameters(parameters);

From c362e7c54119e0536aabb9aeb90592e109bdbdd0 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 10 Sep 2021 22:40:13 +0300
Subject: [PATCH 174/273] Introduce
 IAggregateFunctionCombinator::supportsNesting()

---
 .../AggregateFunctionArray.cpp                 |  2 ++
 .../AggregateFunctionFactory.cpp               | 18 ++++--------------
 .../AggregateFunctionOrFill.cpp                |  3 +++
 .../IAggregateFunctionCombinator.h             |  4 ++++
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/AggregateFunctions/AggregateFunctionArray.cpp b/src/AggregateFunctions/AggregateFunctionArray.cpp
index 982180ab50c..3591bea5f9e 100644
--- a/src/AggregateFunctions/AggregateFunctionArray.cpp
+++ b/src/AggregateFunctions/AggregateFunctionArray.cpp
@@ -21,6 +21,8 @@ class AggregateFunctionCombinatorArray final : public IAggregateFunctionCombinat
 public:
     String getName() const override { return "Array"; }
 
+    bool supportsNesting() const override { return true; }
+
     DataTypes transformArguments(const DataTypes & arguments) const override
     {
         if (arguments.empty())
diff --git a/src/AggregateFunctions/AggregateFunctionFactory.cpp b/src/AggregateFunctions/AggregateFunctionFactory.cpp
index 875c505df03..c9a44dba6f2 100644
--- a/src/AggregateFunctions/AggregateFunctionFactory.cpp
+++ b/src/AggregateFunctions/AggregateFunctionFactory.cpp
@@ -179,21 +179,11 @@ AggregateFunctionPtr AggregateFunctionFactory::getImpl(
         /// storage stores AggregateFunction(uniqCombinedIf) and in SELECT you
         /// need to filter aggregation result based on another column for
         /// example.
-        if (nested_name.ends_with(combinator_name))
+        if (!combinator->supportsNesting() && nested_name.ends_with(combinator_name))
         {
-            /// But the following combinators are allowed regardless nesting:
-            /// - Array
-            /// - OrNull (due to aggregate_functions_null_for_empty)
-            if (combinator_name == "Array" || combinator_name == "OrNull")
-            {
-                /// Is supported.
-            }
-            else
-            {
-                throw Exception(ErrorCodes::ILLEGAL_AGGREGATION,
-                    "Nested identical combinator '{}' is not supported",
-                    combinator_name);
-            }
+            throw Exception(ErrorCodes::ILLEGAL_AGGREGATION,
+                "Nested identical combinator '{}' is not supported",
+                combinator_name);
         }
 
         DataTypes nested_types = combinator->transformArguments(argument_types);
diff --git a/src/AggregateFunctions/AggregateFunctionOrFill.cpp b/src/AggregateFunctions/AggregateFunctionOrFill.cpp
index 3ba20e65e32..7aee0289879 100644
--- a/src/AggregateFunctions/AggregateFunctionOrFill.cpp
+++ b/src/AggregateFunctions/AggregateFunctionOrFill.cpp
@@ -23,6 +23,9 @@ private:
 public:
     explicit AggregateFunctionCombinatorOrFill(Kind kind_) : kind(kind_) {}
 
+    /// Due to aggregate_functions_null_for_empty
+    bool supportsNesting() const override { return true; }
+
     String getName() const override
     {
         return kind == Kind::OrNull ? "OrNull" : "OrDefault";
diff --git a/src/AggregateFunctions/IAggregateFunctionCombinator.h b/src/AggregateFunctions/IAggregateFunctionCombinator.h
index f9953c83a95..37fcfe42c10 100644
--- a/src/AggregateFunctions/IAggregateFunctionCombinator.h
+++ b/src/AggregateFunctions/IAggregateFunctionCombinator.h
@@ -35,6 +35,10 @@ public:
 
     virtual bool isForInternalUsageOnly() const { return false; }
 
+    /** Does combinator supports nesting (of itself, i.e. ArrayArray or IfIf)
+     */
+    virtual bool supportsNesting() const { return false; }
+
     /** From the arguments for combined function (ex: UInt64, UInt8 for sumIf),
       *  get the arguments for nested function (ex: UInt64 for sum).
       * If arguments are not suitable for combined function, throw an exception.

From 43360387116674e6a7699d479920a72276e6490b Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 10 Sep 2021 23:14:05 +0300
Subject: [PATCH 175/273] tests: update more references after client started
 printing query

---
 .../0_stateless/00336_shard_stack_trace.reference      |  4 ++--
 .../0_stateless/00921_datetime64_compatibility_long.sh |  2 +-
 .../01175_distributed_ddl_output_mode_long.reference   |  5 +++++
 .../0_stateless/01502_log_tinylog_deadlock_race.sh     |  8 ++++----
 .../01502_long_log_tinylog_deadlock_race.sh            | 10 +++++-----
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/tests/queries/0_stateless/00336_shard_stack_trace.reference b/tests/queries/0_stateless/00336_shard_stack_trace.reference
index ca4011b20db..a956634eefc 100644
--- a/tests/queries/0_stateless/00336_shard_stack_trace.reference
+++ b/tests/queries/0_stateless/00336_shard_stack_trace.reference
@@ -2,6 +2,6 @@
 1
 Ok
 1
-2
+3
 Ok
-2
+3
diff --git a/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh b/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh
index 52a29c19be1..df2ac2cece8 100755
--- a/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh
+++ b/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh
@@ -13,4 +13,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 python3 "${CURDIR}"/00921_datetime64_compatibility_long.python \
     | ${CLICKHOUSE_CLIENT} --ignore-error -T -nm --calculate_text_stack_trace 0 --log-level 'error' 2>&1 \
-    | grep -v 'Received exception .*$' | sed 's/^\(Code: [0-9]\+\).*$/\1/g'
+    | grep -v -e 'Received exception .*$' -e '^(query: ' | sed 's/^\(Code: [0-9]\+\).*$/\1/g'
diff --git a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
index 29f6f801044..11c8996c021 100644
--- a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
+++ b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
@@ -1,19 +1,24 @@
 none
 Received exception from server:
 Code: 57. Error: Received from localhost:9000. Error: There was an error on [localhost:9000]: Code: 57. Error: Table default.none already exists. (TABLE_ALREADY_EXISTS)
+(query: create table none on cluster test_shard_localhost (n int) engine=Memory;)
 Received exception from server:
 Code: 159. Error: Received from localhost:9000. Error: Watching task <task> is executing longer than distributed_ddl_task_timeout (=1) seconds. There are 1 unfinished hosts (0 of them are currently active), they are going to execute the query in background. (TIMEOUT_EXCEEDED)
+(query: drop table if exists none on cluster test_unavailable_shard;)
 throw
 localhost	9000	0		0	0
 Received exception from server:
 Code: 57. Error: Received from localhost:9000. Error: There was an error on [localhost:9000]: Code: 57. Error: Table default.throw already exists. (TABLE_ALREADY_EXISTS)
+(query: create table throw on cluster test_shard_localhost (n int) engine=Memory format Null;)
 localhost	9000	0		1	0
 Received exception from server:
 Code: 159. Error: Received from localhost:9000. Error: Watching task <task> is executing longer than distributed_ddl_task_timeout (=1) seconds. There are 1 unfinished hosts (0 of them are currently active), they are going to execute the query in background. (TIMEOUT_EXCEEDED)
+(query: drop table if exists throw on cluster test_unavailable_shard;)
 null_status_on_timeout
 localhost	9000	0		0	0
 Received exception from server:
 Code: 57. Error: Received from localhost:9000. Error: There was an error on [localhost:9000]: Code: 57. Error: Table default.null_status already exists. (TABLE_ALREADY_EXISTS)
+(query: create table null_status on cluster test_shard_localhost (n int) engine=Memory format Null;)
 localhost	9000	0		1	0
 localhost	1	\N	\N	1	0
 never_throw
diff --git a/tests/queries/0_stateless/01502_log_tinylog_deadlock_race.sh b/tests/queries/0_stateless/01502_log_tinylog_deadlock_race.sh
index 667a612ff23..8bcb5f8a7e8 100755
--- a/tests/queries/0_stateless/01502_log_tinylog_deadlock_race.sh
+++ b/tests/queries/0_stateless/01502_log_tinylog_deadlock_race.sh
@@ -25,28 +25,28 @@ function thread_drop {
 
 function thread_rename {
     while true; do
-        $CLICKHOUSE_CLIENT --query "RENAME TABLE $1 TO $2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|57)'
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE $1 TO $2" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|57)'
         sleep 0.0$RANDOM
     done
 }
 
 function thread_select {
     while true; do
-        $CLICKHOUSE_CLIENT --query "SELECT * FROM $1 FORMAT Null" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|218)'
+        $CLICKHOUSE_CLIENT --query "SELECT * FROM $1 FORMAT Null" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
         sleep 0.0$RANDOM
     done
 }
 
 function thread_insert {
     while true; do
-        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT rand64(1), [toString(rand64(2))] FROM numbers($2)" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|218)'
+        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT rand64(1), [toString(rand64(2))] FROM numbers($2)" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: '| grep -v -P 'Code: (60|218)'
         sleep 0.0$RANDOM
     done
 }
 
 function thread_insert_select {
     while true; do
-        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT * FROM $2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|218)'
+        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT * FROM $2" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
         sleep 0.0$RANDOM
     done
 }
diff --git a/tests/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh b/tests/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh
index 9f31fcb6da1..441399a500e 100755
--- a/tests/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh
+++ b/tests/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh
@@ -18,35 +18,35 @@ function thread_create {
 
 function thread_drop {
     while true; do
-        $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS $1" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|57)'
+        $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS $1" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|57)'
         sleep 0.0$RANDOM
     done
 }
 
 function thread_rename {
     while true; do
-        $CLICKHOUSE_CLIENT --query "RENAME TABLE $1 TO $2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|57)'
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE $1 TO $2" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|57)'
         sleep 0.0$RANDOM
     done
 }
 
 function thread_select {
     while true; do
-        $CLICKHOUSE_CLIENT --query "SELECT * FROM $1 FORMAT Null" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|218)'
+        $CLICKHOUSE_CLIENT --query "SELECT * FROM $1 FORMAT Null" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
         sleep 0.0$RANDOM
     done
 }
 
 function thread_insert {
     while true; do
-        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT rand64(1), [toString(rand64(2))] FROM numbers($2)" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|218)'
+        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT rand64(1), [toString(rand64(2))] FROM numbers($2)" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
         sleep 0.0$RANDOM
     done
 }
 
 function thread_insert_select {
     while true; do
-        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT * FROM $2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|218)'
+        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT * FROM $2" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
         sleep 0.0$RANDOM
     done
 }

From 58266e4ed6db77109e6237ecd2612d34c0b19516 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 10 Sep 2021 23:23:24 +0300
Subject: [PATCH 176/273] 
 tests/queries/0_stateless/01175_distributed_ddl_output_mode_long: use unique
 tmp file

---
 .../01175_distributed_ddl_output_mode_long.sh          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
index 483979d00db..319b9928e75 100755
--- a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
+++ b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
@@ -6,6 +6,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+TMP_OUT=$(mktemp "$CURDIR/01175_distributed_ddl_output_mode_long.XXXXXX")
+trap 'rm -f ${TMP_OUT:?}' EXIT
 
 # We execute a distributed DDL query with timeout 1 to check that one host is unavailable and will time out and other complete successfully.
 # But sometimes one second is not enough even for healthy host to succeed. Repeat the test in this case.
@@ -16,11 +18,11 @@ function run_until_out_contains()
 
     for _ in {1..20}
     do
-        "$@" > "${CLICKHOUSE_TMP}/out" 2>&1
-        if grep -q "$PATTERN" "${CLICKHOUSE_TMP}/out"
+        "$@" > "$TMP_OUT" 2>&1
+        if grep -q "$PATTERN" "$TMP_OUT"
         then
-            cat "${CLICKHOUSE_TMP}/out"
-            break;
+            cat "$TMP_OUT"
+            break
         fi
     done
 }

From 56ac03241378ee44271fceae0f7e5f0d99fd0a6e Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 10 Sep 2021 23:27:36 +0300
Subject: [PATCH 177/273] Use the same error for leadInFrame()/lagInFrame() as
 in nth_value()

---
 src/Processors/Transforms/WindowTransform.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/Processors/Transforms/WindowTransform.cpp b/src/Processors/Transforms/WindowTransform.cpp
index d731d4048b1..27bc8ecd9b0 100644
--- a/src/Processors/Transforms/WindowTransform.cpp
+++ b/src/Processors/Transforms/WindowTransform.cpp
@@ -1614,16 +1614,11 @@ struct WindowFunctionLagLeadInFrame final : public WindowFunction
             offset = (*current_block.input_columns[
                     workspace.argument_column_indices[1]])[
                         transform->current_row.row].get<Int64>();
-            if (offset < 0)
+
+            if (offset > INT64_MAX || offset < 0)
             {
                 throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                    "The offset for function {} must be nonnegative, {} given",
-                    getName(), offset);
-            }
-            if (offset > INT64_MAX)
-            {
-                throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                    "The offset for function {} must be less than {}, {} given",
+                    "The offset for function {} must be in (0, {}], {} given",
                     getName(), INT64_MAX, offset);
             }
         }

From a764d46f62bf4c2132f8e879f3d8d62b10ef1eee Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 10 Sep 2021 23:31:41 +0300
Subject: [PATCH 178/273] Eliminate int64_t > INT64_MAX checks (found by PVS)

https://clickhouse-test-reports.s3.yandex.net/28773/b38311538979c0ffe27f6c8c5732b4afc18c4d35/pvs_check.html#fail1
---
 src/Processors/Transforms/WindowTransform.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Processors/Transforms/WindowTransform.cpp b/src/Processors/Transforms/WindowTransform.cpp
index 27bc8ecd9b0..d135cb1c861 100644
--- a/src/Processors/Transforms/WindowTransform.cpp
+++ b/src/Processors/Transforms/WindowTransform.cpp
@@ -1615,7 +1615,8 @@ struct WindowFunctionLagLeadInFrame final : public WindowFunction
                     workspace.argument_column_indices[1]])[
                         transform->current_row.row].get<Int64>();
 
-            if (offset > INT64_MAX || offset < 0)
+            /// Either overflow or really negative value, both is not acceptable.
+            if (offset < 0)
             {
                 throw Exception(ErrorCodes::BAD_ARGUMENTS,
                     "The offset for function {} must be in (0, {}], {} given",
@@ -1693,7 +1694,8 @@ struct WindowFunctionNthValue final : public WindowFunction
                 workspace.argument_column_indices[1]])[
             transform->current_row.row].get<Int64>();
 
-        if (offset > INT64_MAX || offset <= 0)
+        /// Either overflow or really negative value, both is not acceptable.
+        if (offset <= 0)
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "The offset for function {} must be in (0, {}], {} given",

From 017dc9fa2a5654fc3d785b2488b056ed15646449 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 11 Sep 2021 00:48:17 +0300
Subject: [PATCH 179/273] Remove unused ILLEGAL_AGGREGATION from
 AggregateFunctionIf

---
 src/AggregateFunctions/AggregateFunctionIf.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/AggregateFunctions/AggregateFunctionIf.cpp b/src/AggregateFunctions/AggregateFunctionIf.cpp
index 4ed4b5552e0..4ac6a2dce21 100644
--- a/src/AggregateFunctions/AggregateFunctionIf.cpp
+++ b/src/AggregateFunctions/AggregateFunctionIf.cpp
@@ -10,7 +10,6 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-    extern const int ILLEGAL_AGGREGATION;
 }
 
 class AggregateFunctionCombinatorIf final : public IAggregateFunctionCombinator

From c4385a2c406f3924f8b4b680d5c1dedbc63c2c62 Mon Sep 17 00:00:00 2001
From: Mike Kot <to@myrrc.dev>
Date: Mon, 6 Sep 2021 17:59:46 +0200
Subject: [PATCH 180/273] Simplifying exception messages

---
 base/common/CMakeLists.txt                    |  1 +
 base/common/Concepts.h                        | 17 ++++
 base/common/EnumReflection.h                  | 32 ++-----
 base/common/find_symbols.h                    | 56 ++++--------
 contrib/CMakeLists.txt                        |  3 +-
 contrib/magic-enum-cmake/CMakeLists.txt       |  3 +
 docker/test/fasttest/run.sh                   |  1 +
 src/Common/ErrorCodes.cpp                     |  1 -
 src/Common/ExternalLoaderStatus.h             |  6 +-
 src/Common/parseAddress.cpp                   |  2 +-
 src/Core/Field.cpp                            |  6 +-
 src/Core/Field.h                              |  8 +-
 src/Core/Types.h                              | 47 ----------
 src/DataTypes/DataTypeEnum.cpp                |  6 +-
 src/DataTypes/registerDataTypeDateTime.cpp    |  2 +-
 src/Dictionaries/DictionaryStructure.cpp      | 88 +++++--------------
 src/Dictionaries/DictionaryStructure.h        | 80 +++++++----------
 src/Disks/IVolume.cpp                         |  1 -
 src/Functions/FunctionsConsistentHashing.h    |  5 +-
 src/Functions/FunctionsConversion.h           | 10 ++-
 src/Functions/array/mapOp.cpp                 | 10 +--
 src/IO/Operators.h                            | 64 +++-----------
 src/IO/ReadHelpers.h                          | 27 +++---
 src/IO/ReadSettings.cpp                       | 32 -------
 src/IO/ReadSettings.h                         | 69 +++++++--------
 src/IO/WriteHelpers.h                         | 32 +++----
 src/Interpreters/ActionsVisitor.cpp           | 11 ++-
 src/Interpreters/Context.cpp                  |  9 +-
 .../ConvertStringsToEnumVisitor.cpp           |  6 +-
 src/Interpreters/InterpreterExplainQuery.cpp  |  5 +-
 src/Interpreters/convertFieldToType.cpp       |  5 +-
 src/Parsers/ASTSystemQuery.cpp                |  6 --
 src/Parsers/CommonParsers.cpp                 | 24 +----
 src/Parsers/CommonParsers.h                   |  5 +-
 src/Parsers/ParserSystemQuery.cpp             |  7 +-
 src/Parsers/parseQuery.cpp                    |  2 +-
 .../Impl/ConstantExpressionTemplate.cpp       |  5 +-
 src/Storages/StorageNull.cpp                  |  4 +-
 .../01702_system_query_log.reference          |  2 +-
 .../window_functions/tests/common.py          |  2 +-
 40 files changed, 244 insertions(+), 458 deletions(-)
 create mode 100644 base/common/Concepts.h
 create mode 100644 contrib/magic-enum-cmake/CMakeLists.txt
 delete mode 100644 src/IO/ReadSettings.cpp

diff --git a/base/common/CMakeLists.txt b/base/common/CMakeLists.txt
index e5e18669ebe..202a2dff56f 100644
--- a/base/common/CMakeLists.txt
+++ b/base/common/CMakeLists.txt
@@ -85,6 +85,7 @@ target_link_libraries (common
         replxx
         cctz
         fmt
+        magic_enum
 )
 
 if (ENABLE_TESTS)
diff --git a/base/common/Concepts.h b/base/common/Concepts.h
new file mode 100644
index 00000000000..6c6b0a2b455
--- /dev/null
+++ b/base/common/Concepts.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <type_traits>
+#include <concepts>
+
+#include "extended_types.h"
+
+namespace DB
+{
+// Concept for enums can't be named just "enum", so they all start with is_ for consistency
+
+/// C++ integral types as stated in standard + wide integer types [U]Int[128, 256]
+template <class T> concept is_integer = is_integer_v<T>;
+
+template <class T> concept is_floating_point = std::is_floating_point_v<T>;
+template <class T> concept is_enum = std::is_enum_v<T>;
+}
diff --git a/base/common/EnumReflection.h b/base/common/EnumReflection.h
index f98d49ac351..9e1a9f0279b 100644
--- a/base/common/EnumReflection.h
+++ b/base/common/EnumReflection.h
@@ -1,32 +1,16 @@
 #pragma once
 
-#include <type_traits>
+#include <magic_enum.hpp>
 #include <fmt/format.h>
-#include <../../contrib/magic_enum/include/magic_enum.hpp> //FIXME
+#include "Concepts.h"
 
-// Can't name concept is_enum as is would conflict with type trait
-template <class T> concept type_is_enum = std::is_enum_v<T>;
-
-// Enable printing enum values as strings via fmt + magic_enum
-template <type_is_enum T>
-struct fmt::formatter<T> : fmt::formatter<std::string_view> {
-    constexpr auto format(T enum_value, auto& format_context) {
+/// Enable printing enum values as strings via fmt + magic_enum
+template <DB::is_enum T>
+struct fmt::formatter<T> : fmt::formatter<std::string_view>
+{
+    constexpr auto format(T enum_value, auto& format_context)
+    {
         return formatter<string_view>::format(
             magic_enum::enum_name(enum_value), format_context);
     }
 };
-
-namespace DB
-{
-
-/**
- * Some enums have multiple-word values like FLUSH_DICT. However, we should parse user input like FLUSH DICT.
- * magic_enum::enum_names returns names with underscore, so we have to replace underscore with space.
- */
-std::string UnderscoreToSpace(std::string_view str)
-{
-    std::string out(str.data(), str.size());
-    std::replace(out.begin(), out.end(), '_', ' ');
-    return out;
-}
-}
diff --git a/base/common/find_symbols.h b/base/common/find_symbols.h
index a5921b813a1..d8c89a4d91a 100644
--- a/base/common/find_symbols.h
+++ b/base/common/find_symbols.h
@@ -36,18 +36,7 @@
 
 namespace detail
 {
-
-template <char s0>
-inline bool is_in(char x)
-{
-    return x == s0;
-}
-
-template <char s0, char s1, char... tail>
-inline bool is_in(char x)
-{
-    return x == s0 || is_in<s1, tail...>(x);
-}
+template <char ...chars> constexpr bool is_in(char x) { return ((x == chars) || ...); }
 
 #if defined(__SSE2__)
 template <char s0>
@@ -67,16 +56,10 @@ inline __m128i mm_is_in(__m128i bytes)
 #endif
 
 template <bool positive>
-bool maybe_negate(bool x)
-{
-    if constexpr (positive)
-        return x;
-    else
-        return !x;
-}
+constexpr bool maybe_negate(bool x) { return x == positive; }
 
 template <bool positive>
-uint16_t maybe_negate(uint16_t x)
+constexpr uint16_t maybe_negate(uint16_t x)
 {
     if constexpr (positive)
         return x;
@@ -84,11 +67,7 @@ uint16_t maybe_negate(uint16_t x)
         return ~x;
 }
 
-enum class ReturnMode
-{
-    End,
-    Nullptr,
-};
+enum class ReturnMode { End, Nullptr };
 
 
 template <bool positive, ReturnMode return_mode, char... symbols>
@@ -149,12 +128,13 @@ template <bool positive, ReturnMode return_mode, size_t num_chars,
     char c05 = 0, char c06 = 0, char c07 = 0, char c08 = 0,
     char c09 = 0, char c10 = 0, char c11 = 0, char c12 = 0,
     char c13 = 0, char c14 = 0, char c15 = 0, char c16 = 0>
-inline const char * find_first_symbols_sse42_impl(const char * const begin, const char * const end)
+inline const char * find_first_symbols_sse42(const char * const begin, const char * const end)
 {
     const char * pos = begin;
 
 #if defined(__SSE4_2__)
-#define MODE (_SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_LEAST_SIGNIFICANT)
+    constexpr int mode = _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_LEAST_SIGNIFICANT;
+
     __m128i set = _mm_setr_epi8(c01, c02, c03, c04, c05, c06, c07, c08, c09, c10, c11, c12, c13, c14, c15, c16);
 
     for (; pos + 15 < end; pos += 16)
@@ -163,16 +143,15 @@ inline const char * find_first_symbols_sse42_impl(const char * const begin, cons
 
         if constexpr (positive)
         {
-            if (_mm_cmpestrc(set, num_chars, bytes, 16, MODE))
-                return pos + _mm_cmpestri(set, num_chars, bytes, 16, MODE);
+            if (_mm_cmpestrc(set, num_chars, bytes, 16, mode))
+                return pos + _mm_cmpestri(set, num_chars, bytes, 16, mode);
         }
         else
         {
-            if (_mm_cmpestrc(set, num_chars, bytes, 16, MODE | _SIDD_NEGATIVE_POLARITY))
-                return pos + _mm_cmpestri(set, num_chars, bytes, 16, MODE | _SIDD_NEGATIVE_POLARITY);
+            if (_mm_cmpestrc(set, num_chars, bytes, 16, mode | _SIDD_NEGATIVE_POLARITY))
+                return pos + _mm_cmpestri(set, num_chars, bytes, 16, mode | _SIDD_NEGATIVE_POLARITY);
         }
     }
-#undef MODE
 #endif
 
     for (; pos < end; ++pos)
@@ -197,28 +176,23 @@ inline const char * find_first_symbols_sse42_impl(const char * const begin, cons
 }
 
 
-template <bool positive, ReturnMode return_mode, char... symbols>
-inline const char * find_first_symbols_sse42(const char * begin, const char * end)
-{
-    return find_first_symbols_sse42_impl<positive, return_mode, sizeof...(symbols), symbols...>(begin, end);
-}
-
 /// NOTE No SSE 4.2 implementation for find_last_symbols_or_null. Not worth to do.
 
 template <bool positive, ReturnMode return_mode, char... symbols>
 inline const char * find_first_symbols_dispatch(const char * begin, const char * end)
 {
+    static_assert(sizeof...(symbols) <= 16, "Symbols mask max size is 16");
+    static_assert(sizeof...(symbols) > 0, "Symbols mask cannot be empty");
+
 #if defined(__SSE4_2__)
     if (sizeof...(symbols) >= 5)
-        return find_first_symbols_sse42<positive, return_mode, symbols...>(begin, end);
+        return find_first_symbols_sse42<positive, return_mode, sizeof...(symbols), symbols...>(begin, end);
     else
 #endif
         return find_first_symbols_sse2<positive, return_mode, symbols...>(begin, end);
 }
-
 }
 
-
 template <char... symbols>
 inline const char * find_first_symbols(const char * begin, const char * end)
 {
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 65f641d8f43..b7edbcb9238 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -32,9 +32,8 @@ endif()
 
 set_property(DIRECTORY PROPERTY EXCLUDE_FROM_ALL 1)
 
-include_directories("${CMAKE_SOURCE_DIR}/contrib/magic_enum/include")
-
 add_subdirectory (abseil-cpp-cmake)
+add_subdirectory (magic-enum-cmake)
 add_subdirectory (boost-cmake)
 add_subdirectory (cctz-cmake)
 add_subdirectory (consistent-hashing)
diff --git a/contrib/magic-enum-cmake/CMakeLists.txt b/contrib/magic-enum-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..142f9c7c755
--- /dev/null
+++ b/contrib/magic-enum-cmake/CMakeLists.txt
@@ -0,0 +1,3 @@
+set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/magic_enum")
+add_library (magic_enum INTERFACE)
+target_include_directories(magic_enum INTERFACE ${LIBRARY_DIR}/include)
diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index b7c8240abba..806f32a2387 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -159,6 +159,7 @@ function clone_submodules
         cd "$FASTTEST_SOURCE"
 
         SUBMODULES_TO_UPDATE=(
+            contrib/magic_enum
             contrib/abseil-cpp
             contrib/boost
             contrib/zlib-ng
diff --git a/src/Common/ErrorCodes.cpp b/src/Common/ErrorCodes.cpp
index d3068519c22..4c844ad6894 100644
--- a/src/Common/ErrorCodes.cpp
+++ b/src/Common/ErrorCodes.cpp
@@ -494,7 +494,6 @@
     M(523, UNKNOWN_ROW_POLICY) \
     M(524, ALTER_OF_COLUMN_IS_FORBIDDEN) \
     M(525, INCORRECT_DISK_INDEX) \
-    M(526, UNKNOWN_VOLUME_TYPE) \
     M(527, NO_SUITABLE_FUNCTION_IMPLEMENTATION) \
     M(528, CASSANDRA_INTERNAL_ERROR) \
     M(529, NOT_A_LEADER) \
diff --git a/src/Common/ExternalLoaderStatus.h b/src/Common/ExternalLoaderStatus.h
index f129e72c9d6..11f04a318a2 100644
--- a/src/Common/ExternalLoaderStatus.h
+++ b/src/Common/ExternalLoaderStatus.h
@@ -1,8 +1,6 @@
 #pragma once
 
 #include <vector>
-#include <utility>
-#include <ostream>
 #include <common/types.h>
 #include <common/EnumReflection.h>
 
@@ -19,13 +17,13 @@ namespace DB
         NOT_EXIST, /// Object with this name wasn't found in the configuration.
     };
 
-    std::vector<std::pair<String, Int8>> getStatusEnumAllPossibleValues()
+    inline std::vector<std::pair<String, Int8>> getStatusEnumAllPossibleValues()
     {
         std::vector<std::pair<String, Int8>> out;
         out.reserve(magic_enum::enum_count<ExternalLoaderStatus>());
 
         for (const auto & [value, str] : magic_enum::enum_entries<ExternalLoaderStatus>())
-            out.emplace_back(str, value);
+            out.emplace_back(std::string{str}, static_cast<Int8>(value));
 
         return out;
     }
diff --git a/src/Common/parseAddress.cpp b/src/Common/parseAddress.cpp
index c99c08896ab..e02b5d16db7 100644
--- a/src/Common/parseAddress.cpp
+++ b/src/Common/parseAddress.cpp
@@ -43,7 +43,7 @@ std::pair<std::string, UInt16> parseAddress(const std::string & str, UInt16 defa
 
         UInt16 port_number;
         ReadBufferFromMemory port_buf(port, end - port);
-        if (!tryReadText<UInt16>(port_number, port_buf) || !port_buf.eof())
+        if (!tryReadText(port_number, port_buf) || !port_buf.eof())
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Illegal port passed to function parseAddress: {}", port);
diff --git a/src/Core/Field.cpp b/src/Core/Field.cpp
index ae26ddf87c6..a85b7cff46e 100644
--- a/src/Core/Field.cpp
+++ b/src/Core/Field.cpp
@@ -487,11 +487,11 @@ template bool decimalLessOrEqual<DateTime64>(DateTime64 x, DateTime64 y, UInt32
 inline void writeText(const Null & x, WriteBuffer & buf)
 {
     if (x.isNegativeInfinity())
-        writeText(std::string("-Inf"), buf);
+        writeText("-Inf", buf);
     if (x.isPositiveInfinity())
-        writeText(std::string("+Inf"), buf);
+        writeText("+Inf", buf);
     else
-        writeText(std::string("NULL"), buf);
+        writeText("NULL", buf);
 }
 
 String toString(const Field & x)
diff --git a/src/Core/Field.h b/src/Core/Field.h
index f2a05ef87e3..d8f691a8c97 100644
--- a/src/Core/Field.h
+++ b/src/Core/Field.h
@@ -14,6 +14,7 @@
 #include <Core/UUID.h>
 #include <common/DayNum.h>
 #include <common/strong_typedef.h>
+#include <common/EnumReflection.h>
 
 namespace DB
 {
@@ -390,8 +391,7 @@ public:
 
     Types::Which getType() const { return which; }
 
-    //static constexpr std::string_view getTypeName() { return Types::toString(which); }
-    const char * getTypeName() const { return Types::toString(which); }
+    constexpr std::string_view getTypeName() const { return magic_enum::enum_name(which); }
 
     bool isNull() const { return which == Types::Null; }
     template <typename T>
@@ -782,7 +782,7 @@ NearestFieldType<std::decay_t<T>> & Field::get()
     constexpr Field::Types::Which target = TypeToEnum<StoredType>::value;
     if (target != which
            && (!isInt64OrUInt64FieldType(target) || !isInt64OrUInt64FieldType(which)))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, 
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
             "Invalid Field get from type {} to type {}", which, target);
 #endif
 
@@ -798,7 +798,7 @@ auto & Field::safeGet()
     const Types::Which requested = TypeToEnum<NearestFieldType<std::decay_t<T>>>::value;
 
     if (which != requested)
-        throw Exception(ErrorCodes::BAD_GET, 
+        throw Exception(ErrorCodes::BAD_GET,
             "Bad get: has {}, requested {}", getTypeName(), requested);
 
     return get<T>();
diff --git a/src/Core/Types.h b/src/Core/Types.h
index e59173faf96..1347bf609d2 100644
--- a/src/Core/Types.h
+++ b/src/Core/Types.h
@@ -263,53 +263,6 @@ template <> inline constexpr bool OverBigInt<Int256> = true;
 template <> inline constexpr bool OverBigInt<UInt256> = true;
 template <> inline constexpr bool OverBigInt<Decimal128> = true;
 template <> inline constexpr bool OverBigInt<Decimal256> = true;
-
-inline constexpr const char * getTypeName(TypeIndex idx)
-{
-    switch (idx)
-    {
-        case TypeIndex::Nothing:    return "Nothing";
-        case TypeIndex::UInt8:      return "UInt8";
-        case TypeIndex::UInt16:     return "UInt16";
-        case TypeIndex::UInt32:     return "UInt32";
-        case TypeIndex::UInt64:     return "UInt64";
-        case TypeIndex::UInt128:    return "UInt128";
-        case TypeIndex::UInt256:    return "UInt256";
-        case TypeIndex::Int8:       return "Int8";
-        case TypeIndex::Int16:      return "Int16";
-        case TypeIndex::Int32:      return "Int32";
-        case TypeIndex::Int64:      return "Int64";
-        case TypeIndex::Int128:     return "Int128";
-        case TypeIndex::Int256:     return "Int256";
-        case TypeIndex::Float32:    return "Float32";
-        case TypeIndex::Float64:    return "Float64";
-        case TypeIndex::Date:       return "Date";
-        case TypeIndex::Date32:     return "Date32";
-        case TypeIndex::DateTime:   return "DateTime";
-        case TypeIndex::DateTime64: return "DateTime64";
-        case TypeIndex::String:     return "String";
-        case TypeIndex::FixedString: return "FixedString";
-        case TypeIndex::Enum8:      return "Enum8";
-        case TypeIndex::Enum16:     return "Enum16";
-        case TypeIndex::Decimal32:  return "Decimal32";
-        case TypeIndex::Decimal64:  return "Decimal64";
-        case TypeIndex::Decimal128: return "Decimal128";
-        case TypeIndex::Decimal256: return "Decimal256";
-        case TypeIndex::UUID:       return "UUID";
-        case TypeIndex::Array:      return "Array";
-        case TypeIndex::Tuple:      return "Tuple";
-        case TypeIndex::Set:        return "Set";
-        case TypeIndex::Interval:   return "Interval";
-        case TypeIndex::Nullable:   return "Nullable";
-        case TypeIndex::Function:   return "Function";
-        case TypeIndex::AggregateFunction: return "AggregateFunction";
-        case TypeIndex::LowCardinality: return "LowCardinality";
-        case TypeIndex::Map:        return "Map";
-    }
-
-    __builtin_unreachable();
-}
-
 }
 
 /// Specialization of `std::hash` for the Decimal<T> types.
diff --git a/src/DataTypes/DataTypeEnum.cpp b/src/DataTypes/DataTypeEnum.cpp
index 89fc2b0c0fd..c86dd9d0b33 100644
--- a/src/DataTypes/DataTypeEnum.cpp
+++ b/src/DataTypes/DataTypeEnum.cpp
@@ -134,7 +134,8 @@ Field DataTypeEnum<Type>::castToName(const Field & value_or_name) const
         return this->getNameForValue(static_cast<Type>(value)).toString();
     }
     else
-        throw Exception(String("DataTypeEnum: Unsupported type of field ") + value_or_name.getTypeName(), ErrorCodes::BAD_TYPE_OF_FIELD);
+        throw Exception(ErrorCodes::BAD_TYPE_OF_FIELD,
+            "DataTypeEnum: Unsupported type of field {}", value_or_name.getTypeName());
 }
 
 template <typename Type>
@@ -153,7 +154,8 @@ Field DataTypeEnum<Type>::castToValue(const Field & value_or_name) const
         return value;
     }
     else
-        throw Exception(String("DataTypeEnum: Unsupported type of field ") + value_or_name.getTypeName(), ErrorCodes::BAD_TYPE_OF_FIELD);
+        throw Exception(ErrorCodes::BAD_TYPE_OF_FIELD,
+            "DataTypeEnum: Unsupported type of field {}", value_or_name.getTypeName());
 }
 
 
diff --git a/src/DataTypes/registerDataTypeDateTime.cpp b/src/DataTypes/registerDataTypeDateTime.cpp
index 47a6f18cbb3..6d5f6c42799 100644
--- a/src/DataTypes/registerDataTypeDateTime.cpp
+++ b/src/DataTypes/registerDataTypeDateTime.cpp
@@ -47,7 +47,7 @@ getArgument(const ASTPtr & arguments, size_t argument_index, const char * argume
         else
         {
             if (argument && argument->value.getType() != field_type)
-                throw Exception(getExceptionMessage(String(" has wrong type: ") + argument->value.getTypeName(),
+                throw Exception(getExceptionMessage(fmt::format(" has wrong type: {}", argument->value.getTypeName()),
                     argument_index, argument_name, context_data_type_name, field_type), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
             else
                 throw Exception(getExceptionMessage(" is missing", argument_index, argument_name, context_data_type_name, field_type),
diff --git a/src/Dictionaries/DictionaryStructure.cpp b/src/Dictionaries/DictionaryStructure.cpp
index 97c1b98a823..82ab58a8c61 100644
--- a/src/Dictionaries/DictionaryStructure.cpp
+++ b/src/Dictionaries/DictionaryStructure.cpp
@@ -19,84 +19,37 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int UNKNOWN_TYPE;
-    extern const int ARGUMENT_OUT_OF_BOUND;
     extern const int TYPE_MISMATCH;
     extern const int BAD_ARGUMENTS;
 }
 
 namespace
 {
-    DictionaryTypedSpecialAttribute makeDictionaryTypedSpecialAttribute(
-        const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, const std::string & default_type)
-    {
-        const auto name = config.getString(config_prefix + ".name", "");
-        const auto expression = config.getString(config_prefix + ".expression", "");
+DictionaryTypedSpecialAttribute makeDictionaryTypedSpecialAttribute(
+    const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, const std::string & default_type)
+{
+    const auto name = config.getString(config_prefix + ".name", "");
+    const auto expression = config.getString(config_prefix + ".expression", "");
 
-        if (name.empty() && !expression.empty())
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Element {}.name is empty");
-
-        const auto type_name = config.getString(config_prefix + ".type", default_type);
-        return DictionaryTypedSpecialAttribute{std::move(name), std::move(expression), DataTypeFactory::instance().get(type_name)};
-    }
+    if (name.empty() && !expression.empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Element {}.name is empty");
 
+    const auto type_name = config.getString(config_prefix + ".type", default_type);
+    return DictionaryTypedSpecialAttribute{std::move(name), std::move(expression), DataTypeFactory::instance().get(type_name)};
 }
 
-
-AttributeUnderlyingType getAttributeUnderlyingType(const DataTypePtr & type)
+std::optional<AttributeUnderlyingType> maybeGetAttributeUnderlyingType(TypeIndex index)
 {
-    auto type_index = type->getTypeId();
-
-    switch (type_index)
+    switch (index) /// Special cases which do not map TypeIndex::T -> AttributeUnderlyingType::T
     {
-        case TypeIndex::UInt8:          return AttributeUnderlyingType::UInt8;
-        case TypeIndex::UInt16:         return AttributeUnderlyingType::UInt16;
-        case TypeIndex::UInt32:         return AttributeUnderlyingType::UInt32;
-        case TypeIndex::UInt64:         return AttributeUnderlyingType::UInt64;
-        case TypeIndex::UInt128:        return AttributeUnderlyingType::UInt128;
-        case TypeIndex::UInt256:        return AttributeUnderlyingType::UInt256;
-
-        case TypeIndex::Int8:           return AttributeUnderlyingType::Int8;
-        case TypeIndex::Int16:          return AttributeUnderlyingType::Int16;
-        case TypeIndex::Int32:          return AttributeUnderlyingType::Int32;
-        case TypeIndex::Int64:          return AttributeUnderlyingType::Int64;
-        case TypeIndex::Int128:         return AttributeUnderlyingType::Int128;
-        case TypeIndex::Int256:         return AttributeUnderlyingType::Int256;
-
-        case TypeIndex::Float32:        return AttributeUnderlyingType::Float32;
-        case TypeIndex::Float64:        return AttributeUnderlyingType::Float64;
-
-        case TypeIndex::Decimal32:      return AttributeUnderlyingType::Decimal32;
-        case TypeIndex::Decimal64:      return AttributeUnderlyingType::Decimal64;
-        case TypeIndex::Decimal128:     return AttributeUnderlyingType::Decimal128;
-        case TypeIndex::Decimal256:     return AttributeUnderlyingType::Decimal256;
-
-        case TypeIndex::Date:           return AttributeUnderlyingType::UInt16;
-        case TypeIndex::DateTime:       return AttributeUnderlyingType::UInt32;
-        case TypeIndex::DateTime64:     return AttributeUnderlyingType::UInt64;
-
-        case TypeIndex::UUID:           return AttributeUnderlyingType::UUID;
-
-        case TypeIndex::String:         return AttributeUnderlyingType::String;
-
-        case TypeIndex::Array:          return AttributeUnderlyingType::Array;
-
+        case TypeIndex::Date:       return AttributeUnderlyingType::UInt16;
+        case TypeIndex::DateTime:   return AttributeUnderlyingType::UInt32;
+        case TypeIndex::DateTime64: return AttributeUnderlyingType::UInt64;
         default: break;
     }
 
-    throw Exception(ErrorCodes::UNKNOWN_TYPE, "Unknown type {} for dictionary attribute", type->getName());
+    return magic_enum::enum_cast<AttributeUnderlyingType>(static_cast<TypeIndexUnderlying>(index));
 }
-
-
-std::string toString(AttributeUnderlyingType type)
-{
-    switch (type)
-    {
-#define M(TYPE) case AttributeUnderlyingType::TYPE: return #TYPE;
-    FOR_ATTRIBUTE_TYPES(M)
-#undef M
-    }
-
-    throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Unknown dictionary attribute type {}", toString(static_cast<int>(type)));
 }
 
 
@@ -152,7 +105,7 @@ DictionaryStructure::DictionaryStructure(const Poco::Util::AbstractConfiguration
             if (id && attribute.underlying_type != AttributeUnderlyingType::UInt64)
                 throw Exception(ErrorCodes::TYPE_MISMATCH,
                     "Hierarchical attribute type for dictionary with simple key must be UInt64. Actual {}",
-                    toString(attribute.underlying_type));
+                    attribute.underlying_type);
 
             else if (key)
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "Dictionary with complex key does not support hierarchy");
@@ -342,7 +295,12 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
         bool is_nullable = initial_type->isNullable();
 
         auto non_nullable_type = removeNullable(initial_type);
-        const auto underlying_type = getAttributeUnderlyingType(non_nullable_type);
+
+        const auto underlying_type_opt = maybeGetAttributeUnderlyingType(non_nullable_type->getTypeId());
+
+        if (!underlying_type_opt)
+            throw Exception(ErrorCodes::UNKNOWN_TYPE,
+                "Unknown type {} for dictionary attribute", non_nullable_type->getName());
 
         const auto expression = config.getString(prefix + "expression", "");
         if (!expression.empty())
@@ -391,7 +349,7 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
 
         res_attributes.emplace_back(DictionaryAttribute{
             name,
-            underlying_type,
+            *underlying_type_opt,
             initial_type,
             initial_type_serialization,
             expression,
diff --git a/src/Dictionaries/DictionaryStructure.h b/src/Dictionaries/DictionaryStructure.h
index 6ab849d1d89..077ea214d0a 100644
--- a/src/Dictionaries/DictionaryStructure.h
+++ b/src/Dictionaries/DictionaryStructure.h
@@ -11,53 +11,33 @@
 #include <IO/ReadBufferFromString.h>
 #include <DataTypes/IDataType.h>
 #include <Interpreters/IExternalLoadable.h>
+#include <common/EnumReflection.h>
 
 #if defined(__GNUC__)
     /// GCC mistakenly warns about the names in enum class.
     #pragma GCC diagnostic ignored "-Wshadow"
 #endif
 
-
-#define FOR_ATTRIBUTE_TYPES(M) \
-    M(UInt8) \
-    M(UInt16) \
-    M(UInt32) \
-    M(UInt64) \
-    M(UInt128) \
-    M(UInt256) \
-    M(Int8) \
-    M(Int16) \
-    M(Int32) \
-    M(Int64) \
-    M(Int128) \
-    M(Int256) \
-    M(Float32) \
-    M(Float64) \
-    M(Decimal32) \
-    M(Decimal64) \
-    M(Decimal128) \
-    M(Decimal256) \
-    M(UUID) \
-    M(String) \
-    M(Array) \
-
-
 namespace DB
 {
+using TypeIndexUnderlying = magic_enum::underlying_type_t<TypeIndex>;
 
-enum class AttributeUnderlyingType
+/// We need to be able to map TypeIndex -> AttributeUnderlyingType and AttributeUnderlyingType -> real type
+#define map_item(__T) __T = static_cast<TypeIndexUnderlying>(TypeIndex::__T)
+
+enum class AttributeUnderlyingType : TypeIndexUnderlying
 {
-#define M(TYPE) TYPE,
-    FOR_ATTRIBUTE_TYPES(M)
-#undef M
+    map_item(Int8), map_item(Int16), map_item(Int32), map_item(Int64), map_item(Int128), map_item(Int256),
+    map_item(UInt8), map_item(UInt16), map_item(UInt32), map_item(UInt64), map_item(UInt128), map_item(UInt256),
+    map_item(Float32), map_item(Float64),
+    map_item(Decimal32), map_item(Decimal64), map_item(Decimal128), map_item(Decimal256),
+
+    map_item(UUID), map_item(String), map_item(Array)
 };
 
+#undef map_item
 
-AttributeUnderlyingType getAttributeUnderlyingType(const std::string & type);
-
-std::string toString(AttributeUnderlyingType type);
-
-/// Min and max lifetimes for a dictionary or it's entry
+/// Min and max lifetimes for a dictionary or its entry
 using DictionaryLifetime = ExternalLoadableLifetime;
 
 /** Holds the description of a single dictionary attribute:
@@ -85,24 +65,26 @@ struct DictionaryAttribute final
     const bool is_nullable;
 };
 
-template <typename Type>
-struct DictionaryAttributeType
-{
-    using AttributeType = Type;
-};
+struct T { using AttributeType = int; };
 
 template <typename F>
 void callOnDictionaryAttributeType(AttributeUnderlyingType type, F && func)
 {
-    switch (type)
-    {
-#define M(TYPE) \
-        case AttributeUnderlyingType::TYPE: \
-            func(DictionaryAttributeType<TYPE>()); \
-            break;
-    FOR_ATTRIBUTE_TYPES(M)
-#undef M
-    }
+//    for (AttributeUnderlyingType other : magic_enum::enum_values<AttributeUnderlyingType>())
+//        if (type == other)
+//        {
+//
+//        }
+//
+//    switch (type)
+//    {
+//#define M(TYPE) \
+//        case AttributeUnderlyingType::TYPE: \
+//            func(DictionaryAttributeType<AttributeUnderlyingType::TYPE>()); \
+//            break;
+//    FOR_ATTRIBUTE_TYPES(M)
+//#undef M
+//    }
 };
 
 struct DictionarySpecialAttribute final
@@ -157,7 +139,5 @@ private:
 
     /// parse range_min and range_max
     void parseRangeConfiguration(const Poco::Util::AbstractConfiguration & config, const std::string & structure_prefix);
-
 };
-
 }
diff --git a/src/Disks/IVolume.cpp b/src/Disks/IVolume.cpp
index 1b6ee84040b..c135dade128 100644
--- a/src/Disks/IVolume.cpp
+++ b/src/Disks/IVolume.cpp
@@ -12,7 +12,6 @@ namespace ErrorCodes
     extern const int NO_ELEMENTS_IN_CONFIG;
     extern const int INCONSISTENT_RESERVATIONS;
     extern const int NO_RESERVATIONS_PROVIDED;
-    extern const int UNKNOWN_VOLUME_TYPE;
 }
 
 IVolume::IVolume(
diff --git a/src/Functions/FunctionsConsistentHashing.h b/src/Functions/FunctionsConsistentHashing.h
index e946e05e4cc..5e41303d822 100644
--- a/src/Functions/FunctionsConsistentHashing.h
+++ b/src/Functions/FunctionsConsistentHashing.h
@@ -106,8 +106,9 @@ private:
         else if (buckets_field.getType() == Field::Types::UInt64)
             num_buckets = checkBucketsRange(buckets_field.get<UInt64>());
         else
-            throw Exception("Illegal type " + String(buckets_field.getTypeName()) + " of the second argument of function " + getName(),
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of the second argument of function {}",
+                buckets_field.getTypeName(), getName());
 
         const auto & hash_col = arguments[0].column;
         const IDataType * hash_type = arguments[0].type.get();
diff --git a/src/Functions/FunctionsConversion.h b/src/Functions/FunctionsConversion.h
index 75432c7c0d1..ce4dcd1e215 100644
--- a/src/Functions/FunctionsConversion.h
+++ b/src/Functions/FunctionsConversion.h
@@ -2585,8 +2585,9 @@ private:
                 }
                 else
                 {
-                    throw Exception{"Conversion from " + std::string(getTypeName(from_type_index)) + " to " + to_type->getName() + " is not supported",
-                        ErrorCodes::CANNOT_CONVERT_TYPE};
+                    throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE,
+                        "Conversion from {} to {} is not supported",
+                        from_type_index, to_type->getName());
                 }
             }
 
@@ -2695,8 +2696,9 @@ private:
                     return nullable_column_wrapper(arguments, result_type, column_nullable, input_rows_count);
                 }
                 else
-                    throw Exception{"Conversion from " + std::string(getTypeName(type_index)) + " to " + to_type->getName() + " is not supported",
-                        ErrorCodes::CANNOT_CONVERT_TYPE};
+                    throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE,
+                        "Conversion from {} to {} is not supported",
+                        type_index, to_type->getName());
             }
 
             return result_column;
diff --git a/src/Functions/array/mapOp.cpp b/src/Functions/array/mapOp.cpp
index 3bb2cdb9093..1a10d7281e6 100644
--- a/src/Functions/array/mapOp.cpp
+++ b/src/Functions/array/mapOp.cpp
@@ -231,12 +231,10 @@ private:
                             key = col_fixed->getDataAt(offset + j).toString();
                         else if (const auto * col_str = checkAndGetColumn<ColumnString>(arg.key_column.get()))
                             key = col_str->getDataAt(offset + j).toString();
-                        else
-                            // should not happen
-                            throw Exception(
-                                "Expected String or FixedString, got " + std::string(getTypeName(arg.key_column->getDataType()))
-                                    + " in " + getName(),
-                                ErrorCodes::LOGICAL_ERROR);
+                        else // should not happen
+                            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                                "Expected String or FixedString, got {} in {}",
+                                arg.key_column->getDataType(), getName());
                     }
                     else
                     {
diff --git a/src/IO/Operators.h b/src/IO/Operators.h
index a41178a36d9..7e08a71acf1 100644
--- a/src/IO/Operators.h
+++ b/src/IO/Operators.h
@@ -8,12 +8,8 @@
 #include <functional>
 #include <type_traits>
 
-#include <common/EnumReflection.h>
-
-
 namespace DB
 {
-
 /** Implements the ability to write and read data in/from WriteBuffer/ReadBuffer
   *  with the help of << and >> operators and also manipulators,
   *  providing a way of using, similar to iostreams.
@@ -44,62 +40,23 @@ struct QuoteManipReadBuffer          : std::reference_wrapper<ReadBuffer> { usin
 struct DoubleQuoteManipReadBuffer    : std::reference_wrapper<ReadBuffer> { using std::reference_wrapper<ReadBuffer>::reference_wrapper; };
 struct BinaryManipReadBuffer         : std::reference_wrapper<ReadBuffer> { using std::reference_wrapper<ReadBuffer>::reference_wrapper; };
 
-inline WriteBuffer & operator<<(WriteBuffer & buf, const auto & x)
-{
-    writeText(x, buf);
-    return buf;
-}
-
-inline WriteBuffer & operator<<(WriteBuffer & buf, auto x) requires(std::is_enum_v<decltype(x)>)
-{
-    writeString(magic_enum::enum_name(x), buf);   
-    return buf; 
-}
-
-inline WriteBuffer & operator<<(WriteBuffer & buf, std::string_view x)
-{
-    writeString(x, buf);
-    return buf;
-}
-
-inline WriteBuffer & operator<<(WriteBuffer & buf, StringRef x)
-{
-    writeString(x, buf); 
-    return buf;
-}
-
-inline WriteBuffer & operator<<(WriteBuffer & buf, char x)     
-{ 
-    writeChar(x, buf);
-    return buf; 
-}
-
-inline WriteBuffer & operator<<(WriteBuffer & buf, const char * x)
-{
-    writeCString(x, buf); 
-    return buf; 
-}
-
-WriteBuffer & operator<<(WriteBuffer & buf, const pcg32_fast & x)
-{ 
-    PcgSerializer::serializePcg32(x, buf);
-    return buf;
-}
+inline WriteBuffer & operator<<(WriteBuffer & buf, const auto & x) { writeText(x, buf); return buf; }
+inline WriteBuffer & operator<<(WriteBuffer & buf, const pcg32_fast & x) { PcgSerializer::serializePcg32(x, buf); return buf; }
 
 inline EscapeManipWriteBuffer      operator<< (WriteBuffer & buf, EscapeManip)      { return buf; }
 inline QuoteManipWriteBuffer       operator<< (WriteBuffer & buf, QuoteManip)       { return buf; }
 inline DoubleQuoteManipWriteBuffer operator<< (WriteBuffer & buf, DoubleQuoteManip) { return buf; }
 inline BinaryManipWriteBuffer      operator<< (WriteBuffer & buf, BinaryManip)      { return buf; }
 
-template <typename T> WriteBuffer & operator<< (EscapeManipWriteBuffer buf,        const T & x) { writeText(x, buf.get());         return buf; }
-template <typename T> WriteBuffer & operator<< (QuoteManipWriteBuffer buf,         const T & x) { writeQuoted(x, buf.get());       return buf; }
-template <typename T> WriteBuffer & operator<< (DoubleQuoteManipWriteBuffer buf,   const T & x) { writeDoubleQuoted(x, buf.get()); return buf; }
-template <typename T> WriteBuffer & operator<< (BinaryManipWriteBuffer buf,        const T & x) { writeBinary(x, buf.get());       return buf; }
+template <typename T> WriteBuffer & operator<< (EscapeManipWriteBuffer buf,      const T & x) { writeText(x, buf.get());         return buf; }
+template <typename T> WriteBuffer & operator<< (QuoteManipWriteBuffer buf,       const T & x) { writeQuoted(x, buf.get());       return buf; }
+template <typename T> WriteBuffer & operator<< (DoubleQuoteManipWriteBuffer buf, const T & x) { writeDoubleQuoted(x, buf.get()); return buf; }
+template <typename T> WriteBuffer & operator<< (BinaryManipWriteBuffer buf,      const T & x) { writeBinary(x, buf.get());       return buf; }
 
-inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, const String & x)           { writeEscapedString(x, buf); return buf; }
-inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, const std::string_view & x) { writeEscapedString(x, buf); return buf; }
-inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, const StringRef & x)        { writeEscapedString(x, buf); return buf; }
-inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, const char * x)             { writeEscapedString(x, strlen(x), buf); return buf; }
+inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, const String & x)   { writeEscapedString(x, buf); return buf; }
+inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, std::string_view x) { writeEscapedString(x, buf); return buf; }
+inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, StringRef x)        { writeEscapedString(x, buf); return buf; }
+inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, const char * x)     { writeEscapedString(x, strlen(x), buf); return buf; }
 
 inline WriteBuffer & operator<< (QuoteManipWriteBuffer buf,       const char * x) { writeAnyQuotedString<'\''>(x, x + strlen(x), buf.get()); return buf; }
 inline WriteBuffer & operator<< (DoubleQuoteManipWriteBuffer buf, const char * x) { writeAnyQuotedString<'"'>(x, x + strlen(x), buf.get()); return buf; }
@@ -128,5 +85,4 @@ template <typename T> ReadBuffer & operator>> (EscapeManipReadBuffer buf,      T
 template <typename T> ReadBuffer & operator>> (QuoteManipReadBuffer buf,       T & x) { readQuoted(x, buf.get());       return buf; }
 template <typename T> ReadBuffer & operator>> (DoubleQuoteManipReadBuffer buf, T & x) { readDoubleQuoted(x, buf.get()); return buf; }
 template <typename T> ReadBuffer & operator>> (BinaryManipReadBuffer buf,      T & x) { readBinary(x, buf.get());       return buf; }
-
 }
diff --git a/src/IO/ReadHelpers.h b/src/IO/ReadHelpers.h
index f985070788c..45f2440a2ff 100644
--- a/src/IO/ReadHelpers.h
+++ b/src/IO/ReadHelpers.h
@@ -13,6 +13,7 @@
 #include <common/LocalDateTime.h>
 #include <common/StringRef.h>
 #include <common/arithmeticOverflow.h>
+#include <common/Concepts.h>
 
 #include <Core/Types.h>
 #include <Core/DecimalFunctions.h>
@@ -928,25 +929,23 @@ readBinaryBigEndian(T & x, ReadBuffer & buf)    /// Assuming little endian archi
     }
 }
 
-
 /// Generic methods to read value in text tab-separated format.
-template <typename T>
-inline std::enable_if_t<is_integer_v<T>, void>
-readText(T & x, ReadBuffer & buf) { readIntText(x, buf); }
 
-template <typename T>
-inline std::enable_if_t<is_integer_v<T>, bool>
-tryReadText(T & x, ReadBuffer & buf) { return tryReadIntText(x, buf); }
+inline void readText(is_integer auto & x, ReadBuffer & buf)
+{
+    if constexpr (std::same_as<decltype(x), bool &>)
+        readBoolText(x, buf);
+    else
+        readIntText(x, buf);
+}
 
-template <typename T>
-inline std::enable_if_t<std::is_floating_point_v<T>, void>
-readText(T & x, ReadBuffer & buf) { readFloatText(x, buf); }
+inline bool tryReadText(is_integer auto & x, ReadBuffer & buf)
+{
+    return tryReadIntText(x, buf);
+}
 
-template <typename T>
-inline std::enable_if_t<std::is_floating_point_v<T>, bool>
-tryReadText(T & x, ReadBuffer & buf) { return tryReadFloatText(x, buf); }
+inline void readText(is_floating_point auto & x, ReadBuffer & buf) { readFloatText(x, buf); }
 
-inline void readText(bool & x, ReadBuffer & buf) { readBoolText(x, buf); }
 inline void readText(String & x, ReadBuffer & buf) { readEscapedString(x, buf); }
 inline void readText(LocalDate & x, ReadBuffer & buf) { readDateText(x, buf); }
 inline void readText(LocalDateTime & x, ReadBuffer & buf) { readDateTimeText(x, buf); }
diff --git a/src/IO/ReadSettings.cpp b/src/IO/ReadSettings.cpp
deleted file mode 100644
index 52a04f6a465..00000000000
--- a/src/IO/ReadSettings.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <IO/ReadSettings.h>
-#include <Common/Exception.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int UNKNOWN_READ_METHOD;
-}
-
-const char * toString(ReadMethod read_method)
-{
-    switch (read_method)
-    {
-#define CASE_READ_METHOD(NAME) case ReadMethod::NAME: return #NAME;
-    FOR_EACH_READ_METHOD(CASE_READ_METHOD)
-#undef CASE_READ_METHOD
-    }
-    __builtin_unreachable();
-}
-
-ReadMethod parseReadMethod(const std::string & name)
-{
-#define CASE_READ_METHOD(NAME) if (name == #NAME) return ReadMethod::NAME;
-    FOR_EACH_READ_METHOD(CASE_READ_METHOD)
-#undef CASE_READ_METHOD
-    throw Exception(ErrorCodes::UNKNOWN_READ_METHOD, "Unknown read method '{}'", name);
-}
-
-}
diff --git a/src/IO/ReadSettings.h b/src/IO/ReadSettings.h
index 76a8a692f48..81ecd680037 100644
--- a/src/IO/ReadSettings.h
+++ b/src/IO/ReadSettings.h
@@ -4,47 +4,45 @@
 #include <string>
 #include <Core/Defines.h>
 
-
 namespace DB
 {
-
-#define FOR_EACH_READ_METHOD(M) \
-    /** Simple synchronous reads with 'read'. \
-        Can use direct IO after specified size. Can use prefetch by asking OS to perform readahead. */ \
-    M(read) \
-    \
-    /** Simple synchronous reads with 'pread'. \
-        In contrast to 'read', shares single file descriptor from multiple threads. \
-        Can use direct IO after specified size. Can use prefetch by asking OS to perform readahead. */ \
-    M(pread) \
-    \
-    /** Use mmap after specified size or simple synchronous reads with 'pread'. \
-        Can use prefetch by asking OS to perform readahead. */ \
-    M(mmap) \
-    \
-    /** Checks if data is in page cache with 'preadv2' on modern Linux kernels. \
-        If data is in page cache, read from the same thread. \
-        If not, offload IO to separate threadpool. \
-        Can do prefetch with double buffering. \
-        Can use specified priorities and limit the number of concurrent reads. */ \
-    M(pread_threadpool) \
-    \
-    /** It's using asynchronous reader with fake backend that in fact synchronous. \
-        Only used for testing purposes. */ \
-    M(pread_fake_async) \
-
-
 enum class ReadMethod
 {
-#define DEFINE_READ_METHOD(NAME) NAME,
-    FOR_EACH_READ_METHOD(DEFINE_READ_METHOD)
-#undef DEFINE_READ_METHOD
+    /**
+     * Simple synchronous reads with 'read'.
+     * Can use direct IO after specified size.
+     * Can use prefetch by asking OS to perform readahead.
+     */
+    read,
+
+    /**
+     * Simple synchronous reads with 'pread'.
+     * In contrast to 'read', shares single file descriptor from multiple threads.
+     * Can use direct IO after specified size.
+     * Can use prefetch by asking OS to perform readahead.
+     */
+    pread,
+
+    /**
+     * Use mmap after specified size or simple synchronous reads with 'pread'.
+     * Can use prefetch by asking OS to perform readahead.
+     */
+    mmap,
+
+    /**
+     * Checks if data is in page cache with 'preadv2' on modern Linux kernels.
+     * If data is in page cache, read from the same thread.
+     * If not, offload IO to separate threadpool.
+     * Can do prefetch with double buffering.
+     * Can use specified priorities and limit the number of concurrent reads.
+     */
+    pread_threadpool,
+
+    /// Use asynchronous reader with fake backend that in fact synchronous.
+    /// @attention Use only for testing purposes.
+    pread_fake_async
 };
 
-const char * toString(ReadMethod read_method);
-ReadMethod parseReadMethod(const std::string & name);
-
-
 class MMappedFileCache;
 
 struct ReadSettings
@@ -76,5 +74,4 @@ struct ReadSettings
         return res;
     }
 };
-
 }
diff --git a/src/IO/WriteHelpers.h b/src/IO/WriteHelpers.h
index 36c8f2de13d..42b83687644 100644
--- a/src/IO/WriteHelpers.h
+++ b/src/IO/WriteHelpers.h
@@ -5,6 +5,7 @@
 #include <limits>
 #include <algorithm>
 #include <iterator>
+#include <concepts>
 
 #include <pcg-random/pcg_random.hpp>
 
@@ -30,6 +31,8 @@
 #include <IO/DoubleConverter.h>
 #include <IO/WriteBufferFromString.h>
 
+#include <common/EnumReflection.h>
+
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -181,7 +184,8 @@ inline void writeString(const char * data, size_t size, WriteBuffer & buf)
     buf.write(data, size);
 }
 
-inline void writeString(StringRef ref, WriteBuffer & buf)
+// Otherwise StringRef and string_view overloads are ambiguous when passing string literal. Prefer std::string_view
+void writeString(std::same_as<StringRef> auto ref, WriteBuffer & buf)
 {
     writeString(ref.data, ref.size, buf);
 }
@@ -878,24 +882,22 @@ inline void writeBinary(const LocalDateTime & x, WriteBuffer & buf) { writePODBi
 inline void writeBinary(const UUID & x, WriteBuffer & buf) { writePODBinary(x, buf); }
 
 /// Methods for outputting the value in text form for a tab-separated format.
-template <typename T>
-inline std::enable_if_t<is_integer_v<T>, void>
-writeText(const T & x, WriteBuffer & buf) { writeIntText(x, buf); }
 
-template <typename T>
-inline std::enable_if_t<std::is_floating_point_v<T>, void>
-writeText(const T & x, WriteBuffer & buf) { writeFloatText(x, buf); }
+inline void writeText(is_integer auto x, WriteBuffer & buf)
+{
+    if constexpr (std::same_as<decltype(x), bool>)
+        writeBoolText(x, buf);
+    else if constexpr (std::same_as<decltype(x), char>)
+        writeChar(x, buf);
+    else
+        writeIntText(x, buf);
+}
 
-inline void writeText(const String & x, WriteBuffer & buf) { writeString(x.c_str(), x.size(), buf); }
-inline void writeText(const std::string_view & x, WriteBuffer & buf) { writeString(x.data(), x.size(), buf); }
+inline void writeText(is_floating_point auto x, WriteBuffer & buf) { writeFloatText(x, buf); }
 
-/// Implemented as template specialization (not function overload) to avoid preference over templates on arithmetic types above.
-template <> inline void writeText<bool>(const bool & x, WriteBuffer & buf) { writeBoolText(x, buf); }
+inline void writeText(is_enum auto x, WriteBuffer & buf) { writeText(magic_enum::enum_name(x), buf); }
 
-/// unlike the method for std::string
-/// assumes here that `x` is a null-terminated string.
-inline void writeText(const char * x, WriteBuffer & buf) { writeCString(x, buf); }
-inline void writeText(const char * x, size_t size, WriteBuffer & buf) { writeString(x, size, buf); }
+inline void writeText(std::string_view x, WriteBuffer & buf) { writeString(x.data(), x.size(), buf); }
 
 inline void writeText(const DayNum & x, WriteBuffer & buf) { writeDateText(LocalDate(x), buf); }
 inline void writeText(const LocalDate & x, WriteBuffer & buf) { writeDateText(x, buf); }
diff --git a/src/Interpreters/ActionsVisitor.cpp b/src/Interpreters/ActionsVisitor.cpp
index 9a27043160f..90ee30904c7 100644
--- a/src/Interpreters/ActionsVisitor.cpp
+++ b/src/Interpreters/ActionsVisitor.cpp
@@ -185,9 +185,11 @@ static Block createBlockFromAST(const ASTPtr & node, const DataTypes & types, Co
 
                 /// If the function is not a tuple, treat it as a constant expression that returns tuple and extract it.
                 function_result = extractValueFromNode(elem, *tuple_type, context);
+
                 if (function_result.getType() != Field::Types::Tuple)
-                    throw Exception("Invalid type of set. Expected tuple, got " + String(function_result.getTypeName()),
-                                    ErrorCodes::INCORRECT_ELEMENT_OF_SET);
+                    throw Exception(ErrorCodes::INCORRECT_ELEMENT_OF_SET,
+                        "Invalid type of set. Expected tuple, got {}",
+                        function_result.getTypeName());
 
                 tuple = &function_result.get<Tuple>();
             }
@@ -198,8 +200,9 @@ static Block createBlockFromAST(const ASTPtr & node, const DataTypes & types, Co
             {
                 /// The literal must be tuple.
                 if (literal->value.getType() != Field::Types::Tuple)
-                    throw Exception("Invalid type in set. Expected tuple, got "
-                        + String(literal->value.getTypeName()), ErrorCodes::INCORRECT_ELEMENT_OF_SET);
+                    throw Exception(ErrorCodes::INCORRECT_ELEMENT_OF_SET,
+                        "Invalid type in set. Expected tuple, got {}",
+                        literal->value.getTypeName());
 
                 tuple = &literal->value.get<Tuple>();
             }
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index c0d884ac4b3..37575ee75c8 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -74,6 +74,7 @@
 #include <Common/ShellCommand.h>
 #include <Common/TraceCollector.h>
 #include <common/logger_useful.h>
+#include <common/EnumReflection.h>
 #include <Common/RemoteHostFilter.h>
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/JIT/CompiledExpressionCache.h>
@@ -118,6 +119,7 @@ namespace ErrorCodes
     extern const int TABLE_SIZE_EXCEEDS_MAX_DROP_SIZE_LIMIT;
     extern const int LOGICAL_ERROR;
     extern const int NOT_IMPLEMENTED;
+    extern const int UNKNOWN_READ_METHOD;
 }
 
 
@@ -2712,7 +2714,12 @@ ReadSettings Context::getReadSettings() const
 {
     ReadSettings res;
 
-    res.local_fs_method = parseReadMethod(settings.local_filesystem_read_method.value);
+    std::string_view read_method_str = settings.local_filesystem_read_method.value;
+
+    if (auto opt_method = magic_enum::enum_cast<ReadMethod>(read_method_str))
+        res.local_fs_method = *opt_method;
+    else
+        throw Exception(ErrorCodes::UNKNOWN_READ_METHOD, "Unknown read method '{}'", read_method_str);
 
     res.local_fs_prefetch = settings.local_filesystem_read_prefetch;
     res.remote_fs_prefetch = settings.remote_filesystem_read_prefetch;
diff --git a/src/Interpreters/ConvertStringsToEnumVisitor.cpp b/src/Interpreters/ConvertStringsToEnumVisitor.cpp
index e483bc9b5b6..4ca0909cd23 100644
--- a/src/Interpreters/ConvertStringsToEnumVisitor.cpp
+++ b/src/Interpreters/ConvertStringsToEnumVisitor.cpp
@@ -149,8 +149,7 @@ void ConvertStringsToEnumMatcher::visit(ASTFunction & function_node, Data & data
         if (!literal1 || !literal2)
             return;
 
-        if (literal1->value.getTypeName() != std::string_view{"String"}
-            || literal2->value.getTypeName() != std::string_view{"String"})
+        if (literal1->value.getTypeName() != "String" || literal2->value.getTypeName() != "String")
             return;
 
         changeIfArguments(function_node.arguments->children[1],
@@ -166,8 +165,7 @@ void ConvertStringsToEnumMatcher::visit(ASTFunction & function_node, Data & data
         if (!literal_to || !literal_other)
             return;
 
-        if (literal_to->value.getTypeName() != std::string_view{"Array"}
-            || literal_other->value.getTypeName() != std::string_view{"String"})
+        if (literal_to->value.getTypeName() != "Array" || literal_other->value.getTypeName() != "String")
             return;
 
         Array array_to = literal_to->value.get<Array>();
diff --git a/src/Interpreters/InterpreterExplainQuery.cpp b/src/Interpreters/InterpreterExplainQuery.cpp
index 37650f5caa7..fc47f42d266 100644
--- a/src/Interpreters/InterpreterExplainQuery.cpp
+++ b/src/Interpreters/InterpreterExplainQuery.cpp
@@ -223,8 +223,9 @@ ExplainSettings<Settings> checkAndGetSettings(const ASTPtr & ast_settings)
                             "Supported settings: " + settings.getSettingsList(), ErrorCodes::UNKNOWN_SETTING);
 
         if (change.value.getType() != Field::Types::UInt64)
-            throw Exception("Invalid type " + std::string(change.value.getTypeName()) + " for setting \"" + change.name +
-                            "\" only boolean settings are supported", ErrorCodes::INVALID_SETTING_VALUE);
+            throw Exception(ErrorCodes::INVALID_SETTING_VALUE,
+                "Invalid type {} for setting \"{}\" only boolean settings are supported",
+                change.value.getTypeName(), change.name);
 
         auto value = change.value.get<UInt64>();
         if (value > 1)
diff --git a/src/Interpreters/convertFieldToType.cpp b/src/Interpreters/convertFieldToType.cpp
index 501ad51edad..83db4c65bbe 100644
--- a/src/Interpreters/convertFieldToType.cpp
+++ b/src/Interpreters/convertFieldToType.cpp
@@ -346,8 +346,9 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
     else if (const DataTypeAggregateFunction * agg_func_type = typeid_cast<const DataTypeAggregateFunction *>(&type))
     {
         if (src.getType() != Field::Types::AggregateFunctionState)
-            throw Exception(String("Cannot convert ") + src.getTypeName() + " to " + agg_func_type->getName(),
-                    ErrorCodes::TYPE_MISMATCH);
+            throw Exception(ErrorCodes::TYPE_MISMATCH,
+                "Cannot convert {} to {}",
+                src.getTypeName(), agg_func_type->getName());
 
         const auto & name = src.get<AggregateFunctionStateData>().name;
         if (agg_func_type->getName() != name)
diff --git a/src/Parsers/ASTSystemQuery.cpp b/src/Parsers/ASTSystemQuery.cpp
index 219b52ca81f..7575f2718df 100644
--- a/src/Parsers/ASTSystemQuery.cpp
+++ b/src/Parsers/ASTSystemQuery.cpp
@@ -7,12 +7,6 @@
 namespace DB
 {
 
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
 void ASTSystemQuery::formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const
 {
     settings.ostr << (settings.hilite ? hilite_keyword : "") << "SYSTEM ";
diff --git a/src/Parsers/CommonParsers.cpp b/src/Parsers/CommonParsers.cpp
index db6a568a4b6..f1aa8c5fde2 100644
--- a/src/Parsers/CommonParsers.cpp
+++ b/src/Parsers/CommonParsers.cpp
@@ -1,39 +1,24 @@
-#include <Common/StringUtils/StringUtils.h>
 #include <Parsers/CommonParsers.h>
 #include <common/find_symbols.h>
-#include <IO/Operators.h>
-
-#include <string.h>        /// strncmp, strncasecmp
-
 
 namespace DB
 {
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-bool ParserKeyword::parseImpl(Pos & pos, ASTPtr & /*node*/, Expected & expected)
+bool ParserKeyword::parseImpl(Pos & pos, [[maybe_unused]] ASTPtr & node, Expected & expected)
 {
     if (pos->type != TokenType::BareWord)
         return false;
 
     const char * current_word = s.begin();
-    const char * s_end = s.end();
-    const size_t s_length = s.length();
-
-    if (!s_length)
-        throw Exception("Logical error: keyword cannot be empty string", ErrorCodes::LOGICAL_ERROR);
 
     while (true)
     {
         expected.add(pos, current_word);
+
         if (pos->type != TokenType::BareWord)
             return false;
 
-        const char * next_whitespace = find_first_symbols<' ', '\0'>(current_word, s_end);
-        size_t word_length = next_whitespace - current_word;
+        const char * const next_whitespace = find_first_symbols<' ', '\0'>(current_word, s.end());
+        const size_t word_length = next_whitespace - current_word;
 
         if (word_length != pos->size())
             return false;
@@ -51,5 +36,4 @@ bool ParserKeyword::parseImpl(Pos & pos, ASTPtr & /*node*/, Expected & expected)
 
     return true;
 }
-
 }
diff --git a/src/Parsers/CommonParsers.h b/src/Parsers/CommonParsers.h
index b4f5cfd1a81..9ac58f2f2ed 100644
--- a/src/Parsers/CommonParsers.h
+++ b/src/Parsers/CommonParsers.h
@@ -16,10 +16,11 @@ private:
     std::string_view s;
 
 public:
-    constexpr ParserKeyword(std::string_view s_): s(s_) {}
+    //NOLINTNEXTLINE Want to be able to init ParserKeyword("literal")
+    constexpr ParserKeyword(std::string_view s_): s(s_) { assert(!s.empty()); }
 
 protected:
-    const char * getName() const override { return s.data(); }
+    constexpr const char * getName() const override { return s.data(); }
 
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 };
diff --git a/src/Parsers/ParserSystemQuery.cpp b/src/Parsers/ParserSystemQuery.cpp
index f20b69ec047..147436d0d83 100644
--- a/src/Parsers/ParserSystemQuery.cpp
+++ b/src/Parsers/ParserSystemQuery.cpp
@@ -70,9 +70,14 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
 
     bool found = false;
 
+    // If query is executed on single replica, we want to parse input like FLUSH DISTRIBUTED
+    // If query is executed on cluster, we also want to parse serialized input like FLUSH_DISTRIBUTED
     for (const auto & [entry, str] : magic_enum::enum_entries<Type>())
     {
-        if (ParserKeyword(UnderscoreToSpace(str)).ignore(pos, expected))
+        String underscore_to_space(str);
+        std::replace(underscore_to_space.begin(), underscore_to_space.end(), '_', ' ');
+
+        if (ParserKeyword(underscore_to_space).ignore(pos, expected) || ParserKeyword(str).ignore(pos, expected))
         {
             res->type = entry;
             found = true;
diff --git a/src/Parsers/parseQuery.cpp b/src/Parsers/parseQuery.cpp
index aeb57b7f9b6..fd65fc5bd33 100644
--- a/src/Parsers/parseQuery.cpp
+++ b/src/Parsers/parseQuery.cpp
@@ -195,7 +195,7 @@ std::string getLexicalErrorMessage(
     out << getErrorTokenDescription(last_token.type);
     if (last_token.size())
     {
-       out << ": '" << StringRef{last_token.begin, last_token.size()} << "'";
+       out << ": '" << std::string_view{last_token.begin, last_token.size()} << "'";
     }
 
     return out.str();
diff --git a/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp b/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
index c5684b797bf..2120c00b3b5 100644
--- a/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
+++ b/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
@@ -276,8 +276,9 @@ private:
             info.type = std::make_shared<DataTypeMap>(nested_types);
         }
         else
-            throw Exception(String("Unexpected literal type ") + info.literal->value.getTypeName() + ". It's a bug",
-                            ErrorCodes::LOGICAL_ERROR);
+            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                "Unexpected literal type {}",
+                info.literal->value.getTypeName());
 
         /// Allow literal to be NULL, if result column has nullable type or if function never returns NULL
         if (info.force_nullable && info.type->canBeInsideNullable())
diff --git a/src/Storages/StorageNull.cpp b/src/Storages/StorageNull.cpp
index 41422c82aed..3076ec733b7 100644
--- a/src/Storages/StorageNull.cpp
+++ b/src/Storages/StorageNull.cpp
@@ -41,9 +41,9 @@ void StorageNull::checkAlterIsPossible(const AlterCommands & commands, ContextPt
     auto name_deps = getDependentViewsByColumn(context);
     for (const auto & command : commands)
     {
-        if (command.type != AlterCommand::Type::ADD_COLUMN 
+        if (command.type != AlterCommand::Type::ADD_COLUMN
             && command.type != AlterCommand::Type::MODIFY_COLUMN
-            && command.type != AlterCommand::Type::DROP_COLUMN 
+            && command.type != AlterCommand::Type::DROP_COLUMN
             && command.type != AlterCommand::Type::COMMENT_COLUMN)
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
                 command.type, getName());
diff --git a/tests/queries/0_stateless/01702_system_query_log.reference b/tests/queries/0_stateless/01702_system_query_log.reference
index 1f329feac22..c9d75db01c0 100644
--- a/tests/queries/0_stateless/01702_system_query_log.reference
+++ b/tests/queries/0_stateless/01702_system_query_log.reference
@@ -42,7 +42,7 @@ Alter	ALTER TABLE sqllt.table DROP COLUMN the_new_col;
 Alter	ALTER TABLE sqllt.table UPDATE i = i + 1 WHERE 1;
 Alter	ALTER TABLE sqllt.table DELETE WHERE i > 65535;
 Select	-- not done, seems to hard, so I\'ve skipped queries of ALTER-X, where X is:\n-- PARTITION\n-- ORDER BY\n-- SAMPLE BY\n-- INDEX\n-- CONSTRAINT\n-- TTL\n-- USER\n-- QUOTA\n-- ROLE\n-- ROW POLICY\n-- SETTINGS PROFILE\n\nSELECT \'SYSTEM queries\';
-System	SYSTEM FLUSH LOGS;
+System	SYSTEM FLUSH LOGS
 System	SYSTEM STOP MERGES sqllt.table
 System	SYSTEM START MERGES sqllt.table
 System	SYSTEM STOP TTL MERGES sqllt.table
diff --git a/tests/testflows/window_functions/tests/common.py b/tests/testflows/window_functions/tests/common.py
index 3ed4f794ada..4f8b8081bf9 100644
--- a/tests/testflows/window_functions/tests/common.py
+++ b/tests/testflows/window_functions/tests/common.py
@@ -33,7 +33,7 @@ def syntax_error():
     return (62, "Exception: Syntax error")
 
 def groups_frame_error():
-    return (48, "Exception: Window frame 'GROUPS' is not implemented")
+    return (48, "Exception: Window frame 'Groups' is not implemented")
 
 def getuid():
     if current().subtype == TestSubType.Example:

From bce011cb3391af72c0e848696f970a540ecc1edb Mon Sep 17 00:00:00 2001
From: Mike Kot <to@myrrc.dev>
Date: Fri, 10 Sep 2021 13:49:22 +0200
Subject: [PATCH 181/273] Replacing IsDecimalNumber

---
 base/common/Concepts.h                        |  17 --
 base/common/Decimal.h                         | 161 ++++++++++++++
 base/common/EnumReflection.h                  |  39 +++-
 base/common/extended_types.h                  |  23 +-
 base/common/strong_typedef.h                  |  12 +-
 src/AggregateFunctions/AggregateFunctionAvg.h |  16 +-
 .../AggregateFunctionAvgWeighted.h            |   2 +-
 .../AggregateFunctionGroupArrayMoving.cpp     |   4 +-
 .../AggregateFunctionGroupArrayMoving.h       |  12 +-
 .../AggregateFunctionMinMaxAny.h              |   2 +-
 .../AggregateFunctionQuantile.h               |   4 +-
 .../AggregateFunctionStatisticsSimple.h       |  10 +-
 .../AggregateFunctionSum.cpp                  |   5 +-
 src/AggregateFunctions/AggregateFunctionSum.h |  10 +-
 .../AggregateFunctionSumCount.h               |   7 +-
 .../AggregateFunctionSumMap.h                 |   8 +-
 .../QuantileExactWeighted.h                   |   2 +-
 src/AggregateFunctions/ReservoirSampler.h     |   6 +-
 src/Columns/ColumnDecimal.cpp                 |  48 ++--
 src/Columns/ColumnDecimal.h                   |  13 +-
 src/Columns/ColumnVector.h                    |   4 +-
 src/Common/FieldVisitorConvertToNumber.h      |   2 +-
 src/Common/HashTable/Hash.h                   |  10 +-
 src/Common/RadixSort.h                        |   2 +-
 src/Core/AccurateComparison.h                 |  16 +-
 src/Core/DecimalComparison.h                  |  18 +-
 src/Core/DecimalFunctions.h                   |   7 +-
 src/Core/Field.h                              |   6 -
 src/Core/TypeId.h                             |  61 ++++++
 src/Core/TypeName.h                           |  39 ++++
 src/Core/Types.h                              | 206 +-----------------
 src/Core/callOnTypeIndex.h                    |   2 +-
 src/DataTypes/DataTypeDecimalBase.cpp         |   6 +-
 src/DataTypes/DataTypeDecimalBase.h           |   4 +-
 src/DataTypes/DataTypeNumberBase.cpp          |   4 +-
 src/DataTypes/DataTypesDecimal.cpp            |  10 +-
 src/DataTypes/DataTypesDecimal.h              |   3 +-
 src/DataTypes/IDataType.h                     |   4 +-
 src/DataTypes/NumberTraits.h                  |   8 +-
 .../Serializations/SerializationNumber.cpp    |   2 +-
 src/Dictionaries/DictionaryHelpers.h          |   5 +-
 src/Dictionaries/DictionaryStructure.h        |  37 ++--
 src/Functions/DivisionUtils.h                 |   2 +-
 src/Functions/FunctionBinaryArithmetic.h      |  34 +--
 src/Functions/FunctionHelpers.h               |   6 +-
 src/Functions/FunctionMathUnary.h             |   2 +-
 src/Functions/FunctionUnaryArithmetic.h       |   4 +-
 src/Functions/FunctionsConversion.h           |   6 +-
 src/Functions/FunctionsHashing.h              |   6 +-
 src/Functions/FunctionsJSON.h                 |   2 +-
 src/Functions/FunctionsRound.h                |  10 +-
 src/Functions/GatherUtils/Algorithms.h        |  14 +-
 src/Functions/GatherUtils/Sinks.h             |   2 +-
 src/Functions/GatherUtils/Sources.h           |   4 +-
 src/Functions/GatherUtils/createArraySink.cpp |   2 +-
 .../GatherUtils/createArraySource.cpp         |   2 +-
 .../GatherUtils/createValueSource.cpp         |   2 +-
 src/Functions/GregorianDate.h                 |  16 +-
 src/Functions/abs.cpp                         |   8 +-
 src/Functions/array/arrayAggregation.cpp      |  22 +-
 src/Functions/array/arrayCompact.cpp          |   4 +-
 src/Functions/array/arrayCumSum.cpp           |   8 +-
 .../array/arrayCumSumNonNegative.cpp          |   6 +-
 src/Functions/array/arrayDifference.cpp       |   8 +-
 src/Functions/bitWrapperFunc.cpp              |   2 +-
 src/Functions/countDigits.cpp                 |   8 +-
 src/Functions/if.cpp                          |   6 +-
 src/Functions/isDecimalOverflow.cpp           |   3 +-
 src/Functions/negate.cpp                      |   2 +-
 src/Functions/reinterpretAs.cpp               |   2 +-
 src/Functions/sign.cpp                        |   2 +-
 src/IO/ReadHelpers.h                          |  17 +-
 src/IO/WriteHelpers.h                         |   7 +-
 src/Interpreters/RowRefs.cpp                  |   6 +-
 src/Interpreters/RowRefs.h                    |   4 +-
 .../Transforms/AddingDefaultsTransform.cpp    |   2 +-
 76 files changed, 573 insertions(+), 515 deletions(-)
 delete mode 100644 base/common/Concepts.h
 create mode 100644 base/common/Decimal.h
 create mode 100644 src/Core/TypeId.h
 create mode 100644 src/Core/TypeName.h

diff --git a/base/common/Concepts.h b/base/common/Concepts.h
deleted file mode 100644
index 6c6b0a2b455..00000000000
--- a/base/common/Concepts.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include <type_traits>
-#include <concepts>
-
-#include "extended_types.h"
-
-namespace DB
-{
-// Concept for enums can't be named just "enum", so they all start with is_ for consistency
-
-/// C++ integral types as stated in standard + wide integer types [U]Int[128, 256]
-template <class T> concept is_integer = is_integer_v<T>;
-
-template <class T> concept is_floating_point = std::is_floating_point_v<T>;
-template <class T> concept is_enum = std::is_enum_v<T>;
-}
diff --git a/base/common/Decimal.h b/base/common/Decimal.h
new file mode 100644
index 00000000000..7e21688683b
--- /dev/null
+++ b/base/common/Decimal.h
@@ -0,0 +1,161 @@
+#pragma once
+
+#include <concepts>
+#include "common/extended_types.h"
+#include "common/types.h"
+
+#if !defined(NO_SANITIZE_UNDEFINED)
+#if defined(__clang__)
+    #define NO_SANITIZE_UNDEFINED __attribute__((__no_sanitize__("undefined")))
+#else
+    #define NO_SANITIZE_UNDEFINED
+#endif
+#endif
+
+
+namespace DB
+{
+template <class> struct Decimal;
+class DateTime64;
+
+using Decimal32 = Decimal<Int32>;
+using Decimal64 = Decimal<Int64>;
+using Decimal128 = Decimal<Int128>;
+using Decimal256 = Decimal<Int256>;
+
+template <class T>
+concept is_decimal =
+    std::same_as<T, Decimal32>
+    || std::same_as<T, Decimal64>
+    || std::same_as<T, Decimal128>
+    || std::same_as<T, Decimal256>
+    || std::same_as<T, DateTime64>;
+
+template <class T>
+concept is_over_big_int =
+    std::same_as<T, Int128>
+    || std::same_as<T, UInt128>
+    || std::same_as<T, Int256>
+    || std::same_as<T, UInt256>
+    || std::same_as<T, Decimal128>
+    || std::same_as<T, Decimal256>;
+
+template <class T> struct NativeTypeT { using Type = T; };
+template <is_decimal T> struct NativeTypeT<T> { using Type = typename T::NativeType; };
+template <class T> using NativeType = typename NativeTypeT<T>::Type;
+
+/// Own FieldType for Decimal.
+/// It is only a "storage" for decimal.
+/// To perform operations, you also have to provide a scale (number of digits after point).
+template <typename T>
+struct Decimal
+{
+    using NativeType = T;
+
+    constexpr Decimal() = default;
+    constexpr Decimal(Decimal<T> &&) = default;
+    constexpr Decimal(const Decimal<T> &) = default;
+
+    constexpr Decimal(const T & value_): value(value_) {}
+
+    template <typename U>
+    constexpr Decimal(const Decimal<U> & x): value(x.value) {}
+
+    constexpr Decimal<T> & operator = (Decimal<T> &&) = default;
+    constexpr Decimal<T> & operator = (const Decimal<T> &) = default;
+
+    constexpr operator T () const { return value; }
+
+    template <typename U>
+    constexpr U convertTo() const
+    {
+        if constexpr(is_decimal<U>)
+            return convertTo<typename U::NativeType>();
+        else
+            return static_cast<U>(value);
+    }
+
+    const Decimal<T> & operator += (const T & x) { value += x; return *this; }
+    const Decimal<T> & operator -= (const T & x) { value -= x; return *this; }
+    const Decimal<T> & operator *= (const T & x) { value *= x; return *this; }
+    const Decimal<T> & operator /= (const T & x) { value /= x; return *this; }
+    const Decimal<T> & operator %= (const T & x) { value %= x; return *this; }
+
+    template <typename U> const Decimal<T> & operator += (const Decimal<U> & x) { value += x.value; return *this; }
+    template <typename U> const Decimal<T> & operator -= (const Decimal<U> & x) { value -= x.value; return *this; }
+    template <typename U> const Decimal<T> & operator *= (const Decimal<U> & x) { value *= x.value; return *this; }
+    template <typename U> const Decimal<T> & operator /= (const Decimal<U> & x) { value /= x.value; return *this; }
+    template <typename U> const Decimal<T> & operator %= (const Decimal<U> & x) { value %= x.value; return *this; }
+
+    /// This is to avoid UB for sumWithOverflow()
+    void NO_SANITIZE_UNDEFINED addOverflow(const T & x) { value += x; }
+
+    T value;
+};
+
+template <typename T> inline bool operator< (const Decimal<T> & x, const Decimal<T> & y) { return x.value < y.value; }
+template <typename T> inline bool operator> (const Decimal<T> & x, const Decimal<T> & y) { return x.value > y.value; }
+template <typename T> inline bool operator<= (const Decimal<T> & x, const Decimal<T> & y) { return x.value <= y.value; }
+template <typename T> inline bool operator>= (const Decimal<T> & x, const Decimal<T> & y) { return x.value >= y.value; }
+template <typename T> inline bool operator== (const Decimal<T> & x, const Decimal<T> & y) { return x.value == y.value; }
+template <typename T> inline bool operator!= (const Decimal<T> & x, const Decimal<T> & y) { return x.value != y.value; }
+
+template <typename T> inline Decimal<T> operator+ (const Decimal<T> & x, const Decimal<T> & y) { return x.value + y.value; }
+template <typename T> inline Decimal<T> operator- (const Decimal<T> & x, const Decimal<T> & y) { return x.value - y.value; }
+template <typename T> inline Decimal<T> operator* (const Decimal<T> & x, const Decimal<T> & y) { return x.value * y.value; }
+template <typename T> inline Decimal<T> operator/ (const Decimal<T> & x, const Decimal<T> & y) { return x.value / y.value; }
+template <typename T> inline Decimal<T> operator- (const Decimal<T> & x) { return -x.value; }
+
+// Distinguishable type to allow function resolution/deduction based on value type,
+// but also relatively easy to convert to/from Decimal64.
+class DateTime64 : public Decimal64
+{
+public:
+    using Base = Decimal64;
+    using Base::Base;
+    using NativeType = Base::NativeType;
+
+    constexpr DateTime64(const Base & v): Base(v) {}
+};
+}
+
+constexpr DB::UInt64 max_uint_mask = std::numeric_limits<DB::UInt64>::max();
+
+namespace std
+{
+    template <typename T>
+    struct hash<DB::Decimal<T>>
+    {
+        size_t operator()(const DB::Decimal<T> & x) const { return hash<T>()(x.value); }
+    };
+
+    template <>
+    struct hash<DB::Decimal128>
+    {
+        size_t operator()(const DB::Decimal128 & x) const
+        {
+            return std::hash<DB::Int64>()(x.value >> 64)
+                ^ std::hash<DB::Int64>()(x.value & max_uint_mask);
+        }
+    };
+
+    template <>
+    struct hash<DB::DateTime64>
+    {
+        size_t operator()(const DB::DateTime64 & x) const
+        {
+            return std::hash<DB::DateTime64::NativeType>()(x);
+        }
+    };
+
+    template <>
+    struct hash<DB::Decimal256>
+    {
+        size_t operator()(const DB::Decimal256 & x) const
+        {
+            // FIXME temp solution
+            return std::hash<DB::Int64>()(static_cast<DB::Int64>(x.value >> 64 & max_uint_mask))
+                ^ std::hash<DB::Int64>()(static_cast<DB::Int64>(x.value & max_uint_mask));
+        }
+    };
+}
diff --git a/base/common/EnumReflection.h b/base/common/EnumReflection.h
index 9e1a9f0279b..e491f96267d 100644
--- a/base/common/EnumReflection.h
+++ b/base/common/EnumReflection.h
@@ -1,8 +1,45 @@
 #pragma once
 
+#include <type_traits>
 #include <magic_enum.hpp>
 #include <fmt/format.h>
-#include "Concepts.h"
+
+namespace DB { template <class T> concept is_enum = std::is_enum_v<T>; }
+
+//template <DB::is_enum E, class F, size_t I1, size_t ...I>
+//constexpr void static_for(F && f, std::index_sequence<I...>)
+//{
+//    constexpr auto constant = std::integral_constant<E, magic_enum::enum_value<E>(I1)>();
+//
+//    if (!std::forward<F>(f)(constant))
+//        return;
+//
+//    if constexpr (sizeof...(I) > 0)
+//        static_for<E>(std::forward<F>(f), std::index_sequence<I...>());
+//}
+//}
+
+namespace detail
+{
+template <DB::is_enum E, class F, size_t ...I>
+constexpr void static_for(F && f, std::index_sequence<I...>)
+{
+    (std::forward<F>(f)(std::integral_constant<E, magic_enum::enum_value<E>(I)>()) , ...);
+}
+}
+
+/**
+ * Iterate over enum values in compile-time (compile-time switch/case, loop unrolling).
+ *
+ * @example static_for<E>([](auto enum_value) { return template_func<enum_value>(); }
+ * ^ enum_value can be used as a template parameter
+ */
+template <DB::is_enum E, class F>
+constexpr void static_for(F && f)
+{
+    constexpr size_t count = magic_enum::enum_count<E>();
+    detail::static_for<E>(std::forward<F>(f), std::make_index_sequence<count>());
+}
 
 /// Enable printing enum values as strings via fmt + magic_enum
 template <DB::is_enum T>
diff --git a/base/common/extended_types.h b/base/common/extended_types.h
index 79209568ef5..0b3e9654406 100644
--- a/base/common/extended_types.h
+++ b/base/common/extended_types.h
@@ -41,22 +41,17 @@ template <> struct is_unsigned<UInt256> { static constexpr bool value = true; };
 template <typename T>
 inline constexpr bool is_unsigned_v = is_unsigned<T>::value;
 
-
-/// TODO: is_integral includes char, char8_t and wchar_t.
-template <typename T>
-struct is_integer
+namespace DB
 {
-    static constexpr bool value = std::is_integral_v<T>;
-};
-
-template <> struct is_integer<Int128> { static constexpr bool value = true; };
-template <> struct is_integer<UInt128> { static constexpr bool value = true; };
-template <> struct is_integer<Int256> { static constexpr bool value = true; };
-template <> struct is_integer<UInt256> { static constexpr bool value = true; };
-
-template <typename T>
-inline constexpr bool is_integer_v = is_integer<T>::value;
+template <class T> concept is_integer =
+    std::is_integral_v<T>
+    || std::is_same_v<T, Int128>
+    || std::is_same_v<T, UInt128>
+    || std::is_same_v<T, Int256>
+    || std::is_same_v<T, UInt256>;
 
+template <class T> concept is_floating_point = std::is_floating_point_v<T>;
+}
 
 template <typename T>
 struct is_arithmetic
diff --git a/base/common/strong_typedef.h b/base/common/strong_typedef.h
index a1e2b253aa7..294bfff76f1 100644
--- a/base/common/strong_typedef.h
+++ b/base/common/strong_typedef.h
@@ -14,16 +14,18 @@ private:
 
 public:
     using UnderlyingType = T;
+
     template <class Enable = typename std::is_copy_constructible<T>::type>
-    explicit StrongTypedef(const T & t_) : t(t_) {}
+    constexpr explicit StrongTypedef(const T & t_) : t(t_) {}
+
     template <class Enable = typename std::is_move_constructible<T>::type>
-    explicit StrongTypedef(T && t_) : t(std::move(t_)) {}
+    constexpr explicit StrongTypedef(T && t_) : t(std::move(t_)) {}
 
     template <class Enable = typename std::is_default_constructible<T>::type>
-    StrongTypedef(): t() {}
+    constexpr StrongTypedef(): t() {}
 
-    StrongTypedef(const Self &) = default;
-    StrongTypedef(Self &&) = default;
+    constexpr StrongTypedef(const Self &) = default;
+    constexpr StrongTypedef(Self &&) = default;
 
     Self & operator=(const Self &) = default;
     Self & operator=(Self &&) = default;
diff --git a/src/AggregateFunctions/AggregateFunctionAvg.h b/src/AggregateFunctions/AggregateFunctionAvg.h
index ad5c67d88d4..fd8f9faa3f8 100644
--- a/src/AggregateFunctions/AggregateFunctionAvg.h
+++ b/src/AggregateFunctions/AggregateFunctionAvg.h
@@ -21,11 +21,9 @@
 namespace DB
 {
 struct Settings;
-template <typename T>
-using DecimalOrVectorCol = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
 
 template <typename T> constexpr bool DecimalOrExtendedInt =
-    IsDecimalNumber<T>
+    is_decimal<T>
     || std::is_same_v<T, Int128>
     || std::is_same_v<T, Int256>
     || std::is_same_v<T, UInt128>
@@ -44,7 +42,7 @@ struct AvgFraction
     /// Invoked only is either Numerator or Denominator are Decimal.
     Float64 NO_SANITIZE_UNDEFINED divideIfAnyDecimal(UInt32 num_scale, UInt32 denom_scale [[maybe_unused]]) const
     {
-        if constexpr (IsDecimalNumber<Numerator> && IsDecimalNumber<Denominator>)
+        if constexpr (is_decimal<Numerator> && is_decimal<Denominator>)
         {
             // According to the docs, num(S1) / denom(S2) would have scale S1
 
@@ -60,7 +58,7 @@ struct AvgFraction
         /// Numerator is always casted to Float64 to divide correctly if the denominator is not Float64.
         Float64 num_converted;
 
-        if constexpr (IsDecimalNumber<Numerator>)
+        if constexpr (is_decimal<Numerator>)
             num_converted = DecimalUtils::convertTo<Float64>(numerator, num_scale);
         else
             num_converted = static_cast<Float64>(numerator); /// all other types, including extended integral.
@@ -68,7 +66,7 @@ struct AvgFraction
         std::conditional_t<DecimalOrExtendedInt<Denominator>,
             Float64, Denominator> denom_converted;
 
-        if constexpr (IsDecimalNumber<Denominator>)
+        if constexpr (is_decimal<Denominator>)
             denom_converted = DecimalUtils::convertTo<Float64>(denominator, denom_scale);
         else if constexpr (DecimalOrExtendedInt<Denominator>)
             /// no way to divide Float64 and extended integral type without an explicit cast.
@@ -139,7 +137,7 @@ public:
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
     {
-        if constexpr (IsDecimalNumber<Numerator> || IsDecimalNumber<Denominator>)
+        if constexpr (is_decimal<Numerator> || is_decimal<Denominator>)
             assert_cast<ColumnVector<Float64> &>(to).getData().push_back(
                 this->data(place).divideIfAnyDecimal(num_scale, denom_scale));
         else
@@ -222,7 +220,7 @@ private:
 };
 
 template <typename T>
-using AvgFieldType = std::conditional_t<IsDecimalNumber<T>,
+using AvgFieldType = std::conditional_t<is_decimal<T>,
     std::conditional_t<std::is_same_v<T, Decimal256>, Decimal256, Decimal128>,
     NearestFieldType<T>>;
 
@@ -239,7 +237,7 @@ public:
 
     void NO_SANITIZE_UNDEFINED add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const final
     {
-        this->data(place).numerator += static_cast<const DecimalOrVectorCol<T> &>(*columns[0]).getData()[row_num];
+        this->data(place).numerator += static_cast<const ColumnVectorOrDecimal<T> &>(*columns[0]).getData()[row_num];
         ++this->data(place).denominator;
     }
 
diff --git a/src/AggregateFunctions/AggregateFunctionAvgWeighted.h b/src/AggregateFunctions/AggregateFunctionAvgWeighted.h
index 68d48803718..5641851f17b 100644
--- a/src/AggregateFunctions/AggregateFunctionAvgWeighted.h
+++ b/src/AggregateFunctions/AggregateFunctionAvgWeighted.h
@@ -8,7 +8,7 @@ namespace DB
 struct Settings;
 
 template <typename T>
-using AvgWeightedFieldType = std::conditional_t<IsDecimalNumber<T>,
+using AvgWeightedFieldType = std::conditional_t<is_decimal<T>,
     std::conditional_t<std::is_same_v<T, Decimal256>, Decimal256, Decimal128>,
     std::conditional_t<DecimalOrExtendedInt<T>,
         Float64, // no way to do UInt128 * UInt128, better cast to Float64
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp
index e4eff6be901..3e0f1849545 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp
+++ b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp
@@ -25,14 +25,14 @@ namespace
 template <typename T, typename LimitNumberOfElements>
 struct MovingSum
 {
-    using Data = MovingSumData<std::conditional_t<IsDecimalNumber<T>, Decimal128, NearestFieldType<T>>>;
+    using Data = MovingSumData<std::conditional_t<is_decimal<T>, Decimal128, NearestFieldType<T>>>;
     using Function = MovingImpl<T, LimitNumberOfElements, Data>;
 };
 
 template <typename T, typename LimitNumberOfElements>
 struct MovingAvg
 {
-    using Data = MovingAvgData<std::conditional_t<IsDecimalNumber<T>, Decimal128, Float64>>;
+    using Data = MovingAvgData<std::conditional_t<is_decimal<T>, Decimal128, Float64>>;
     using Function = MovingImpl<T, LimitNumberOfElements, Data>;
 };
 
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h
index daaa7a69baf..0c91ebae887 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h
@@ -87,16 +87,12 @@ class MovingImpl final
 public:
     using ResultT = typename Data::Accumulator;
 
-    using ColumnSource = std::conditional_t<IsDecimalNumber<T>,
-        ColumnDecimal<T>,
-        ColumnVector<T>>;
+    using ColumnSource = ColumnVectorOrDecimal<T>;
 
     /// Probably for overflow function in the future.
-    using ColumnResult = std::conditional_t<IsDecimalNumber<ResultT>,
-        ColumnDecimal<ResultT>,
-        ColumnVector<ResultT>>;
+    using ColumnResult = ColumnVectorOrDecimal<ResultT>;
 
-    using DataTypeResult = std::conditional_t<IsDecimalNumber<ResultT>,
+    using DataTypeResult = std::conditional_t<is_decimal<ResultT>,
         DataTypeDecimal<ResultT>,
         DataTypeNumber<ResultT>>;
 
@@ -108,7 +104,7 @@ public:
 
     DataTypePtr getReturnType() const override
     {
-        if constexpr (IsDecimalNumber<ResultT>)
+        if constexpr (is_decimal<ResultT>)
             return std::make_shared<DataTypeArray>(std::make_shared<DataTypeResult>(
                 DataTypeResult::maxPrecision(), getDecimalScale(*this->argument_types.at(0))));
         else
diff --git a/src/AggregateFunctions/AggregateFunctionMinMaxAny.h b/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
index e5471b8a727..8fa4b235c2c 100644
--- a/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
+++ b/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
@@ -44,7 +44,7 @@ struct SingleValueDataFixed
 {
 private:
     using Self = SingleValueDataFixed;
-    using ColVecType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+    using ColVecType = ColumnVectorOrDecimal<T>;
 
     bool has_value = false; /// We need to remember if at least one value has been passed. This is necessary for AggregateFunctionIf.
     T value;
diff --git a/src/AggregateFunctions/AggregateFunctionQuantile.h b/src/AggregateFunctions/AggregateFunctionQuantile.h
index 65d1df9fe77..5ca52f6d73a 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantile.h
+++ b/src/AggregateFunctions/AggregateFunctionQuantile.h
@@ -67,10 +67,10 @@ class AggregateFunctionQuantile final : public IAggregateFunctionDataHelper<Data
     AggregateFunctionQuantile<Value, Data, Name, has_second_arg, FloatReturnType, returns_many>>
 {
 private:
-    using ColVecType = std::conditional_t<IsDecimalNumber<Value>, ColumnDecimal<Value>, ColumnVector<Value>>;
+    using ColVecType = ColumnVectorOrDecimal<Value>;
 
     static constexpr bool returns_float = !(std::is_same_v<FloatReturnType, void>);
-    static_assert(!IsDecimalNumber<Value> || !returns_float);
+    static_assert(!is_decimal<Value> || !returns_float);
 
     QuantileLevels<Float64> levels;
 
diff --git a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h b/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
index e57781fac33..1fd1c1e170b 100644
--- a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
+++ b/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
@@ -49,7 +49,7 @@ struct StatFuncOneArg
     using Type1 = T;
     using Type2 = T;
     using ResultType = std::conditional_t<std::is_same_v<T, Float32>, Float32, Float64>;
-    using Data = std::conditional_t<IsDecimalNumber<T>, VarMomentsDecimal<Decimal128, _level>, VarMoments<ResultType, _level>>;
+    using Data = std::conditional_t<is_decimal<T>, VarMomentsDecimal<Decimal128, _level>, VarMoments<ResultType, _level>>;
 
     static constexpr StatisticsFunctionKind kind = _kind;
     static constexpr UInt32 num_args = 1;
@@ -75,8 +75,8 @@ class AggregateFunctionVarianceSimple final
 public:
     using T1 = typename StatFunc::Type1;
     using T2 = typename StatFunc::Type2;
-    using ColVecT1 = std::conditional_t<IsDecimalNumber<T1>, ColumnDecimal<T1>, ColumnVector<T1>>;
-    using ColVecT2 = std::conditional_t<IsDecimalNumber<T2>, ColumnDecimal<T2>, ColumnVector<T2>>;
+    using ColVecT1 = ColumnVectorOrDecimal<T1>;
+    using ColVecT2 = ColumnVectorOrDecimal<T2>;
     using ResultType = typename StatFunc::ResultType;
     using ColVecResult = ColumnVector<ResultType>;
 
@@ -132,7 +132,7 @@ public:
                 static_cast<ResultType>(static_cast<const ColVecT2 &>(*columns[1]).getData()[row_num]));
         else
         {
-            if constexpr (IsDecimalNumber<T1>)
+            if constexpr (is_decimal<T1>)
             {
                 this->data(place).add(static_cast<ResultType>(
                     static_cast<const ColVecT1 &>(*columns[0]).getData()[row_num].value));
@@ -163,7 +163,7 @@ public:
         const auto & data = this->data(place);
         auto & dst = static_cast<ColVecResult &>(to).getData();
 
-        if constexpr (IsDecimalNumber<T1>)
+        if constexpr (is_decimal<T1>)
         {
             if constexpr (StatFunc::kind == StatisticsFunctionKind::varPop)
                 dst.push_back(data.getPopulation(src_scale * 2));
diff --git a/src/AggregateFunctions/AggregateFunctionSum.cpp b/src/AggregateFunctions/AggregateFunctionSum.cpp
index ad4297438bd..6ebd006890b 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.cpp
+++ b/src/AggregateFunctions/AggregateFunctionSum.cpp
@@ -20,10 +20,9 @@ template <typename T>
 struct SumSimple
 {
     /// @note It uses slow Decimal128 (cause we need such a variant). sumWithOverflow is faster for Decimal32/64
-    using ResultType = std::conditional_t<IsDecimalNumber<T>,
+    using ResultType = std::conditional_t<is_decimal<T>,
                                         std::conditional_t<std::is_same_v<T, Decimal256>, Decimal256, Decimal128>,
                                         NearestFieldType<T>>;
-    // using ResultType = std::conditional_t<IsDecimalNumber<T>, Decimal128, NearestFieldType<T>>;
     using AggregateDataType = AggregateFunctionSumData<ResultType>;
     using Function = AggregateFunctionSum<T, ResultType, AggregateDataType, AggregateFunctionTypeSum>;
 };
@@ -47,7 +46,7 @@ struct SumKahan
 template <typename T> using AggregateFunctionSumSimple = typename SumSimple<T>::Function;
 template <typename T> using AggregateFunctionSumWithOverflow = typename SumSameType<T>::Function;
 template <typename T> using AggregateFunctionSumKahan =
-    std::conditional_t<IsDecimalNumber<T>, typename SumSimple<T>::Function, typename SumKahan<T>::Function>;
+    std::conditional_t<is_decimal<T>, typename SumSimple<T>::Function, typename SumKahan<T>::Function>;
 
 
 template <template <typename> class Function>
diff --git a/src/AggregateFunctions/AggregateFunctionSum.h b/src/AggregateFunctions/AggregateFunctionSum.h
index 24c1e514a71..2e1357c895d 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.h
+++ b/src/AggregateFunctions/AggregateFunctionSum.h
@@ -105,7 +105,7 @@ struct AggregateFunctionSumData
 
         if constexpr (
             (is_integer_v<T> && !is_big_int_v<T>)
-            || (IsDecimalNumber<T> && !std::is_same_v<T, Decimal256> && !std::is_same_v<T, Decimal128>))
+            || (is_decimal<T> && !std::is_same_v<T, Decimal256> && !std::is_same_v<T, Decimal128>))
         {
             /// For integers we can vectorize the operation if we replace the null check using a multiplication (by 0 for null, 1 for not null)
             /// https://quick-bench.com/q/MLTnfTvwC2qZFVeWHfOBR3U7a8I
@@ -334,9 +334,9 @@ class AggregateFunctionSum final : public IAggregateFunctionDataHelper<Data, Agg
 public:
     static constexpr bool DateTime64Supported = false;
 
-    using ResultDataType = std::conditional_t<IsDecimalNumber<T>, DataTypeDecimal<TResult>, DataTypeNumber<TResult>>;
-    using ColVecType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
-    using ColVecResult = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<TResult>, ColumnVector<TResult>>;
+    using ResultDataType = std::conditional_t<is_decimal<T>, DataTypeDecimal<TResult>, DataTypeNumber<TResult>>;
+    using ColVecType = ColumnVectorOrDecimal<T>;
+    using ColVecResult = std::conditional_t<is_decimal<T>, ColumnDecimal<TResult>, ColumnVector<TResult>>;
 
     String getName() const override
     {
@@ -361,7 +361,7 @@ public:
 
     DataTypePtr getReturnType() const override
     {
-        if constexpr (IsDecimalNumber<T>)
+        if constexpr (is_decimal<T>)
             return std::make_shared<ResultDataType>(ResultDataType::maxPrecision(), scale);
         else
             return std::make_shared<ResultDataType>();
diff --git a/src/AggregateFunctions/AggregateFunctionSumCount.h b/src/AggregateFunctions/AggregateFunctionSumCount.h
index 4a913113ce2..493dd90df30 100644
--- a/src/AggregateFunctions/AggregateFunctionSumCount.h
+++ b/src/AggregateFunctions/AggregateFunctionSumCount.h
@@ -8,7 +8,10 @@
 namespace DB
 {
 template <typename T>
-using DecimalOrNumberDataType = std::conditional_t<IsDecimalNumber<T>, DataTypeDecimal<AvgFieldType<T>>, DataTypeNumber<AvgFieldType<T>>>;
+using DecimalOrNumberDataType = std::conditional_t<is_decimal<T>,
+    DataTypeDecimal<AvgFieldType<T>>,
+    DataTypeNumber<AvgFieldType<T>>>;
+
 template <typename T>
 class AggregateFunctionSumCount final : public AggregateFunctionAvgBase<AvgFieldType<T>, UInt64, AggregateFunctionSumCount<T>>
 {
@@ -21,7 +24,7 @@ public:
     DataTypePtr getReturnType() const override
     {
         DataTypes types;
-        if constexpr (IsDecimalNumber<T>)
+        if constexpr (is_decimal<T>)
             types.emplace_back(std::make_shared<DecimalOrNumberDataType<T>>(DecimalOrNumberDataType<T>::maxPrecision(), scale));
         else
             types.emplace_back(std::make_shared<DecimalOrNumberDataType<T>>());
diff --git a/src/AggregateFunctions/AggregateFunctionSumMap.h b/src/AggregateFunctions/AggregateFunctionSumMap.h
index 03327f76e48..3bc1ff2b61f 100644
--- a/src/AggregateFunctions/AggregateFunctionSumMap.h
+++ b/src/AggregateFunctions/AggregateFunctionSumMap.h
@@ -190,7 +190,7 @@ public:
                     continue;
 
                 decltype(merged_maps.begin()) it;
-                if constexpr (IsDecimalNumber<T>)
+                if constexpr (is_decimal<T>)
                 {
                     // FIXME why is storing NearestFieldType not enough, and we
                     // have to check for decimals again here?
@@ -217,7 +217,7 @@ public:
                     new_values.resize(size);
                     new_values[col] = value;
 
-                    if constexpr (IsDecimalNumber<T>)
+                    if constexpr (is_decimal<T>)
                     {
                         UInt32 scale = static_cast<const ColumnDecimal<T> &>(key_column).getData().getScale();
                         merged_maps.emplace(DecimalField<T>(key, scale), std::move(new_values));
@@ -280,7 +280,7 @@ public:
             for (size_t col = 0; col < values_types.size(); ++col)
                 values_serializations[col]->deserializeBinary(values[col], buf);
 
-            if constexpr (IsDecimalNumber<T>)
+            if constexpr (is_decimal<T>)
                 merged_maps[key.get<DecimalField<T>>()] = values;
             else
                 merged_maps[key.get<T>()] = values;
@@ -396,7 +396,7 @@ private:
     using Base = AggregateFunctionMapBase<T, Self, FieldVisitorSum, overflow, tuple_argument, true>;
 
     /// ARCADIA_BUILD disallow unordered_set for big ints for some reason
-    static constexpr const bool allow_hash = !OverBigInt<T>;
+    static constexpr const bool allow_hash = !is_over_big_int<T>;
     using ContainerT = std::conditional_t<allow_hash, std::unordered_set<T>, std::set<T>>;
 
     ContainerT keys_to_keep;
diff --git a/src/AggregateFunctions/QuantileExactWeighted.h b/src/AggregateFunctions/QuantileExactWeighted.h
index 8170c06d0cd..97ad15f7e75 100644
--- a/src/AggregateFunctions/QuantileExactWeighted.h
+++ b/src/AggregateFunctions/QuantileExactWeighted.h
@@ -30,7 +30,7 @@ struct QuantileExactWeighted
     };
 
     using Weight = UInt64;
-    using UnderlyingType = typename NativeType<Value>::Type;
+    using UnderlyingType = NativeType<Value>;
     using Hasher = std::conditional_t<std::is_same_v<Value, Decimal128>, Int128Hash, HashCRC32<UnderlyingType>>;
 
     /// When creating, the hash table must be small.
diff --git a/src/AggregateFunctions/ReservoirSampler.h b/src/AggregateFunctions/ReservoirSampler.h
index 6c131928cb7..53e64626a77 100644
--- a/src/AggregateFunctions/ReservoirSampler.h
+++ b/src/AggregateFunctions/ReservoirSampler.h
@@ -121,7 +121,7 @@ public:
     {
         if (samples.empty())
         {
-            if (DB::IsDecimalNumber<T>)
+            if (DB::is_decimal<T>)
                 return 0;
             return onEmpty<double>();
         }
@@ -134,7 +134,7 @@ public:
         size_t right_index = left_index + 1;
         if (right_index == samples.size())
         {
-            if constexpr (DB::IsDecimalNumber<T>)
+            if constexpr (DB::is_decimal<T>)
                 return static_cast<double>(samples[left_index].value);
             else
                 return static_cast<double>(samples[left_index]);
@@ -143,7 +143,7 @@ public:
         double left_coef = right_index - index;
         double right_coef = index - left_index;
 
-        if constexpr (DB::IsDecimalNumber<T>)
+        if constexpr (DB::is_decimal<T>)
             return static_cast<double>(samples[left_index].value) * left_coef + static_cast<double>(samples[right_index].value) * right_coef;
         else
             return static_cast<double>(samples[left_index]) * left_coef + static_cast<double>(samples[right_index]) * right_coef;
diff --git a/src/Columns/ColumnDecimal.cpp b/src/Columns/ColumnDecimal.cpp
index d87dd0035a5..dadb8194ae0 100644
--- a/src/Columns/ColumnDecimal.cpp
+++ b/src/Columns/ColumnDecimal.cpp
@@ -19,7 +19,7 @@
 #include <DataStreams/ColumnGathererStream.h>
 
 
-template <typename T> bool decimalLess(T x, T y, UInt32 x_scale, UInt32 y_scale);
+template <class T> bool decimalLess(T x, T y, UInt32 x_scale, UInt32 y_scale);
 
 namespace DB
 {
@@ -38,7 +38,7 @@ template class DecimalPaddedPODArray<Decimal128>;
 template class DecimalPaddedPODArray<Decimal256>;
 template class DecimalPaddedPODArray<DateTime64>;
 
-template <typename T>
+template <is_decimal T>
 int ColumnDecimal<T>::compareAt(size_t n, size_t m, const IColumn & rhs_, int) const
 {
     auto & other = static_cast<const Self &>(rhs_);
@@ -50,7 +50,7 @@ int ColumnDecimal<T>::compareAt(size_t n, size_t m, const IColumn & rhs_, int) c
     return decimalLess<T>(b, a, other.scale, scale) ? 1 : (decimalLess<T>(a, b, scale, other.scale) ? -1 : 0);
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::compareColumn(const IColumn & rhs, size_t rhs_row_num,
                                      PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
                                      int direction, int nan_direction_hint) const
@@ -59,13 +59,13 @@ void ColumnDecimal<T>::compareColumn(const IColumn & rhs, size_t rhs_row_num,
                                                          compare_results, direction, nan_direction_hint);
 }
 
-template <typename T>
+template <is_decimal T>
 bool ColumnDecimal<T>::hasEqualValues() const
 {
     return this->template hasEqualValuesImpl<ColumnDecimal<T>>();
 }
 
-template <typename T>
+template <is_decimal T>
 StringRef ColumnDecimal<T>::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
 {
     auto * pos = arena.allocContinue(sizeof(T), begin);
@@ -73,20 +73,20 @@ StringRef ColumnDecimal<T>::serializeValueIntoArena(size_t n, Arena & arena, cha
     return StringRef(pos, sizeof(T));
 }
 
-template <typename T>
+template <is_decimal T>
 const char * ColumnDecimal<T>::deserializeAndInsertFromArena(const char * pos)
 {
     data.push_back(unalignedLoad<T>(pos));
     return pos + sizeof(T);
 }
 
-template <typename T>
+template <is_decimal T>
 const char * ColumnDecimal<T>::skipSerializedInArena(const char * pos) const
 {
     return pos + sizeof(T);
 }
 
-template <typename T>
+template <is_decimal T>
 UInt64 ColumnDecimal<T>::get64([[maybe_unused]] size_t n) const
 {
     if constexpr (sizeof(T) > sizeof(UInt64))
@@ -95,13 +95,13 @@ UInt64 ColumnDecimal<T>::get64([[maybe_unused]] size_t n) const
         return static_cast<NativeT>(data[n]);
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::updateHashWithValue(size_t n, SipHash & hash) const
 {
     hash.update(data[n].value);
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::updateWeakHash32(WeakHash32 & hash) const
 {
     auto s = data.size();
@@ -122,13 +122,13 @@ void ColumnDecimal<T>::updateWeakHash32(WeakHash32 & hash) const
     }
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::updateHashFast(SipHash & hash) const
 {
     hash.update(reinterpret_cast<const char *>(data.data()), size() * sizeof(data[0]));
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::getPermutation(bool reverse, size_t limit, int , IColumn::Permutation & res) const
 {
 #if 1 /// TODO: perf test
@@ -147,7 +147,7 @@ void ColumnDecimal<T>::getPermutation(bool reverse, size_t limit, int , IColumn:
     permutation(reverse, limit, res);
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::updatePermutation(bool reverse, size_t limit, int, IColumn::Permutation & res, EqualRanges & equal_ranges) const
 {
     if (equal_ranges.empty())
@@ -228,7 +228,7 @@ void ColumnDecimal<T>::updatePermutation(bool reverse, size_t limit, int, IColum
     }
 }
 
-template <typename T>
+template <is_decimal T>
 ColumnPtr ColumnDecimal<T>::permute(const IColumn::Permutation & perm, size_t limit) const
 {
     size_t size = limit ? std::min(data.size(), limit) : data.size();
@@ -244,7 +244,7 @@ ColumnPtr ColumnDecimal<T>::permute(const IColumn::Permutation & perm, size_t li
     return res;
 }
 
-template <typename T>
+template <is_decimal T>
 MutableColumnPtr ColumnDecimal<T>::cloneResized(size_t size) const
 {
     auto res = this->create(0, scale);
@@ -268,7 +268,7 @@ MutableColumnPtr ColumnDecimal<T>::cloneResized(size_t size) const
     return res;
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::insertData(const char * src, size_t /*length*/)
 {
     T tmp;
@@ -276,7 +276,7 @@ void ColumnDecimal<T>::insertData(const char * src, size_t /*length*/)
     data.emplace_back(tmp);
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::insertRangeFrom(const IColumn & src, size_t start, size_t length)
 {
     const ColumnDecimal & src_vec = assert_cast<const ColumnDecimal &>(src);
@@ -292,7 +292,7 @@ void ColumnDecimal<T>::insertRangeFrom(const IColumn & src, size_t start, size_t
     memcpy(data.data() + old_size, &src_vec.data[start], length * sizeof(data[0]));
 }
 
-template <typename T>
+template <is_decimal T>
 ColumnPtr ColumnDecimal<T>::filter(const IColumn::Filter & filt, ssize_t result_size_hint) const
 {
     size_t size = data.size();
@@ -321,19 +321,19 @@ ColumnPtr ColumnDecimal<T>::filter(const IColumn::Filter & filt, ssize_t result_
     return res;
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::expand(const IColumn::Filter & mask, bool inverted)
 {
     expandDataByMask<T>(data, mask, inverted);
 }
 
-template <typename T>
+template <is_decimal T>
 ColumnPtr ColumnDecimal<T>::index(const IColumn & indexes, size_t limit) const
 {
     return selectIndexImpl(*this, indexes, limit);
 }
 
-template <typename T>
+template <is_decimal T>
 ColumnPtr ColumnDecimal<T>::replicate(const IColumn::Offsets & offsets) const
 {
     size_t size = data.size();
@@ -360,13 +360,13 @@ ColumnPtr ColumnDecimal<T>::replicate(const IColumn::Offsets & offsets) const
     return res;
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::gather(ColumnGathererStream & gatherer)
 {
     gatherer.gather(*this);
 }
 
-template <typename T>
+template <is_decimal T>
 ColumnPtr ColumnDecimal<T>::compress() const
 {
     size_t source_size = data.size() * sizeof(T);
@@ -390,7 +390,7 @@ ColumnPtr ColumnDecimal<T>::compress() const
         });
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::getExtremes(Field & min, Field & max) const
 {
     if (data.empty())
diff --git a/src/Columns/ColumnDecimal.h b/src/Columns/ColumnDecimal.h
index d6620a492a3..34cc4751eb9 100644
--- a/src/Columns/ColumnDecimal.h
+++ b/src/Columns/ColumnDecimal.h
@@ -7,6 +7,8 @@
 #include <Core/DecimalFunctions.h>
 #include <Common/typeid_cast.h>
 #include <common/sort.h>
+#include <Core/TypeId.h>
+#include <Core/TypeName.h>
 
 #include <cmath>
 
@@ -59,11 +61,9 @@ extern template class DecimalPaddedPODArray<Decimal256>;
 extern template class DecimalPaddedPODArray<DateTime64>;
 
 /// A ColumnVector for Decimals
-template <typename T>
+template <is_decimal T>
 class ColumnDecimal final : public COWHelper<ColumnVectorHelper, ColumnDecimal<T>>
 {
-    static_assert(IsDecimalNumber<T>);
-
 private:
     using Self = ColumnDecimal;
     friend class COWHelper<ColumnVectorHelper, Self>;
@@ -210,7 +210,12 @@ protected:
     }
 };
 
-template <typename T>
+template <class> class ColumnVector;
+template <class T> struct ColumnVectorOrDecimalT { using Col = ColumnVector<T>; };
+template <is_decimal T> struct ColumnVectorOrDecimalT<T> { using Col = ColumnDecimal<T>; };
+template <class T> using ColumnVectorOrDecimal = typename ColumnVectorOrDecimalT<T>::Col;
+
+template <is_decimal T>
 template <typename Type>
 ColumnPtr ColumnDecimal<T>::indexImpl(const PaddedPODArray<Type> & indexes, size_t limit) const
 {
diff --git a/src/Columns/ColumnVector.h b/src/Columns/ColumnVector.h
index 0c39102b988..30f3ad6a132 100644
--- a/src/Columns/ColumnVector.h
+++ b/src/Columns/ColumnVector.h
@@ -7,6 +7,8 @@
 #include <common/unaligned.h>
 #include <Core/Field.h>
 #include <Common/assert_cast.h>
+#include <Core/TypeId.h>
+#include <Core/TypeName.h>
 
 
 namespace DB
@@ -102,7 +104,7 @@ template <class U> struct CompareHelper<Float64, U> : public FloatCompareHelper<
 template <typename T>
 class ColumnVector final : public COWHelper<ColumnVectorHelper, ColumnVector<T>>
 {
-    static_assert(!IsDecimalNumber<T>);
+    static_assert(!is_decimal<T>);
 
 private:
     using Self = ColumnVector;
diff --git a/src/Common/FieldVisitorConvertToNumber.h b/src/Common/FieldVisitorConvertToNumber.h
index 0f099c6215d..4f0a821b288 100644
--- a/src/Common/FieldVisitorConvertToNumber.h
+++ b/src/Common/FieldVisitorConvertToNumber.h
@@ -116,7 +116,7 @@ public:
     template <typename U, typename = std::enable_if_t<is_big_int_v<U>> >
     T operator() (const U & x) const
     {
-        if constexpr (IsDecimalNumber<T>)
+        if constexpr (is_decimal<T>)
             return static_cast<T>(static_cast<typename T::NativeType>(x));
         else if constexpr (std::is_same_v<T, UInt128>)
             throw Exception("No conversion to old UInt128 from " + demangle(typeid(U).name()), ErrorCodes::NOT_IMPLEMENTED);
diff --git a/src/Common/HashTable/Hash.h b/src/Common/HashTable/Hash.h
index 84e514c1375..f94e42cbd76 100644
--- a/src/Common/HashTable/Hash.h
+++ b/src/Common/HashTable/Hash.h
@@ -197,12 +197,8 @@ inline size_t DefaultHash64(std::enable_if_t<(sizeof(T) > sizeof(UInt64)), T> ke
     __builtin_unreachable();
 }
 
-
-template <typename T, typename Enable = void>
-struct DefaultHash;
-
 template <typename T>
-struct DefaultHash<T, std::enable_if_t<!DB::IsDecimalNumber<T>>>
+struct DefaultHash
 {
     size_t operator() (T key) const
     {
@@ -210,8 +206,8 @@ struct DefaultHash<T, std::enable_if_t<!DB::IsDecimalNumber<T>>>
     }
 };
 
-template <typename T>
-struct DefaultHash<T, std::enable_if_t<DB::IsDecimalNumber<T>>>
+template <DB::is_decimal T>
+struct DefaultHash<T>
 {
     size_t operator() (T key) const
     {
diff --git a/src/Common/RadixSort.h b/src/Common/RadixSort.h
index b14e71a6720..46ebbf2febe 100644
--- a/src/Common/RadixSort.h
+++ b/src/Common/RadixSort.h
@@ -187,7 +187,7 @@ struct RadixSortIntTraits
 
 template <typename T>
 using RadixSortNumTraits = std::conditional_t<
-    is_integer_v<T>,
+    DB::is_integer<T>,
     std::conditional_t<is_unsigned_v<T>, RadixSortUIntTraits<T>, RadixSortIntTraits<T>>,
     RadixSortFloatTraits<T>>;
 
diff --git a/src/Core/AccurateComparison.h b/src/Core/AccurateComparison.h
index 29088cbf1b5..0f4a2bb2d1f 100644
--- a/src/Core/AccurateComparison.h
+++ b/src/Core/AccurateComparison.h
@@ -33,7 +33,7 @@ bool lessOp(A a, B b)
         return false;
 
     /// int vs int
-    if constexpr (is_integer_v<A> && is_integer_v<B>)
+    if constexpr (is_integer<A> && is_integer<B>)
     {
         /// same signedness
         if constexpr (is_signed_v<A> == is_signed_v<B>)
@@ -49,7 +49,7 @@ bool lessOp(A a, B b)
     }
 
     /// int vs float
-    if constexpr (is_integer_v<A> && std::is_floating_point_v<B>)
+    if constexpr (is_integer<A> && std::is_floating_point_v<B>)
     {
         if constexpr (sizeof(A) <= 4)
             return static_cast<double>(a) < static_cast<double>(b);
@@ -57,7 +57,7 @@ bool lessOp(A a, B b)
         return DecomposedFloat<B>(b).greater(a);
     }
 
-    if constexpr (std::is_floating_point_v<A> && is_integer_v<B>)
+    if constexpr (std::is_floating_point_v<A> && is_integer<B>)
     {
         if constexpr (sizeof(B) <= 4)
             return static_cast<double>(a) < static_cast<double>(b);
@@ -65,8 +65,8 @@ bool lessOp(A a, B b)
         return DecomposedFloat<A>(a).less(b);
     }
 
-    static_assert(is_integer_v<A> || std::is_floating_point_v<A>);
-    static_assert(is_integer_v<B> || std::is_floating_point_v<B>);
+    static_assert(is_integer<A> || std::is_floating_point_v<A>);
+    static_assert(is_integer<B> || std::is_floating_point_v<B>);
     __builtin_unreachable();
 }
 
@@ -109,7 +109,7 @@ bool equalsOp(A a, B b)
         return false;
 
     /// int vs int
-    if constexpr (is_integer_v<A> && is_integer_v<B>)
+    if constexpr (is_integer<A> && is_integer<B>)
     {
         /// same signedness
         if constexpr (is_signed_v<A> == is_signed_v<B>)
@@ -125,7 +125,7 @@ bool equalsOp(A a, B b)
     }
 
     /// int vs float
-    if constexpr (is_integer_v<A> && std::is_floating_point_v<B>)
+    if constexpr (is_integer<A> && std::is_floating_point_v<B>)
     {
         if constexpr (sizeof(A) <= 4)
             return static_cast<double>(a) == static_cast<double>(b);
@@ -133,7 +133,7 @@ bool equalsOp(A a, B b)
         return DecomposedFloat<B>(b).equals(a);
     }
 
-    if constexpr (std::is_floating_point_v<A> && is_integer_v<B>)
+    if constexpr (std::is_floating_point_v<A> && is_integer<B>)
     {
         if constexpr (sizeof(B) <= 4)
             return static_cast<double>(a) == static_cast<double>(b);
diff --git a/src/Core/DecimalComparison.h b/src/Core/DecimalComparison.h
index 5b017cd4634..cf2c43d61bd 100644
--- a/src/Core/DecimalComparison.h
+++ b/src/Core/DecimalComparison.h
@@ -47,21 +47,21 @@ template <> struct ConstructDecInt<32> { using Type = Int256; };
 template <typename T, typename U>
 struct DecCompareInt
 {
-    using Type = typename ConstructDecInt<(!IsDecimalNumber<U> || sizeof(T) > sizeof(U)) ? sizeof(T) : sizeof(U)>::Type;
+    using Type = typename ConstructDecInt<(!is_decimal<U> || sizeof(T) > sizeof(U)) ? sizeof(T) : sizeof(U)>::Type;
     using TypeA = Type;
     using TypeB = Type;
 };
 
 ///
 template <typename A, typename B, template <typename, typename> typename Operation, bool _check_overflow = true,
-    bool _actual = IsDecimalNumber<A> || IsDecimalNumber<B>>
+    bool _actual = is_decimal<A> || is_decimal<B>>
 class DecimalComparison
 {
 public:
     using CompareInt = typename DecCompareInt<A, B>::Type;
     using Op = Operation<CompareInt, CompareInt>;
-    using ColVecA = std::conditional_t<IsDecimalNumber<A>, ColumnDecimal<A>, ColumnVector<A>>;
-    using ColVecB = std::conditional_t<IsDecimalNumber<B>, ColumnDecimal<B>, ColumnVector<B>>;
+    using ColVecA = ColumnVectorOrDecimal<A>;
+    using ColVecB = ColumnVectorOrDecimal<B>;
 
     using ArrayA = typename ColVecA::Container;
     using ArrayB = typename ColVecB::Container;
@@ -116,7 +116,7 @@ private:
     }
 
     template <typename T, typename U>
-    static std::enable_if_t<IsDecimalNumber<T> && IsDecimalNumber<U>, Shift>
+    static std::enable_if_t<is_decimal<T> && is_decimal<U>, Shift>
     getScales(const DataTypePtr & left_type, const DataTypePtr & right_type)
     {
         const DataTypeDecimalBase<T> * decimal0 = checkDecimalBase<T>(*left_type);
@@ -138,7 +138,7 @@ private:
     }
 
     template <typename T, typename U>
-    static std::enable_if_t<IsDecimalNumber<T> && !IsDecimalNumber<U>, Shift>
+    static std::enable_if_t<is_decimal<T> && !is_decimal<U>, Shift>
     getScales(const DataTypePtr & left_type, const DataTypePtr &)
     {
         Shift shift;
@@ -149,7 +149,7 @@ private:
     }
 
     template <typename T, typename U>
-    static std::enable_if_t<!IsDecimalNumber<T> && IsDecimalNumber<U>, Shift>
+    static std::enable_if_t<!is_decimal<T> && is_decimal<U>, Shift>
     getScales(const DataTypePtr &, const DataTypePtr & right_type)
     {
         Shift shift;
@@ -222,13 +222,13 @@ private:
     static NO_INLINE UInt8 apply(A a, B b, CompareInt scale [[maybe_unused]])
     {
         CompareInt x;
-        if constexpr (IsDecimalNumber<A>)
+        if constexpr (is_decimal<A>)
             x = a.value;
         else
             x = a;
 
         CompareInt y;
-        if constexpr (IsDecimalNumber<B>)
+        if constexpr (is_decimal<B>)
             y = b.value;
         else
             y = b;
diff --git a/src/Core/DecimalFunctions.h b/src/Core/DecimalFunctions.h
index 0e399210088..cd016f05cb5 100644
--- a/src/Core/DecimalFunctions.h
+++ b/src/Core/DecimalFunctions.h
@@ -6,7 +6,6 @@
 #include <common/arithmeticOverflow.h>
 
 #include <limits>
-#include <type_traits>
 
 
 namespace DB
@@ -230,7 +229,7 @@ ReturnType convertToImpl(const DecimalType & decimal, size_t scale, To & result)
     {
         result = static_cast<To>(decimal.value) / static_cast<To>(scaleMultiplier<NativeT>(scale));
     }
-    else if constexpr (is_integer_v<To> && (sizeof(To) >= sizeof(NativeT)))
+    else if constexpr (is_integer<To> && (sizeof(To) >= sizeof(NativeT)))
     {
         NativeT whole = getWholePart(decimal, scale);
 
@@ -247,9 +246,9 @@ ReturnType convertToImpl(const DecimalType & decimal, size_t scale, To & result)
 
         result = static_cast<To>(whole);
     }
-    else if constexpr (is_integer_v<To>)
+    else if constexpr (is_integer<To>)
     {
-        using ToNativeT = typename NativeType<To>::Type;
+        using ToNativeT = NativeType<To>;
         using CastTo = std::conditional_t<(is_big_int_v<NativeT> && std::is_same_v<ToNativeT, UInt8>), uint8_t, ToNativeT>;
 
         const NativeT whole = getWholePart(decimal, scale);
diff --git a/src/Core/Field.h b/src/Core/Field.h
index d8f691a8c97..d66674805d1 100644
--- a/src/Core/Field.h
+++ b/src/Core/Field.h
@@ -837,12 +837,6 @@ T safeGet(Field & field)
     return field.template safeGet<T>();
 }
 
-template <> inline constexpr const char * TypeName<Array> = "Array";
-template <> inline constexpr const char * TypeName<Tuple> = "Tuple";
-template <> inline constexpr const char * TypeName<Map> = "Map";
-template <> inline constexpr const char * TypeName<AggregateFunctionStateData> = "AggregateFunctionState";
-
-
 template <typename T>
 Field::Field(T && rhs, enable_if_not_field_or_bool_or_stringlike_t<T>) //-V730
 {
diff --git a/src/Core/TypeId.h b/src/Core/TypeId.h
new file mode 100644
index 00000000000..3218db10778
--- /dev/null
+++ b/src/Core/TypeId.h
@@ -0,0 +1,61 @@
+#pragma once
+
+#include <Core/Types.h>
+
+namespace DB
+{
+/**
+ * Obtain TypeIndex value from real type if possible.
+ *
+ * Returns TypeIndex::Nothing if type was not present in TypeIndex;
+ * Returns TypeIndex element otherwise.
+ *
+ * @example TypeId<UInt8> == TypeIndex::UInt8
+ * @example TypeId<MySuperType> == TypeIndex::Nothing
+ */
+template <class T> inline constexpr TypeIndex TypeId = TypeIndex::Nothing;
+
+template <TypeIndex index> struct ReverseTypeIdT : std::false_type {};
+
+/**
+ * Obtain real type from TypeIndex if possible.
+ *
+ * Returns a type alias if is corresponds to TypeIndex value.
+ * Yields a compiler error otherwise.
+ *
+ * @example ReverseTypeId<TypeIndex::UInt8> == UInt8
+ */
+template <TypeIndex index> using ReverseTypeId = typename ReverseTypeIdT<index>::T;
+template <TypeIndex index> constexpr bool HasReverseTypeId = ReverseTypeIdT<index>::value;
+
+#define TYPEID_MAP(_A) \
+    template <> inline constexpr TypeIndex TypeId<_A> = TypeIndex::_A; \
+    template <> struct ReverseTypeIdT<TypeIndex::_A> : std::true_type { using T = _A; };
+
+TYPEID_MAP(UInt8)
+TYPEID_MAP(UInt16)
+TYPEID_MAP(UInt32)
+TYPEID_MAP(UInt64)
+TYPEID_MAP(UInt128)
+TYPEID_MAP(UInt256)
+TYPEID_MAP(Int8)
+TYPEID_MAP(Int16)
+TYPEID_MAP(Int32)
+TYPEID_MAP(Int64)
+TYPEID_MAP(Int128)
+TYPEID_MAP(Int256)
+TYPEID_MAP(Float32)
+TYPEID_MAP(Float64)
+TYPEID_MAP(UUID)
+
+TYPEID_MAP(Decimal32)
+TYPEID_MAP(Decimal64)
+TYPEID_MAP(Decimal128)
+TYPEID_MAP(Decimal256)
+TYPEID_MAP(DateTime64)
+
+TYPEID_MAP(String)
+
+struct Array;
+TYPEID_MAP(Array)
+}
diff --git a/src/Core/TypeName.h b/src/Core/TypeName.h
new file mode 100644
index 00000000000..1f2c9d8b3fe
--- /dev/null
+++ b/src/Core/TypeName.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <Core/Types.h>
+
+namespace DB
+{
+struct Array;
+struct Tuple;
+struct Map;
+struct AggregateFunctionStateData;
+
+template <class T> constexpr const char * TypeName = "";
+
+template <> inline constexpr const char * TypeName<UInt8> = "UInt8";
+template <> inline constexpr const char * TypeName<UInt16> = "UInt16";
+template <> inline constexpr const char * TypeName<UInt32> = "UInt32";
+template <> inline constexpr const char * TypeName<UInt64> = "UInt64";
+template <> inline constexpr const char * TypeName<UInt128> = "UInt128";
+template <> inline constexpr const char * TypeName<UInt256> = "UInt256";
+template <> inline constexpr const char * TypeName<Int8> = "Int8";
+template <> inline constexpr const char * TypeName<Int16> = "Int16";
+template <> inline constexpr const char * TypeName<Int32> = "Int32";
+template <> inline constexpr const char * TypeName<Int64> = "Int64";
+template <> inline constexpr const char * TypeName<Int128> = "Int128";
+template <> inline constexpr const char * TypeName<Int256> = "Int256";
+template <> inline constexpr const char * TypeName<Float32> = "Float32";
+template <> inline constexpr const char * TypeName<Float64> = "Float64";
+template <> inline constexpr const char * TypeName<String> = "String";
+template <> inline constexpr const char * TypeName<UUID> = "UUID";
+template <> inline constexpr const char * TypeName<Decimal32> = "Decimal32";
+template <> inline constexpr const char * TypeName<Decimal64> = "Decimal64";
+template <> inline constexpr const char * TypeName<Decimal128> = "Decimal128";
+template <> inline constexpr const char * TypeName<Decimal256> = "Decimal256";
+template <> inline constexpr const char * TypeName<DateTime64> = "DateTime64";
+template <> inline constexpr const char * TypeName<Array> = "Array";
+template <> inline constexpr const char * TypeName<Tuple> = "Tuple";
+template <> inline constexpr const char * TypeName<Map> = "Map";
+template <> inline constexpr const char * TypeName<AggregateFunctionStateData> = "AggregateFunctionState";
+}
diff --git a/src/Core/Types.h b/src/Core/Types.h
index 1347bf609d2..01838f3a9e1 100644
--- a/src/Core/Types.h
+++ b/src/Core/Types.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 #include <common/strong_typedef.h>
-#include <common/extended_types.h>
+#include <common/Decimal.h>
 #include <common/defines.h>
 
 
@@ -46,6 +46,7 @@ struct Null
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
 #endif
+
 /// @note Except explicitly described you should not assume on TypeIndex numbers and/or their orders in this enum.
 enum class TypeIndex
 {
@@ -87,11 +88,11 @@ enum class TypeIndex
     LowCardinality,
     Map,
 };
+
 #if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 
-
 using UInt128 = ::UInt128;
 using UInt256 = ::UInt256;
 using Int128 = ::Int128;
@@ -99,207 +100,6 @@ using Int256 = ::Int256;
 
 STRONG_TYPEDEF(UInt128, UUID)
 
-
-template <typename T> constexpr const char * TypeName = "";
-
-template <> inline constexpr const char * TypeName<UInt8> = "UInt8";
-template <> inline constexpr const char * TypeName<UInt16> = "UInt16";
-template <> inline constexpr const char * TypeName<UInt32> = "UInt32";
-template <> inline constexpr const char * TypeName<UInt64> = "UInt64";
-template <> inline constexpr const char * TypeName<UInt128> = "UInt128";
-template <> inline constexpr const char * TypeName<UInt256> = "UInt256";
-template <> inline constexpr const char * TypeName<Int8> = "Int8";
-template <> inline constexpr const char * TypeName<Int16> = "Int16";
-template <> inline constexpr const char * TypeName<Int32> = "Int32";
-template <> inline constexpr const char * TypeName<Int64> = "Int64";
-template <> inline constexpr const char * TypeName<Int128> = "Int128";
-template <> inline constexpr const char * TypeName<Int256> = "Int256";
-template <> inline constexpr const char * TypeName<Float32> = "Float32";
-template <> inline constexpr const char * TypeName<Float64> = "Float64";
-template <> inline constexpr const char * TypeName<String> = "String";
-template <> inline constexpr const char * TypeName<UUID> = "UUID";
-
-/// TODO Try to remove it.
-template <typename T> constexpr TypeIndex TypeId = TypeIndex::Nothing;
-template <> inline constexpr TypeIndex TypeId<UInt8> = TypeIndex::UInt8;
-template <> inline constexpr TypeIndex TypeId<UInt16> = TypeIndex::UInt16;
-template <> inline constexpr TypeIndex TypeId<UInt32> = TypeIndex::UInt32;
-template <> inline constexpr TypeIndex TypeId<UInt64> = TypeIndex::UInt64;
-template <> inline constexpr TypeIndex TypeId<UInt128> = TypeIndex::UInt128;
-template <> inline constexpr TypeIndex TypeId<UInt256> = TypeIndex::UInt256;
-template <> inline constexpr TypeIndex TypeId<Int8> = TypeIndex::Int8;
-template <> inline constexpr TypeIndex TypeId<Int16> = TypeIndex::Int16;
-template <> inline constexpr TypeIndex TypeId<Int32> = TypeIndex::Int32;
-template <> inline constexpr TypeIndex TypeId<Int64> = TypeIndex::Int64;
-template <> inline constexpr TypeIndex TypeId<Int128> = TypeIndex::Int128;
-template <> inline constexpr TypeIndex TypeId<Int256> = TypeIndex::Int256;
-template <> inline constexpr TypeIndex TypeId<Float32> = TypeIndex::Float32;
-template <> inline constexpr TypeIndex TypeId<Float64> = TypeIndex::Float64;
-template <> inline constexpr TypeIndex TypeId<UUID> = TypeIndex::UUID;
-
-
 /// Not a data type in database, defined just for convenience.
 using Strings = std::vector<String>;
-
-/// Own FieldType for Decimal.
-/// It is only a "storage" for decimal. To perform operations, you also have to provide a scale (number of digits after point).
-template <typename T>
-struct Decimal
-{
-    using NativeType = T;
-
-    Decimal() = default;
-    Decimal(Decimal<T> &&) = default;
-    Decimal(const Decimal<T> &) = default;
-
-    Decimal(const T & value_)
-    :   value(value_)
-    {}
-
-    template <typename U>
-    Decimal(const Decimal<U> & x)
-    :   value(x.value)
-    {}
-
-    constexpr Decimal<T> & operator = (Decimal<T> &&) = default;
-    constexpr Decimal<T> & operator = (const Decimal<T> &) = default;
-
-    operator T () const { return value; }
-
-    template <typename U>
-    U convertTo() const
-    {
-        /// no IsDecimalNumber defined yet
-        if constexpr (std::is_same_v<U, Decimal<Int32>> ||
-                      std::is_same_v<U, Decimal<Int64>> ||
-                      std::is_same_v<U, Decimal<Int128>> ||
-                      std::is_same_v<U, Decimal<Int256>>)
-        {
-            return convertTo<typename U::NativeType>();
-        }
-        else
-            return static_cast<U>(value);
-    }
-
-    const Decimal<T> & operator += (const T & x) { value += x; return *this; }
-    const Decimal<T> & operator -= (const T & x) { value -= x; return *this; }
-    const Decimal<T> & operator *= (const T & x) { value *= x; return *this; }
-    const Decimal<T> & operator /= (const T & x) { value /= x; return *this; }
-    const Decimal<T> & operator %= (const T & x) { value %= x; return *this; }
-
-    template <typename U> const Decimal<T> & operator += (const Decimal<U> & x) { value += x.value; return *this; }
-    template <typename U> const Decimal<T> & operator -= (const Decimal<U> & x) { value -= x.value; return *this; }
-    template <typename U> const Decimal<T> & operator *= (const Decimal<U> & x) { value *= x.value; return *this; }
-    template <typename U> const Decimal<T> & operator /= (const Decimal<U> & x) { value /= x.value; return *this; }
-    template <typename U> const Decimal<T> & operator %= (const Decimal<U> & x) { value %= x.value; return *this; }
-
-    /// This is to avoid UB for sumWithOverflow()
-    void NO_SANITIZE_UNDEFINED addOverflow(const T & x) { value += x; }
-
-    T value;
-};
-
-template <typename T> inline bool operator< (const Decimal<T> & x, const Decimal<T> & y) { return x.value < y.value; }
-template <typename T> inline bool operator> (const Decimal<T> & x, const Decimal<T> & y) { return x.value > y.value; }
-template <typename T> inline bool operator<= (const Decimal<T> & x, const Decimal<T> & y) { return x.value <= y.value; }
-template <typename T> inline bool operator>= (const Decimal<T> & x, const Decimal<T> & y) { return x.value >= y.value; }
-template <typename T> inline bool operator== (const Decimal<T> & x, const Decimal<T> & y) { return x.value == y.value; }
-template <typename T> inline bool operator!= (const Decimal<T> & x, const Decimal<T> & y) { return x.value != y.value; }
-
-template <typename T> inline Decimal<T> operator+ (const Decimal<T> & x, const Decimal<T> & y) { return x.value + y.value; }
-template <typename T> inline Decimal<T> operator- (const Decimal<T> & x, const Decimal<T> & y) { return x.value - y.value; }
-template <typename T> inline Decimal<T> operator* (const Decimal<T> & x, const Decimal<T> & y) { return x.value * y.value; }
-template <typename T> inline Decimal<T> operator/ (const Decimal<T> & x, const Decimal<T> & y) { return x.value / y.value; }
-template <typename T> inline Decimal<T> operator- (const Decimal<T> & x) { return -x.value; }
-
-using Decimal32 = Decimal<Int32>;
-using Decimal64 = Decimal<Int64>;
-using Decimal128 = Decimal<Int128>;
-using Decimal256 = Decimal<Int256>;
-
-// Distinguishable type to allow function resolution/deduction based on value type,
-// but also relatively easy to convert to/from Decimal64.
-class DateTime64 : public Decimal64
-{
-public:
-    using Base = Decimal64;
-    using Base::Base;
-
-    DateTime64(const Base & v)
-        : Base(v)
-    {}
-};
-
-template <> inline constexpr const char * TypeName<Decimal32> = "Decimal32";
-template <> inline constexpr const char * TypeName<Decimal64> = "Decimal64";
-template <> inline constexpr const char * TypeName<Decimal128> = "Decimal128";
-template <> inline constexpr const char * TypeName<Decimal256> = "Decimal256";
-template <> inline constexpr const char * TypeName<DateTime64> = "DateTime64";
-
-template <> inline constexpr TypeIndex TypeId<Decimal32> = TypeIndex::Decimal32;
-template <> inline constexpr TypeIndex TypeId<Decimal64> = TypeIndex::Decimal64;
-template <> inline constexpr TypeIndex TypeId<Decimal128> = TypeIndex::Decimal128;
-template <> inline constexpr TypeIndex TypeId<Decimal256> = TypeIndex::Decimal256;
-template <> inline constexpr TypeIndex TypeId<DateTime64> = TypeIndex::DateTime64;
-
-template <typename T> constexpr bool IsDecimalNumber = false;
-template <> inline constexpr bool IsDecimalNumber<Decimal32> = true;
-template <> inline constexpr bool IsDecimalNumber<Decimal64> = true;
-template <> inline constexpr bool IsDecimalNumber<Decimal128> = true;
-template <> inline constexpr bool IsDecimalNumber<Decimal256> = true;
-template <> inline constexpr bool IsDecimalNumber<DateTime64> = true;
-
-template <typename T> struct NativeType { using Type = T; };
-template <> struct NativeType<Decimal32> { using Type = Int32; };
-template <> struct NativeType<Decimal64> { using Type = Int64; };
-template <> struct NativeType<Decimal128> { using Type = Int128; };
-template <> struct NativeType<Decimal256> { using Type = Int256; };
-template <> struct NativeType<DateTime64> { using Type = Int64; };
-
-template <typename T> constexpr bool OverBigInt = false;
-template <> inline constexpr bool OverBigInt<Int128> = true;
-template <> inline constexpr bool OverBigInt<UInt128> = true;
-template <> inline constexpr bool OverBigInt<Int256> = true;
-template <> inline constexpr bool OverBigInt<UInt256> = true;
-template <> inline constexpr bool OverBigInt<Decimal128> = true;
-template <> inline constexpr bool OverBigInt<Decimal256> = true;
-}
-
-/// Specialization of `std::hash` for the Decimal<T> types.
-namespace std
-{
-    template <typename T>
-    struct hash<DB::Decimal<T>> { size_t operator()(const DB::Decimal<T> & x) const { return hash<T>()(x.value); } };
-
-    template <>
-    struct hash<DB::Decimal128>
-    {
-        size_t operator()(const DB::Decimal128 & x) const
-        {
-            return std::hash<DB::Int64>()(x.value >> 64)
-                ^ std::hash<DB::Int64>()(x.value & std::numeric_limits<DB::UInt64>::max());
-        }
-    };
-
-    template <>
-    struct hash<DB::DateTime64>
-    {
-        size_t operator()(const DB::DateTime64 & x) const
-        {
-            return std::hash<std::decay_t<decltype(x)>::NativeType>()(x);
-        }
-    };
-
-
-    template <>
-    struct hash<DB::Decimal256>
-    {
-        size_t operator()(const DB::Decimal256 & x) const
-        {
-            // temp solution
-            static constexpr DB::UInt64 max_uint_mask = std::numeric_limits<DB::UInt64>::max();
-            return std::hash<DB::Int64>()(static_cast<DB::Int64>(x.value >> 64 & max_uint_mask))
-                ^ std::hash<DB::Int64>()(static_cast<DB::Int64>(x.value & max_uint_mask));
-        }
-    };
 }
diff --git a/src/Core/callOnTypeIndex.h b/src/Core/callOnTypeIndex.h
index d3348466369..2634578f325 100644
--- a/src/Core/callOnTypeIndex.h
+++ b/src/Core/callOnTypeIndex.h
@@ -164,7 +164,7 @@ class DataTypeDateTime;
 class DataTypeDateTime64;
 template <typename T> class DataTypeEnum;
 template <typename T> class DataTypeNumber;
-template <typename T> class DataTypeDecimal;
+template <is_decimal T> class DataTypeDecimal;
 
 
 template <typename T, typename F, typename... ExtraArgs>
diff --git a/src/DataTypes/DataTypeDecimalBase.cpp b/src/DataTypes/DataTypeDecimalBase.cpp
index 683710b8880..f4c28088c48 100644
--- a/src/DataTypes/DataTypeDecimalBase.cpp
+++ b/src/DataTypes/DataTypeDecimalBase.cpp
@@ -28,19 +28,19 @@ bool decimalCheckArithmeticOverflow(ContextPtr context)
     return context->getSettingsRef().decimal_check_overflow;
 }
 
-template <typename T>
+template <is_decimal T>
 Field DataTypeDecimalBase<T>::getDefault() const
 {
     return DecimalField(T(0), scale);
 }
 
-template <typename T>
+template <is_decimal T>
 MutableColumnPtr DataTypeDecimalBase<T>::createColumn() const
 {
     return ColumnType::create(0, scale);
 }
 
-template <typename T>
+template <is_decimal T>
 T DataTypeDecimalBase<T>::getScaleMultiplier(UInt32 scale_)
 {
     return DecimalUtils::scaleMultiplier<typename T::NativeType>(scale_);
diff --git a/src/DataTypes/DataTypeDecimalBase.h b/src/DataTypes/DataTypeDecimalBase.h
index aea837f890f..c0585095eeb 100644
--- a/src/DataTypes/DataTypeDecimalBase.h
+++ b/src/DataTypes/DataTypeDecimalBase.h
@@ -53,11 +53,9 @@ inline UInt32 leastDecimalPrecisionFor(TypeIndex int_type)
 /// Operation between two decimals leads to Decimal(P, S), where
 ///     P is one of (9, 18, 38, 76); equals to the maximum precision for the biggest underlying type of operands.
 ///     S is maximum scale of operands. The allowed valuas are [0, precision]
-template <typename T>
+template <is_decimal T>
 class DataTypeDecimalBase : public IDataType
 {
-    static_assert(IsDecimalNumber<T>);
-
 public:
     using FieldType = T;
     using ColumnType = ColumnDecimal<T>;
diff --git a/src/DataTypes/DataTypeNumberBase.cpp b/src/DataTypes/DataTypeNumberBase.cpp
index 12d1989a9d6..a73d591654a 100644
--- a/src/DataTypes/DataTypeNumberBase.cpp
+++ b/src/DataTypes/DataTypeNumberBase.cpp
@@ -28,13 +28,13 @@ MutableColumnPtr DataTypeNumberBase<T>::createColumn() const
 template <typename T>
 bool DataTypeNumberBase<T>::isValueRepresentedByInteger() const
 {
-    return is_integer_v<T>;
+    return is_integer<T>;
 }
 
 template <typename T>
 bool DataTypeNumberBase<T>::isValueRepresentedByUnsignedInteger() const
 {
-    return is_integer_v<T> && is_unsigned_v<T>;
+    return is_integer<T> && is_unsigned_v<T>;
 }
 
 
diff --git a/src/DataTypes/DataTypesDecimal.cpp b/src/DataTypes/DataTypesDecimal.cpp
index cecfcea8dac..9f7320197c8 100644
--- a/src/DataTypes/DataTypesDecimal.cpp
+++ b/src/DataTypes/DataTypesDecimal.cpp
@@ -25,14 +25,14 @@ namespace ErrorCodes
 }
 
 
-template <typename T>
+template <is_decimal T>
 std::string DataTypeDecimal<T>::doGetName() const
 {
     return fmt::format("Decimal({}, {})", this->precision, this->scale);
 }
 
 
-template <typename T>
+template <is_decimal T>
 bool DataTypeDecimal<T>::equals(const IDataType & rhs) const
 {
     if (auto * ptype = typeid_cast<const DataTypeDecimal<T> *>(&rhs))
@@ -40,14 +40,14 @@ bool DataTypeDecimal<T>::equals(const IDataType & rhs) const
     return false;
 }
 
-template <typename T>
+template <is_decimal T>
 DataTypePtr DataTypeDecimal<T>::promoteNumericType() const
 {
     using PromotedType = DataTypeDecimal<Decimal128>;
     return std::make_shared<PromotedType>(PromotedType::maxPrecision(), this->scale);
 }
 
-template <typename T>
+template <is_decimal T>
 T DataTypeDecimal<T>::parseFromString(const String & str) const
 {
     ReadBufferFromMemory buf(str.data(), str.size());
@@ -61,7 +61,7 @@ T DataTypeDecimal<T>::parseFromString(const String & str) const
     return x;
 }
 
-template <typename T>
+template <is_decimal T>
 SerializationPtr DataTypeDecimal<T>::doGetDefaultSerialization() const
 {
     return std::make_shared<SerializationDecimal<T>>(this->precision, this->scale);
diff --git a/src/DataTypes/DataTypesDecimal.h b/src/DataTypes/DataTypesDecimal.h
index f08bdb80d41..24e167e8e8f 100644
--- a/src/DataTypes/DataTypesDecimal.h
+++ b/src/DataTypes/DataTypesDecimal.h
@@ -24,11 +24,10 @@ namespace ErrorCodes
 /// Operation between two decimals leads to Decimal(P, S), where
 ///     P is one of (9, 18, 38, 76); equals to the maximum precision for the biggest underlying type of operands.
 ///     S is maximum scale of operands. The allowed valuas are [0, precision]
-template <typename T>
+template <is_decimal T>
 class DataTypeDecimal final : public DataTypeDecimalBase<T>
 {
     using Base = DataTypeDecimalBase<T>;
-    static_assert(IsDecimalNumber<T>);
 
 public:
     using typename Base::FieldType;
diff --git a/src/DataTypes/IDataType.h b/src/DataTypes/IDataType.h
index 9d943769c0a..7e9b3ac873b 100644
--- a/src/DataTypes/IDataType.h
+++ b/src/DataTypes/IDataType.h
@@ -4,7 +4,7 @@
 #include <Common/COW.h>
 #include <boost/noncopyable.hpp>
 #include <Core/Names.h>
-#include <Core/Types.h>
+#include <Core/TypeId.h>
 #include <DataTypes/DataTypeCustom.h>
 
 
@@ -490,7 +490,7 @@ template <typename DataType> constexpr bool IsDataTypeDateOrDateTime = false;
 
 template <typename DataType> constexpr bool IsDataTypeDecimalOrNumber = IsDataTypeDecimal<DataType> || IsDataTypeNumber<DataType>;
 
-template <typename T>
+template <is_decimal T>
 class DataTypeDecimal;
 
 template <typename T>
diff --git a/src/DataTypes/NumberTraits.h b/src/DataTypes/NumberTraits.h
index 3216149c647..e63c5bcdcb7 100644
--- a/src/DataTypes/NumberTraits.h
+++ b/src/DataTypes/NumberTraits.h
@@ -172,14 +172,14 @@ template <typename A, typename B>
 struct ResultOfIf
 {
     static constexpr bool has_float = std::is_floating_point_v<A> || std::is_floating_point_v<B>;
-    static constexpr bool has_integer = is_integer_v<A> || is_integer_v<B>;
+    static constexpr bool has_integer = is_integer<A> || is_integer<B>;
     static constexpr bool has_signed = is_signed_v<A> || is_signed_v<B>;
     static constexpr bool has_unsigned = !is_signed_v<A> || !is_signed_v<B>;
     static constexpr bool has_big_int = is_big_int_v<A> || is_big_int_v<B>;
 
     static constexpr size_t max_size_of_unsigned_integer = max(is_signed_v<A> ? 0 : sizeof(A), is_signed_v<B> ? 0 : sizeof(B));
     static constexpr size_t max_size_of_signed_integer = max(is_signed_v<A> ? sizeof(A) : 0, is_signed_v<B> ? sizeof(B) : 0);
-    static constexpr size_t max_size_of_integer = max(is_integer_v<A> ? sizeof(A) : 0, is_integer_v<B> ? sizeof(B) : 0);
+    static constexpr size_t max_size_of_integer = max(is_integer<A> ? sizeof(A) : 0, is_integer<B> ? sizeof(B) : 0);
     static constexpr size_t max_size_of_float = max(std::is_floating_point_v<A> ? sizeof(A) : 0, std::is_floating_point_v<B> ? sizeof(B) : 0);
 
     using ConstructedType = typename Construct<has_signed, has_float,
@@ -190,9 +190,9 @@ struct ResultOfIf
 
     using Type =
         std::conditional_t<std::is_same_v<A, B>, A,
-        std::conditional_t<IsDecimalNumber<A> && IsDecimalNumber<B>,
+        std::conditional_t<is_decimal<A> && is_decimal<B>,
             std::conditional_t<(sizeof(A) > sizeof(B)), A, B>,
-        std::conditional_t<!IsDecimalNumber<A> && !IsDecimalNumber<B>,
+        std::conditional_t<!is_decimal<A> && !is_decimal<B>,
             ConstructedType, Error>>>;
 };
 
diff --git a/src/DataTypes/Serializations/SerializationNumber.cpp b/src/DataTypes/Serializations/SerializationNumber.cpp
index 347db5d0aa5..7e8e99f76d0 100644
--- a/src/DataTypes/Serializations/SerializationNumber.cpp
+++ b/src/DataTypes/Serializations/SerializationNumber.cpp
@@ -25,7 +25,7 @@ void SerializationNumber<T>::deserializeText(IColumn & column, ReadBuffer & istr
 {
     T x;
 
-    if constexpr (is_integer_v<T> && is_arithmetic_v<T>)
+    if constexpr (is_integer<T> && is_arithmetic_v<T>)
         readIntTextUnsafe(x, istr);
     else
         readText(x, istr);
diff --git a/src/Dictionaries/DictionaryHelpers.h b/src/Dictionaries/DictionaryHelpers.h
index 0c04d87c959..4ed3b74226e 100644
--- a/src/Dictionaries/DictionaryHelpers.h
+++ b/src/Dictionaries/DictionaryHelpers.h
@@ -240,8 +240,7 @@ public:
     using ColumnType =
         std::conditional_t<std::is_same_v<DictionaryAttributeType, Array>, ColumnArray,
             std::conditional_t<std::is_same_v<DictionaryAttributeType, String>, ColumnString,
-                std::conditional_t<IsDecimalNumber<DictionaryAttributeType>, ColumnDecimal<DictionaryAttributeType>,
-                    ColumnVector<DictionaryAttributeType>>>>;
+                ColumnVectorOrDecimal<DictionaryAttributeType>>>;
 
     using ColumnPtr = typename ColumnType::MutablePtr;
 
@@ -267,7 +266,7 @@ public:
         {
             return ColumnType::create(size);
         }
-        else if constexpr (IsDecimalNumber<DictionaryAttributeType>)
+        else if constexpr (is_decimal<DictionaryAttributeType>)
         {
             auto nested_type = removeNullable(dictionary_attribute.type);
             auto scale = getDecimalScale(*nested_type);
diff --git a/src/Dictionaries/DictionaryStructure.h b/src/Dictionaries/DictionaryStructure.h
index 077ea214d0a..e6a243a8ed5 100644
--- a/src/Dictionaries/DictionaryStructure.h
+++ b/src/Dictionaries/DictionaryStructure.h
@@ -12,6 +12,7 @@
 #include <DataTypes/IDataType.h>
 #include <Interpreters/IExternalLoadable.h>
 #include <common/EnumReflection.h>
+#include <Core/TypeId.h>
 
 #if defined(__GNUC__)
     /// GCC mistakenly warns about the names in enum class.
@@ -22,7 +23,10 @@ namespace DB
 {
 using TypeIndexUnderlying = magic_enum::underlying_type_t<TypeIndex>;
 
-/// We need to be able to map TypeIndex -> AttributeUnderlyingType and AttributeUnderlyingType -> real type
+// We need to be able to map TypeIndex -> AttributeUnderlyingType and AttributeUnderlyingType -> real type
+// The first can be done by defining AttributeUnderlyingType enum values to TypeIndex values and then performing
+// a enum_cast.
+// The second can be achieved by using ReverseTypeId
 #define map_item(__T) __T = static_cast<TypeIndexUnderlying>(TypeIndex::__T)
 
 enum class AttributeUnderlyingType : TypeIndexUnderlying
@@ -65,26 +69,23 @@ struct DictionaryAttribute final
     const bool is_nullable;
 };
 
-struct T { using AttributeType = int; };
+template <AttributeUnderlyingType type>
+struct DictionaryAttributeType
+{
+    /// Converts @c type to it underlying type e.g. AttributeUnderlyingType::UInt8 -> UInt8
+    using AttributeType = ReverseTypeId<
+        static_cast<TypeIndex>(
+            static_cast<TypeIndexUnderlying>(type))>;
+};
 
 template <typename F>
-void callOnDictionaryAttributeType(AttributeUnderlyingType type, F && func)
+constexpr void callOnDictionaryAttributeType(AttributeUnderlyingType type, F && func)
 {
-//    for (AttributeUnderlyingType other : magic_enum::enum_values<AttributeUnderlyingType>())
-//        if (type == other)
-//        {
-//
-//        }
-//
-//    switch (type)
-//    {
-//#define M(TYPE) \
-//        case AttributeUnderlyingType::TYPE: \
-//            func(DictionaryAttributeType<AttributeUnderlyingType::TYPE>()); \
-//            break;
-//    FOR_ATTRIBUTE_TYPES(M)
-//#undef M
-//    }
+    static_for<AttributeUnderlyingType>([type, func = std::forward<F>(func)](auto other)
+    {
+        if (type == other)
+            func(DictionaryAttributeType<other>{});
+    });
 };
 
 struct DictionarySpecialAttribute final
diff --git a/src/Functions/DivisionUtils.h b/src/Functions/DivisionUtils.h
index f10e15c1574..aa6c699fffc 100644
--- a/src/Functions/DivisionUtils.h
+++ b/src/Functions/DivisionUtils.h
@@ -81,7 +81,7 @@ struct DivideIntegralImpl
 
         /// Otherwise overflow may occur due to integer promotion. Example: int8_t(-1) / uint64_t(2).
         /// NOTE: overflow is still possible when dividing large signed number to large unsigned number or vice-versa. But it's less harmful.
-        if constexpr (is_integer_v<A> && is_integer_v<B> && (is_signed_v<A> || is_signed_v<B>))
+        if constexpr (is_integer<A> && is_integer<B> && (is_signed_v<A> || is_signed_v<B>))
         {
             using SignedCastA = make_signed_t<CastA>;
             using SignedCastB = std::conditional_t<sizeof(A) <= sizeof(B), make_signed_t<CastB>, SignedCastA>;
diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index f16112d8b3b..07bd555e549 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -186,7 +186,7 @@ enum class OpCase { Vector, LeftConstant, RightConstant };
 template <class T>
 inline constexpr const auto & undec(const T & x)
 {
-    if constexpr (IsDecimalNumber<T>)
+    if constexpr (is_decimal<T>)
         return x.value;
     else
         return x;
@@ -301,9 +301,9 @@ struct DecimalBinaryOperation
 {
 private:
     using ResultType = OpResultType; // e.g. Decimal32
-    using NativeResultType = typename NativeType<ResultType>::Type; // e.g. UInt32 for Decimal32
+    using NativeResultType = NativeType<ResultType>; // e.g. UInt32 for Decimal32
 
-    using ResultContainerType = typename std::conditional_t<IsDecimalNumber<ResultType>,
+    using ResultContainerType = typename std::conditional_t<is_decimal<ResultType>,
         ColumnDecimal<ResultType>,
         ColumnVector<ResultType>>::Container;
 
@@ -312,8 +312,8 @@ public:
     static void NO_INLINE process(const A & a, const B & b, ResultContainerType & c,
         NativeResultType scale_a, NativeResultType scale_b)
     {
-        if constexpr (op_case == OpCase::LeftConstant) static_assert(!IsDecimalNumber<A>);
-        if constexpr (op_case == OpCase::RightConstant) static_assert(!IsDecimalNumber<B>);
+        if constexpr (op_case == OpCase::LeftConstant) static_assert(!is_decimal<A>);
+        if constexpr (op_case == OpCase::RightConstant) static_assert(!is_decimal<B>);
 
         size_t size;
 
@@ -384,8 +384,8 @@ public:
     template <bool is_decimal_a, bool is_decimal_b, class A, class B>
     static ResultType process(A a, B b, NativeResultType scale_a, NativeResultType scale_b)
     {
-        static_assert(!IsDecimalNumber<A>);
-        static_assert(!IsDecimalNumber<B>);
+        static_assert(!is_decimal<A>);
+        static_assert(!is_decimal<B>);
 
         if constexpr (is_division && is_decimal_b)
             return applyScaledDiv<is_decimal_a>(a, b, scale_a);
@@ -791,11 +791,11 @@ class FunctionBinaryArithmetic : public IFunction
     static auto helperGetOrConvert(const CC & col_const, const C & col)
     {
         using ResultType = typename ResultDataType::FieldType;
-        using NativeResultType = typename NativeType<ResultType>::Type;
+        using NativeResultType = NativeType<ResultType>;
 
-        if constexpr (IsFloatingPoint<ResultDataType> && IsDecimalNumber<T>)
+        if constexpr (is_floating_point<ResultDataType> && is_decimal<T>)
             return DecimalUtils::convertTo<NativeResultType>(col_const->template getValue<T>(), col.getScale());
-        else if constexpr (IsDecimalNumber<T>)
+        else if constexpr (is_decimal<T>)
             return col_const->template getValue<T>().value;
         else
             return col_const->template getValue<T>();
@@ -823,15 +823,15 @@ class FunctionBinaryArithmetic : public IFunction
         using T1 = typename RightDataType::FieldType;
         using ResultType = typename ResultDataType::FieldType;
 
-        using NativeResultType = typename NativeType<ResultType>::Type;
+        using NativeResultType = NativeType<ResultType>;
         using OpImpl = DecimalBinaryOperation<Op, ResultType, false>;
         using OpImplCheck = DecimalBinaryOperation<Op, ResultType, true>;
 
-        using ColVecResult = std::conditional_t<IsDecimalNumber<ResultType>,
+        using ColVecResult = std::conditional_t<is_decimal<ResultType>,
             ColumnDecimal<ResultType>, ColumnVector<ResultType>>;
 
-        static constexpr const bool left_is_decimal = IsDecimalNumber<T0>;
-        static constexpr const bool right_is_decimal = IsDecimalNumber<T1>;
+        static constexpr const bool left_is_decimal = is_decimal<T0>;
+        static constexpr const bool right_is_decimal = is_decimal<T1>;
         static constexpr const bool result_is_decimal = IsDataTypeDecimal<ResultDataType>;
 
         typename ColVecResult::MutablePtr col_res = nullptr;
@@ -1178,9 +1178,9 @@ public:
             using T0 = typename LeftDataType::FieldType;
             using T1 = typename RightDataType::FieldType;
             using ResultType = typename ResultDataType::FieldType;
-            using ColVecT0 = std::conditional_t<IsDecimalNumber<T0>, ColumnDecimal<T0>, ColumnVector<T0>>;
-            using ColVecT1 = std::conditional_t<IsDecimalNumber<T1>, ColumnDecimal<T1>, ColumnVector<T1>>;
-            using ColVecResult = std::conditional_t<IsDecimalNumber<ResultType>, ColumnDecimal<ResultType>, ColumnVector<ResultType>>;
+            using ColVecT0 = ColumnVectorOrDecimal<T0>;
+            using ColVecT1 = ColumnVectorOrDecimal<T1>;
+            using ColVecResult = ColumnVectorOrDecimal<ResultType>;
 
             const auto * const col_left_raw = arguments[0].column.get();
             const auto * const col_right_raw = arguments[1].column.get();
diff --git a/src/Functions/FunctionHelpers.h b/src/Functions/FunctionHelpers.h
index 5fc8a06681a..15711621075 100644
--- a/src/Functions/FunctionHelpers.h
+++ b/src/Functions/FunctionHelpers.h
@@ -68,13 +68,13 @@ const ColumnConst * checkAndGetColumnConstStringOrFixedString(const IColumn * co
 
 /// Transform anything to Field.
 template <typename T>
-inline std::enable_if_t<!IsDecimalNumber<T>, Field> toField(const T & x)
+Field toField(const T & x)
 {
     return Field(NearestFieldType<T>(x));
 }
 
-template <typename T>
-inline std::enable_if_t<IsDecimalNumber<T>, Field> toField(const T & x, UInt32 scale)
+template <is_decimal T>
+Field toField(const T & x, UInt32 scale)
 {
     return Field(NearestFieldType<T>(x, scale));
 }
diff --git a/src/Functions/FunctionMathUnary.h b/src/Functions/FunctionMathUnary.h
index 0c840bae2a3..85a024d3762 100644
--- a/src/Functions/FunctionMathUnary.h
+++ b/src/Functions/FunctionMathUnary.h
@@ -150,7 +150,7 @@ private:
             using Types = std::decay_t<decltype(types)>;
             using Type = typename Types::RightType;
             using ReturnType = std::conditional_t<Impl::always_returns_float64 || !std::is_floating_point_v<Type>, Float64, Type>;
-            using ColVecType = std::conditional_t<IsDecimalNumber<Type>, ColumnDecimal<Type>, ColumnVector<Type>>;
+            using ColVecType = ColumnVectorOrDecimal<Type>;
 
             const auto col_vec = checkAndGetColumn<ColVecType>(col.column.get());
             return (res = execute<Type, ReturnType>(col_vec)) != nullptr;
diff --git a/src/Functions/FunctionUnaryArithmetic.h b/src/Functions/FunctionUnaryArithmetic.h
index f85eff3f3dd..31227b5b126 100644
--- a/src/Functions/FunctionUnaryArithmetic.h
+++ b/src/Functions/FunctionUnaryArithmetic.h
@@ -38,8 +38,8 @@ template <typename A, typename Op>
 struct UnaryOperationImpl
 {
     using ResultType = typename Op::ResultType;
-    using ColVecA = std::conditional_t<IsDecimalNumber<A>, ColumnDecimal<A>, ColumnVector<A>>;
-    using ColVecC = std::conditional_t<IsDecimalNumber<ResultType>, ColumnDecimal<ResultType>, ColumnVector<ResultType>>;
+    using ColVecA = ColumnVectorOrDecimal<A>;
+    using ColVecC = ColumnVectorOrDecimal<ResultType>;
     using ArrayA = typename ColVecA::Container;
     using ArrayC = typename ColVecC::Container;
 
diff --git a/src/Functions/FunctionsConversion.h b/src/Functions/FunctionsConversion.h
index ce4dcd1e215..6ba2c7e02a5 100644
--- a/src/Functions/FunctionsConversion.h
+++ b/src/Functions/FunctionsConversion.h
@@ -764,7 +764,7 @@ template <typename FromDataType, typename Name>
 struct ConvertImpl<FromDataType, std::enable_if_t<!std::is_same_v<FromDataType, DataTypeString>, DataTypeString>, Name, ConvertDefaultBehaviorTag>
 {
     using FromFieldType = typename FromDataType::FieldType;
-    using ColVecType = std::conditional_t<IsDecimalNumber<FromFieldType>, ColumnDecimal<FromFieldType>, ColumnVector<FromFieldType>>;
+    using ColVecType = ColumnVectorOrDecimal<FromFieldType>;
 
     static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/)
     {
@@ -1699,9 +1699,9 @@ private:
                 using RightT = typename RightDataType::FieldType;
 
                 static constexpr bool bad_left =
-                    IsDecimalNumber<LeftT> || std::is_floating_point_v<LeftT> || is_big_int_v<LeftT> || is_signed_v<LeftT>;
+                    is_decimal<LeftT> || std::is_floating_point_v<LeftT> || is_big_int_v<LeftT> || is_signed_v<LeftT>;
                 static constexpr bool bad_right =
-                    IsDecimalNumber<RightT> || std::is_floating_point_v<RightT> || is_big_int_v<RightT> || is_signed_v<RightT>;
+                    is_decimal<RightT> || std::is_floating_point_v<RightT> || is_big_int_v<RightT> || is_signed_v<RightT>;
 
                 /// Disallow int vs UUID conversion (but support int vs UInt128 conversion)
                 if constexpr ((bad_left && std::is_same_v<RightDataType, DataTypeUUID>) ||
diff --git a/src/Functions/FunctionsHashing.h b/src/Functions/FunctionsHashing.h
index 4c6f1485813..10f0fc99a45 100644
--- a/src/Functions/FunctionsHashing.h
+++ b/src/Functions/FunctionsHashing.h
@@ -635,7 +635,7 @@ private:
     template <typename FromType>
     ColumnPtr executeType(const ColumnsWithTypeAndName & arguments) const
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<FromType>, ColumnDecimal<FromType>, ColumnVector<FromType>>;
+        using ColVecType = ColumnVectorOrDecimal<FromType>;
 
         if (const ColVecType * col_from = checkAndGetColumn<ColVecType>(arguments[0].column.get()))
         {
@@ -762,7 +762,7 @@ private:
     template <typename FromType, bool first>
     void executeIntType(const IColumn * column, typename ColumnVector<ToType>::Container & vec_to) const
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<FromType>, ColumnDecimal<FromType>, ColumnVector<FromType>>;
+        using ColVecType = ColumnVectorOrDecimal<FromType>;
 
         if (const ColVecType * col_from = checkAndGetColumn<ColVecType>(column))
         {
@@ -819,7 +819,7 @@ private:
     template <typename FromType, bool first>
     void executeBigIntType(const IColumn * column, typename ColumnVector<ToType>::Container & vec_to) const
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<FromType>, ColumnDecimal<FromType>, ColumnVector<FromType>>;
+        using ColVecType = ColumnVectorOrDecimal<FromType>;
 
         if (const ColVecType * col_from = checkAndGetColumn<ColVecType>(column))
         {
diff --git a/src/Functions/FunctionsJSON.h b/src/Functions/FunctionsJSON.h
index df17a39812b..68a29615fa8 100644
--- a/src/Functions/FunctionsJSON.h
+++ b/src/Functions/FunctionsJSON.h
@@ -522,7 +522,7 @@ public:
             else if (!accurate::convertNumeric(element.getDouble(), value))
                 return false;
         }
-        else if (element.isBool() && is_integer_v<NumberType> && convert_bool_to_integer)
+        else if (element.isBool() && is_integer<NumberType> && convert_bool_to_integer)
         {
             value = static_cast<NumberType>(element.getBool());
         }
diff --git a/src/Functions/FunctionsRound.h b/src/Functions/FunctionsRound.h
index 7b57426d751..820107da515 100644
--- a/src/Functions/FunctionsRound.h
+++ b/src/Functions/FunctionsRound.h
@@ -315,11 +315,11 @@ template <typename T, RoundingMode rounding_mode, ScaleMode scale_mode>
 struct FloatRoundingImpl
 {
 private:
-    static_assert(!IsDecimalNumber<T>);
+    static_assert(!is_decimal<T>);
 
     using Op = FloatRoundingComputation<T, rounding_mode, scale_mode>;
     using Data = std::array<T, Op::data_count>;
-    using ColumnType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+    using ColumnType = ColumnVector<T>;
     using Container = typename ColumnType::Container;
 
 public:
@@ -413,12 +413,10 @@ public:
 };
 
 
-template <typename T, RoundingMode rounding_mode, TieBreakingMode tie_breaking_mode>
+template <is_decimal T, RoundingMode rounding_mode, TieBreakingMode tie_breaking_mode>
 class DecimalRoundingImpl
 {
 private:
-    static_assert(IsDecimalNumber<T>);
-
     using NativeType = typename T::NativeType;
     using Op = IntegerRoundingComputation<NativeType, rounding_mode, ScaleMode::Negative, tie_breaking_mode>;
     using Container = typename ColumnDecimal<T>::Container;
@@ -507,7 +505,7 @@ public:
     {
         if constexpr (is_arithmetic_v<T>)
             return apply(checkAndGetColumn<ColumnVector<T>>(column), scale_arg);
-        else if constexpr (IsDecimalNumber<T>)
+        else if constexpr (is_decimal<T>)
             return apply(checkAndGetColumn<ColumnDecimal<T>>(column), scale_arg);
     }
 };
diff --git a/src/Functions/GatherUtils/Algorithms.h b/src/Functions/GatherUtils/Algorithms.h
index fd59cbd19aa..e452c8a5418 100644
--- a/src/Functions/GatherUtils/Algorithms.h
+++ b/src/Functions/GatherUtils/Algorithms.h
@@ -34,7 +34,7 @@ void writeSlice(const NumericArraySlice<T> & slice, NumericArraySink<T> & sink)
 template <typename T, typename U>
 void writeSlice(const NumericArraySlice<T> & slice, NumericArraySink<U> & sink)
 {
-    using NativeU = typename NativeType<U>::Type;
+    using NativeU = NativeType<U>;
 
     sink.elements.resize(sink.current_offset + slice.size);
     for (size_t i = 0; i < slice.size; ++i)
@@ -42,9 +42,9 @@ void writeSlice(const NumericArraySlice<T> & slice, NumericArraySink<U> & sink)
         const auto & src = slice.data[i];
         auto & dst = sink.elements[sink.current_offset];
 
-        if constexpr (OverBigInt<T> || OverBigInt<U>)
+        if constexpr (is_over_big_int<T> || is_over_big_int<U>)
         {
-            if constexpr (IsDecimalNumber<T>)
+            if constexpr (is_decimal<T>)
                 dst = static_cast<NativeU>(src.value);
             else
                 dst = static_cast<NativeU>(src);
@@ -99,7 +99,7 @@ inline ALWAYS_INLINE void writeSlice(const NumericArraySlice<T> & slice, Generic
 {
     for (size_t i = 0; i < slice.size; ++i)
     {
-        if constexpr (IsDecimalNumber<T>)
+        if constexpr (is_decimal<T>)
         {
             DecimalField field(T(slice.data[i]), 0); /// TODO: Decimal scale
             sink.elements.insert(field);
@@ -558,9 +558,9 @@ bool sliceEqualElements(const NumericArraySlice<T> & first [[maybe_unused]],
                         size_t second_ind [[maybe_unused]])
 {
     /// TODO: Decimal scale
-    if constexpr (IsDecimalNumber<T> && IsDecimalNumber<U>)
+    if constexpr (is_decimal<T> && is_decimal<U>)
         return accurate::equalsOp(first.data[first_ind].value, second.data[second_ind].value);
-    else if constexpr (IsDecimalNumber<T> || IsDecimalNumber<U>)
+    else if constexpr (is_decimal<T> || is_decimal<U>)
         return false;
     else
         return accurate::equalsOp(first.data[first_ind], second.data[second_ind]);
@@ -588,7 +588,7 @@ bool insliceEqualElements(const NumericArraySlice<T> & first [[maybe_unused]],
                           size_t first_ind [[maybe_unused]],
                           size_t second_ind [[maybe_unused]])
 {
-    if constexpr (IsDecimalNumber<T>)
+    if constexpr (is_decimal<T>)
         return accurate::equalsOp(first.data[first_ind].value, first.data[second_ind].value);
     else
         return accurate::equalsOp(first.data[first_ind], first.data[second_ind]);
diff --git a/src/Functions/GatherUtils/Sinks.h b/src/Functions/GatherUtils/Sinks.h
index fb1792585ae..e801ba9990c 100644
--- a/src/Functions/GatherUtils/Sinks.h
+++ b/src/Functions/GatherUtils/Sinks.h
@@ -36,7 +36,7 @@ struct NullableValueSource;
 template <typename T>
 struct NumericArraySink : public ArraySinkImpl<NumericArraySink<T>>
 {
-    using ColVecType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+    using ColVecType = ColumnVectorOrDecimal<T>;
     using CompatibleArraySource = NumericArraySource<T>;
     using CompatibleValueSource = NumericValueSource<T>;
 
diff --git a/src/Functions/GatherUtils/Sources.h b/src/Functions/GatherUtils/Sources.h
index 86b590646dc..c8014d3e855 100644
--- a/src/Functions/GatherUtils/Sources.h
+++ b/src/Functions/GatherUtils/Sources.h
@@ -39,7 +39,7 @@ template <typename ArraySink> struct NullableArraySink;
 template <typename T>
 struct NumericArraySource : public ArraySourceImpl<NumericArraySource<T>>
 {
-    using ColVecType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+    using ColVecType = ColumnVectorOrDecimal<T>;
     using Slice = NumericArraySlice<T>;
     using Column = ColumnArray;
 
@@ -720,7 +720,7 @@ template <typename T>
 struct NumericValueSource : ValueSourceImpl<NumericValueSource<T>>
 {
     using Slice = NumericValueSlice<T>;
-    using Column = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+    using Column = ColumnVectorOrDecimal<T>;
 
     using SinkType = NumericArraySink<T>;
 
diff --git a/src/Functions/GatherUtils/createArraySink.cpp b/src/Functions/GatherUtils/createArraySink.cpp
index 90983c9c25c..c2f2530a318 100644
--- a/src/Functions/GatherUtils/createArraySink.cpp
+++ b/src/Functions/GatherUtils/createArraySink.cpp
@@ -18,7 +18,7 @@ struct ArraySinkCreator<Type, Types...>
 {
     static std::unique_ptr<IArraySink> create(IColumn & values, ColumnArray::Offsets & offsets, size_t column_size)
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<Type>, ColumnDecimal<Type>, ColumnVector<Type>>;
+        using ColVecType = ColumnVectorOrDecimal<Type>;
 
         IColumn * not_null_values = &values;
         bool is_nullable = false;
diff --git a/src/Functions/GatherUtils/createArraySource.cpp b/src/Functions/GatherUtils/createArraySource.cpp
index d98a72e456f..ae672aa16af 100644
--- a/src/Functions/GatherUtils/createArraySource.cpp
+++ b/src/Functions/GatherUtils/createArraySource.cpp
@@ -18,7 +18,7 @@ struct ArraySourceCreator<Type, Types...>
 {
     static std::unique_ptr<IArraySource> create(const ColumnArray & col, const NullMap * null_map, bool is_const, size_t total_rows)
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<Type>, ColumnDecimal<Type>, ColumnVector<Type>>;
+        using ColVecType = ColumnVectorOrDecimal<Type>;
 
         if (typeid_cast<const ColVecType *>(&col.getData()))
         {
diff --git a/src/Functions/GatherUtils/createValueSource.cpp b/src/Functions/GatherUtils/createValueSource.cpp
index 4f538b95369..29c36f2728e 100644
--- a/src/Functions/GatherUtils/createValueSource.cpp
+++ b/src/Functions/GatherUtils/createValueSource.cpp
@@ -18,7 +18,7 @@ struct ValueSourceCreator<Type, Types...>
 {
     static std::unique_ptr<IValueSource> create(const IColumn & col, const NullMap * null_map, bool is_const, size_t total_rows)
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<Type>, ColumnDecimal<Type>, ColumnVector<Type>>;
+        using ColVecType = ColumnVectorOrDecimal<Type>;
 
         if (auto column_vector = typeid_cast<const ColVecType *>(&col))
         {
diff --git a/src/Functions/GregorianDate.h b/src/Functions/GregorianDate.h
index 5f179483b53..2c1caa6523b 100644
--- a/src/Functions/GregorianDate.h
+++ b/src/Functions/GregorianDate.h
@@ -38,14 +38,14 @@ namespace DB
           * integral type which should be at least 32 bits wide, and
           * should preferably signed.
           */
-        template <typename T, std::enable_if_t<is_integer_v<T>> * = nullptr>
+        template <typename T, std::enable_if_t<is_integer<T>> * = nullptr>
         GregorianDate(T mjd);
 
         /** Convert to Modified Julian Day. The type T is an integral type
           * which should be at least 32 bits wide, and should preferably
           * signed.
           */
-        template <typename T, std::enable_if_t<is_integer_v<T>> * = nullptr>
+        template <typename T, std::enable_if_t<is_integer<T>> * = nullptr>
         T toModifiedJulianDay() const;
 
         /** Write the date in text form 'YYYY-MM-DD' to a buffer.
@@ -90,14 +90,14 @@ namespace DB
           * integral type which should be at least 32 bits wide, and
           * should preferably signed.
           */
-        template <typename T, std::enable_if_t<is_integer_v<T>> * = nullptr>
+        template <typename T, std::enable_if_t<is_integer<T>> * = nullptr>
         OrdinalDate(T mjd);
 
         /** Convert to Modified Julian Day. The type T is an integral
           * type which should be at least 32 bits wide, and should
           * preferably be signed.
           */
-        template <typename T, std::enable_if_t<is_integer_v<T>> * = nullptr>
+        template <typename T, std::enable_if_t<is_integer<T>> * = nullptr>
         T toModifiedJulianDay() const noexcept;
 
         YearT year() const noexcept
@@ -259,7 +259,7 @@ namespace DB
     }
 
     template <typename YearT>
-    template <typename T, std::enable_if_t<is_integer_v<T>> *>
+    template <typename T, std::enable_if_t<is_integer<T>> *>
     GregorianDate<YearT>::GregorianDate(T mjd)
     {
         const OrdinalDate<YearT> ord(mjd);
@@ -270,7 +270,7 @@ namespace DB
     }
 
     template <typename YearT>
-    template <typename T, std::enable_if_t<is_integer_v<T>> *>
+    template <typename T, std::enable_if_t<is_integer<T>> *>
     T GregorianDate<YearT>::toModifiedJulianDay() const
     {
         const MonthDay md(month_, day_of_month_);
@@ -332,7 +332,7 @@ namespace DB
     }
 
     template <typename YearT>
-    template <typename T, std::enable_if_t<is_integer_v<T>> *>
+    template <typename T, std::enable_if_t<is_integer<T>> *>
     OrdinalDate<YearT>::OrdinalDate(T mjd)
     {
         const auto a         = mjd + 678575;
@@ -348,7 +348,7 @@ namespace DB
     }
 
     template <typename YearT>
-    template <typename T, std::enable_if_t<is_integer_v<T>> *>
+    template <typename T, std::enable_if_t<is_integer<T>> *>
     T OrdinalDate<YearT>::toModifiedJulianDay() const noexcept
     {
         const auto y = year_ - 1;
diff --git a/src/Functions/abs.cpp b/src/Functions/abs.cpp
index 10664f7b421..11afd2e8850 100644
--- a/src/Functions/abs.cpp
+++ b/src/Functions/abs.cpp
@@ -9,18 +9,18 @@ namespace DB
 template <typename A>
 struct AbsImpl
 {
-    using ResultType = std::conditional_t<IsDecimalNumber<A>, A, typename NumberTraits::ResultOfAbs<A>::Type>;
+    using ResultType = std::conditional_t<is_decimal<A>, A, typename NumberTraits::ResultOfAbs<A>::Type>;
     static const constexpr bool allow_fixed_string = false;
 
     static inline NO_SANITIZE_UNDEFINED ResultType apply(A a)
     {
-        if constexpr (IsDecimalNumber<A>)
+        if constexpr (is_decimal<A>)
             return a < A(0) ? A(-a) : a;
         else if constexpr (is_big_int_v<A> && is_signed_v<A>)
             return (a < 0) ? -a : a;
-        else if constexpr (is_integer_v<A> && is_signed_v<A>)
+        else if constexpr (is_integer<A> && is_signed_v<A>)
             return a < 0 ? static_cast<ResultType>(~a) + 1 : static_cast<ResultType>(a);
-        else if constexpr (is_integer_v<A> && is_unsigned_v<A>)
+        else if constexpr (is_integer<A> && is_unsigned_v<A>)
             return static_cast<ResultType>(a);
         else if constexpr (std::is_floating_point_v<A>)
             return static_cast<ResultType>(std::abs(a));
diff --git a/src/Functions/array/arrayAggregation.cpp b/src/Functions/array/arrayAggregation.cpp
index 3d40dfe83ea..dec673af727 100644
--- a/src/Functions/array/arrayAggregation.cpp
+++ b/src/Functions/array/arrayAggregation.cpp
@@ -71,7 +71,7 @@ struct ArrayAggregateResultImpl<ArrayElement, AggregateOperation::sum>
         std::conditional_t<std::is_same_v<ArrayElement, UInt128>, UInt128,
         std::conditional_t<std::is_same_v<ArrayElement, Int256>, Int256,
         std::conditional_t<std::is_same_v<ArrayElement, UInt256>, UInt256,
-        std::conditional_t<IsDecimalNumber<ArrayElement>, Decimal128,
+        std::conditional_t<is_decimal<ArrayElement>, Decimal128,
         std::conditional_t<std::is_floating_point_v<ArrayElement>, Float64,
         std::conditional_t<std::is_signed_v<ArrayElement>, Int64,
             UInt64>>>>>>>;
@@ -135,8 +135,8 @@ struct ArrayAggregateImpl
     static NO_SANITIZE_UNDEFINED bool executeType(const ColumnPtr & mapped, const ColumnArray::Offsets & offsets, ColumnPtr & res_ptr)
     {
         using ResultType = ArrayAggregateResult<Element, aggregate_operation>;
-        using ColVecType = std::conditional_t<IsDecimalNumber<Element>, ColumnDecimal<Element>, ColumnVector<Element>>;
-        using ColVecResultType = std::conditional_t<IsDecimalNumber<ResultType>, ColumnDecimal<ResultType>, ColumnVector<ResultType>>;
+        using ColVecType = ColumnVectorOrDecimal<Element>;
+        using ColVecResultType = ColumnVectorOrDecimal<ResultType>;
 
         /// For average and product of array we return Float64 as result, but we want to keep precision
         /// so we convert to Float64 as last step, but intermediate value is represented as result of sum operation
@@ -160,7 +160,7 @@ struct ArrayAggregateImpl
             const auto & data = checkAndGetColumn<ColVecType>(&column_const->getDataColumn())->getData();
 
             typename ColVecResultType::MutablePtr res_column;
-            if constexpr (IsDecimalNumber<Element>)
+            if constexpr (is_decimal<Element>)
                 res_column = ColVecResultType::create(offsets.size(), data.getScale());
             else
                 res_column = ColVecResultType::create(offsets.size());
@@ -183,7 +183,7 @@ struct ArrayAggregateImpl
                 }
                 else if constexpr (aggregate_operation == AggregateOperation::average)
                 {
-                    if constexpr (IsDecimalNumber<Element>)
+                    if constexpr (is_decimal<Element>)
                     {
                         res[i] = DecimalUtils::convertTo<ResultType>(x, data.getScale());
                     }
@@ -197,7 +197,7 @@ struct ArrayAggregateImpl
                     size_t array_size = offsets[i] - pos;
                     AggregationType product = x;
 
-                    if constexpr (IsDecimalNumber<Element>)
+                    if constexpr (is_decimal<Element>)
                     {
                         using T = decltype(x.value);
                         T x_val = x.value;
@@ -235,7 +235,7 @@ struct ArrayAggregateImpl
         const auto & data = column->getData();
 
         typename ColVecResultType::MutablePtr res_column;
-        if constexpr (IsDecimalNumber<Element>)
+        if constexpr (is_decimal<Element>)
             res_column = ColVecResultType::create(offsets.size(), data.getScale());
         else
             res_column = ColVecResultType::create(offsets.size());
@@ -250,7 +250,7 @@ struct ArrayAggregateImpl
             /// Array is empty
             if (offsets[i] == pos)
             {
-                if constexpr (IsDecimalNumber<AggregationType>)
+                if constexpr (is_decimal<AggregationType>)
                     res[i] = aggregate_value.value;
                 else
                     res[i] = aggregate_value;
@@ -286,7 +286,7 @@ struct ArrayAggregateImpl
                 }
                 else if constexpr (aggregate_operation == AggregateOperation::product)
                 {
-                    if constexpr (IsDecimalNumber<Element>)
+                    if constexpr (is_decimal<Element>)
                     {
                         using AggregateValueDecimalUnderlyingValue = decltype(aggregate_value.value);
                         AggregateValueDecimalUnderlyingValue current_aggregate_value = aggregate_value.value;
@@ -306,7 +306,7 @@ struct ArrayAggregateImpl
 
             if constexpr (aggregate_operation == AggregateOperation::average)
             {
-                if constexpr (IsDecimalNumber<Element>)
+                if constexpr (is_decimal<Element>)
                 {
                     aggregate_value = aggregate_value / AggregationType(count);
                     res[i] = DecimalUtils::convertTo<ResultType>(aggregate_value, data.getScale());
@@ -316,7 +316,7 @@ struct ArrayAggregateImpl
                     res[i] = static_cast<ResultType>(aggregate_value) / count;
                 }
             }
-            else if constexpr (aggregate_operation == AggregateOperation::product && IsDecimalNumber<Element>)
+            else if constexpr (aggregate_operation == AggregateOperation::product && is_decimal<Element>)
             {
                 auto result_scale = data.getScale() * count;
 
diff --git a/src/Functions/array/arrayCompact.cpp b/src/Functions/array/arrayCompact.cpp
index e0f73207da8..ac8bc10db84 100644
--- a/src/Functions/array/arrayCompact.cpp
+++ b/src/Functions/array/arrayCompact.cpp
@@ -29,7 +29,7 @@ struct ArrayCompactImpl
     template <typename T>
     static bool executeType(const ColumnPtr & mapped, const ColumnArray & array, ColumnPtr & res_ptr)
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+        using ColVecType = ColumnVectorOrDecimal<T>;
 
         const ColVecType * src_values_column = checkAndGetColumn<ColVecType>(mapped.get());
 
@@ -40,7 +40,7 @@ struct ArrayCompactImpl
         const typename ColVecType::Container & src_values = src_values_column->getData();
 
         typename ColVecType::MutablePtr res_values_column;
-        if constexpr (IsDecimalNumber<T>)
+        if constexpr (is_decimal<T>)
             res_values_column = ColVecType::create(src_values.size(), src_values.getScale());
         else
             res_values_column = ColVecType::create(src_values.size());
diff --git a/src/Functions/array/arrayCumSum.cpp b/src/Functions/array/arrayCumSum.cpp
index 9a6eafb8822..da8ef3d7852 100644
--- a/src/Functions/array/arrayCumSum.cpp
+++ b/src/Functions/array/arrayCumSum.cpp
@@ -83,8 +83,8 @@ struct ArrayCumSumImpl
     template <typename Element, typename Result>
     static bool executeType(const ColumnPtr & mapped, const ColumnArray & array, ColumnPtr & res_ptr)
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<Element>, ColumnDecimal<Element>, ColumnVector<Element>>;
-        using ColVecResult = std::conditional_t<IsDecimalNumber<Result>, ColumnDecimal<Result>, ColumnVector<Result>>;
+        using ColVecType = ColumnVectorOrDecimal<Element>;
+        using ColVecResult = ColumnVectorOrDecimal<Result>;
 
         const ColVecType * column = checkAndGetColumn<ColVecType>(&*mapped);
 
@@ -99,7 +99,7 @@ struct ArrayCumSumImpl
             const IColumn::Offsets & offsets = array.getOffsets();
 
             typename ColVecResult::MutablePtr res_nested;
-            if constexpr (IsDecimalNumber<Element>)
+            if constexpr (is_decimal<Element>)
             {
                 const typename ColVecType::Container & data =
                     checkAndGetColumn<ColVecType>(&column_const->getDataColumn())->getData();
@@ -119,7 +119,7 @@ struct ArrayCumSumImpl
         const IColumn::Offsets & offsets = array.getOffsets();
 
         typename ColVecResult::MutablePtr res_nested;
-        if constexpr (IsDecimalNumber<Element>)
+        if constexpr (is_decimal<Element>)
             res_nested = ColVecResult::create(0, data.getScale());
         else
             res_nested = ColVecResult::create();
diff --git a/src/Functions/array/arrayCumSumNonNegative.cpp b/src/Functions/array/arrayCumSumNonNegative.cpp
index 288422c1c9c..c7732ceba52 100644
--- a/src/Functions/array/arrayCumSumNonNegative.cpp
+++ b/src/Functions/array/arrayCumSumNonNegative.cpp
@@ -71,8 +71,8 @@ struct ArrayCumSumNonNegativeImpl
     template <typename Element, typename Result>
     static bool executeType(const ColumnPtr & mapped, const ColumnArray & array, ColumnPtr & res_ptr)
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<Element>, ColumnDecimal<Element>, ColumnVector<Element>>;
-        using ColVecResult = std::conditional_t<IsDecimalNumber<Result>, ColumnDecimal<Result>, ColumnVector<Result>>;
+        using ColVecType = ColumnVectorOrDecimal<Element>;
+        using ColVecResult = ColumnVectorOrDecimal<Result>;
 
         const ColVecType * column = checkAndGetColumn<ColVecType>(&*mapped);
 
@@ -83,7 +83,7 @@ struct ArrayCumSumNonNegativeImpl
         const typename ColVecType::Container & data = column->getData();
 
         typename ColVecResult::MutablePtr res_nested;
-        if constexpr (IsDecimalNumber<Element>)
+        if constexpr (is_decimal<Element>)
             res_nested = ColVecResult::create(0, data.getScale());
         else
             res_nested = ColVecResult::create();
diff --git a/src/Functions/array/arrayDifference.cpp b/src/Functions/array/arrayDifference.cpp
index 7d11c6e89c8..53951731f5e 100644
--- a/src/Functions/array/arrayDifference.cpp
+++ b/src/Functions/array/arrayDifference.cpp
@@ -65,7 +65,7 @@ struct ArrayDifferenceImpl
             {
                 Element curr = src[pos];
 
-                if constexpr (IsDecimalNumber<Element>)
+                if constexpr (is_decimal<Element>)
                 {
                     using ResultNativeType = typename Result::NativeType;
 
@@ -93,8 +93,8 @@ struct ArrayDifferenceImpl
     template <typename Element, typename Result>
     static bool executeType(const ColumnPtr & mapped, const ColumnArray & array, ColumnPtr & res_ptr)
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<Element>, ColumnDecimal<Element>, ColumnVector<Element>>;
-        using ColVecResult = std::conditional_t<IsDecimalNumber<Result>, ColumnDecimal<Result>, ColumnVector<Result>>;
+        using ColVecType = ColumnVectorOrDecimal<Element>;
+        using ColVecResult = ColumnVectorOrDecimal<Result>;
 
         const ColVecType * column = checkAndGetColumn<ColVecType>(&*mapped);
 
@@ -105,7 +105,7 @@ struct ArrayDifferenceImpl
         const typename ColVecType::Container & data = column->getData();
 
         typename ColVecResult::MutablePtr res_nested;
-        if constexpr (IsDecimalNumber<Element>)
+        if constexpr (is_decimal<Element>)
             res_nested = ColVecResult::create(0, data.getScale());
         else
             res_nested = ColVecResult::create();
diff --git a/src/Functions/bitWrapperFunc.cpp b/src/Functions/bitWrapperFunc.cpp
index 8395865d554..4555fa42af4 100644
--- a/src/Functions/bitWrapperFunc.cpp
+++ b/src/Functions/bitWrapperFunc.cpp
@@ -25,7 +25,7 @@ struct BitWrapperFuncImpl
     {
         // Should be a logical error, but this function is callable from SQL.
         // Need to investigate this.
-        if constexpr (!is_integer_v<A>)
+        if constexpr (!is_integer<A>)
             throw DB::Exception("It's a bug! Only integer types are supported by __bitWrapperFunc.", ErrorCodes::BAD_ARGUMENTS);
         return a == 0 ? static_cast<ResultType>(0b10) : static_cast<ResultType >(0b1);
     }
diff --git a/src/Functions/countDigits.cpp b/src/Functions/countDigits.cpp
index 673fb291cb7..47877f042b9 100644
--- a/src/Functions/countDigits.cpp
+++ b/src/Functions/countDigits.cpp
@@ -61,7 +61,7 @@ public:
         {
             using Types = std::decay_t<decltype(types)>;
             using Type = typename Types::RightType;
-            using ColVecType = std::conditional_t<IsDecimalNumber<Type>, ColumnDecimal<Type>, ColumnVector<Type>>;
+            using ColVecType = ColumnVectorOrDecimal<Type>;
 
             if (const ColVecType * col_vec = checkAndGetColumn<ColVecType>(src_column.column.get()))
             {
@@ -84,7 +84,7 @@ private:
     template <typename T, typename ColVecType>
     static void execute(const ColVecType & col, ColumnUInt8 & result_column, size_t rows_count)
     {
-        using NativeT = typename NativeType<T>::Type;
+        using NativeT = NativeType<T>;
 
         const auto & src_data = col.getData();
         auto & dst_data = result_column.getData();
@@ -92,7 +92,7 @@ private:
 
         for (size_t i = 0; i < rows_count; ++i)
         {
-            if constexpr (IsDecimalNumber<T>)
+            if constexpr (is_decimal<T>)
                 dst_data[i] = digits<NativeT>(src_data[i].value);
             else
                 dst_data[i] = digits<NativeT>(src_data[i]);
@@ -102,7 +102,7 @@ private:
     template <typename T>
     static UInt32 digits(T value)
     {
-        static_assert(!IsDecimalNumber<T>);
+        static_assert(!is_decimal<T>);
         using DivT = std::conditional_t<is_signed_v<T>, Int32, UInt32>;
 
         UInt32 res = 0;
diff --git a/src/Functions/if.cpp b/src/Functions/if.cpp
index ea7e1303d27..953aff3568e 100644
--- a/src/Functions/if.cpp
+++ b/src/Functions/if.cpp
@@ -221,7 +221,7 @@ private:
     template <typename T0, typename T1>
     static UInt32 decimalScale(const ColumnsWithTypeAndName & arguments [[maybe_unused]])
     {
-        if constexpr (IsDecimalNumber<T0> && IsDecimalNumber<T1>)
+        if constexpr (is_decimal<T0> && is_decimal<T1>)
         {
             UInt32 left_scale = getDecimalScale(*arguments[1].type);
             UInt32 right_scale = getDecimalScale(*arguments[2].type);
@@ -416,8 +416,8 @@ private:
     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>>;
+        using ColVecT0 = ColumnVectorOrDecimal<T0>;
+        using ColVecT1 = ColumnVectorOrDecimal<T1>;
 
         const IColumn * col_left_untyped = arguments[1].column.get();
 
diff --git a/src/Functions/isDecimalOverflow.cpp b/src/Functions/isDecimalOverflow.cpp
index 2c45a633686..9962d4b7314 100644
--- a/src/Functions/isDecimalOverflow.cpp
+++ b/src/Functions/isDecimalOverflow.cpp
@@ -128,10 +128,9 @@ private:
             dst_data[i] = outOfDigits<T>(src_data[i], precision);
     }
 
-    template <typename T>
+    template <is_decimal T>
     static bool outOfDigits(T dec, UInt32 precision)
     {
-        static_assert(IsDecimalNumber<T>);
         using NativeT = typename T::NativeType;
 
         if (precision > DecimalUtils::max_precision<T>)
diff --git a/src/Functions/negate.cpp b/src/Functions/negate.cpp
index de3995927d3..fb8f00bbc1a 100644
--- a/src/Functions/negate.cpp
+++ b/src/Functions/negate.cpp
@@ -8,7 +8,7 @@ namespace DB
 template <typename A>
 struct NegateImpl
 {
-    using ResultType = std::conditional_t<IsDecimalNumber<A>, A, typename NumberTraits::ResultOfNegate<A>::Type>;
+    using ResultType = std::conditional_t<is_decimal<A>, A, typename NumberTraits::ResultOfNegate<A>::Type>;
     static constexpr const bool allow_fixed_string = false;
 
     static inline NO_SANITIZE_UNDEFINED ResultType apply(A a)
diff --git a/src/Functions/reinterpretAs.cpp b/src/Functions/reinterpretAs.cpp
index 0aba61e44cb..d5e3e8b7368 100644
--- a/src/Functions/reinterpretAs.cpp
+++ b/src/Functions/reinterpretAs.cpp
@@ -217,7 +217,7 @@ public:
                     using From = typename FromType::FieldType;
                     using To = typename ToType::FieldType;
 
-                    using FromColumnType = std::conditional_t<IsDecimalNumber<From>, ColumnDecimal<From>, ColumnVector<From>>;
+                    using FromColumnType = ColumnVectorOrDecimal<From>;
 
                     const auto * column_from = assert_cast<const FromColumnType*>(arguments[0].column.get());
 
diff --git a/src/Functions/sign.cpp b/src/Functions/sign.cpp
index 8e2964c1859..ea23ea40e54 100644
--- a/src/Functions/sign.cpp
+++ b/src/Functions/sign.cpp
@@ -13,7 +13,7 @@ struct SignImpl
 
     static inline NO_SANITIZE_UNDEFINED ResultType apply(A a)
     {
-        if constexpr (IsDecimalNumber<A> || std::is_floating_point_v<A>)
+        if constexpr (is_decimal<A> || std::is_floating_point_v<A>)
             return a < A(0) ? -1 : a == A(0) ? 0 : 1;
         else if constexpr (is_signed_v<A>)
             return a < 0 ? -1 : a == 0 ? 0 : 1;
diff --git a/src/IO/ReadHelpers.h b/src/IO/ReadHelpers.h
index 45f2440a2ff..e7aff3b6501 100644
--- a/src/IO/ReadHelpers.h
+++ b/src/IO/ReadHelpers.h
@@ -13,7 +13,7 @@
 #include <common/LocalDateTime.h>
 #include <common/StringRef.h>
 #include <common/arithmeticOverflow.h>
-#include <common/Concepts.h>
+#include <common/unit.h>
 
 #include <Core/Types.h>
 #include <Core/DecimalFunctions.h>
@@ -36,10 +36,7 @@
 
 #include <double-conversion/double-conversion.h>
 
-
-/// 1 GiB
-#define DEFAULT_MAX_STRING_SIZE (1ULL << 30)
-
+static constexpr auto DEFAULT_MAX_STRING_SIZE = 1_GiB;
 
 namespace DB
 {
@@ -383,7 +380,7 @@ end:
 template <ReadIntTextCheckOverflow check_overflow = ReadIntTextCheckOverflow::DO_NOT_CHECK_OVERFLOW, typename T>
 void readIntText(T & x, ReadBuffer & buf)
 {
-    if constexpr (IsDecimalNumber<T>)
+    if constexpr (is_decimal<T>)
     {
         readIntText<check_overflow>(x.value, buf);
     }
@@ -1154,12 +1151,10 @@ inline bool tryParse(T & res, const char * data, size_t size)
 }
 
 template <typename T>
-inline std::enable_if_t<!is_integer_v<T>, void>
-readTextWithSizeSuffix(T & x, ReadBuffer & buf) { readText(x, buf); }
+inline void readTextWithSizeSuffix(T & x, ReadBuffer & buf) { readText(x, buf); }
 
-template <typename T>
-inline std::enable_if_t<is_integer_v<T>, void>
-readTextWithSizeSuffix(T & x, ReadBuffer & buf)
+template <is_integer T>
+inline void readTextWithSizeSuffix(T & x, ReadBuffer & buf)
 {
     readIntText(x, buf);
     if (buf.eof())
diff --git a/src/IO/WriteHelpers.h b/src/IO/WriteHelpers.h
index 42b83687644..d6eaa085eac 100644
--- a/src/IO/WriteHelpers.h
+++ b/src/IO/WriteHelpers.h
@@ -5,7 +5,6 @@
 #include <limits>
 #include <algorithm>
 #include <iterator>
-#include <concepts>
 
 #include <pcg-random/pcg_random.hpp>
 
@@ -15,6 +14,7 @@
 #include <common/find_symbols.h>
 #include <common/StringRef.h>
 #include <common/DecomposedFloat.h>
+#include <common/EnumReflection.h>
 
 #include <Core/DecimalFunctions.h>
 #include <Core/Types.h>
@@ -31,8 +31,6 @@
 #include <IO/DoubleConverter.h>
 #include <IO/WriteBufferFromString.h>
 
-#include <common/EnumReflection.h>
-
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -45,6 +43,7 @@
 
 #include <Formats/FormatSettings.h>
 
+
 namespace DB
 {
 
@@ -378,7 +377,7 @@ void writeJSONNumber(T x, WriteBuffer & ostr, const FormatSettings & settings)
 {
     bool is_finite = isFinite(x);
 
-    const bool need_quote = (is_integer_v<T> && (sizeof(T) >= 8) && settings.json.quote_64bit_integers)
+    const bool need_quote = (is_integer<T> && (sizeof(T) >= 8) && settings.json.quote_64bit_integers)
         || (settings.json.quote_denormals && !is_finite);
 
     if (need_quote)
diff --git a/src/Interpreters/RowRefs.cpp b/src/Interpreters/RowRefs.cpp
index 03abae01453..1b5531b39b6 100644
--- a/src/Interpreters/RowRefs.cpp
+++ b/src/Interpreters/RowRefs.cpp
@@ -7,6 +7,7 @@
 #include <Columns/IColumn.h>
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnDecimal.h>
+#include <common/EnumReflection.h>
 
 
 namespace DB
@@ -46,7 +47,6 @@ void callWithType(TypeIndex which, F && f)
 
     __builtin_unreachable();
 }
-
 }
 
 
@@ -69,7 +69,7 @@ void AsofRowRefs::insert(TypeIndex type, const IColumn & asof_column, const Bloc
         using T = std::decay_t<decltype(t)>;
         using LookupPtr = typename Entry<T>::LookupPtr;
 
-        using ColumnType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+        using ColumnType = ColumnVectorOrDecimal<T>;
         const auto & column = typeid_cast<const ColumnType &>(asof_column);
 
         T key = column.getElement(row_num);
@@ -93,7 +93,7 @@ const RowRef * AsofRowRefs::findAsof(TypeIndex type, ASOF::Inequality inequality
         using EntryType = Entry<T>;
         using LookupPtr = typename EntryType::LookupPtr;
 
-        using ColumnType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+        using ColumnType = ColumnVectorOrDecimal<T>;
         const auto & column = typeid_cast<const ColumnType &>(asof_column);
         T key = column.getElement(row_num);
         auto & typed_lookup = std::get<LookupPtr>(lookups);
diff --git a/src/Interpreters/RowRefs.h b/src/Interpreters/RowRefs.h
index 8e5141be199..2a07d8e1a34 100644
--- a/src/Interpreters/RowRefs.h
+++ b/src/Interpreters/RowRefs.h
@@ -23,7 +23,7 @@ struct RowRef
     const Block * block = nullptr;
     SizeT row_num = 0;
 
-    RowRef() {}
+    RowRef() = default;
     RowRef(const Block * block_, size_t row_num_) : block(block_), row_num(row_num_) {}
 };
 
@@ -232,7 +232,7 @@ public:
         Entry<DateTime64>::LookupPtr>;
 
     AsofRowRefs() {}
-    AsofRowRefs(TypeIndex t);
+    AsofRowRefs(TypeIndex type);
 
     static std::optional<TypeIndex> getTypeSize(const IColumn & asof_column, size_t & type_size);
 
diff --git a/src/Processors/Transforms/AddingDefaultsTransform.cpp b/src/Processors/Transforms/AddingDefaultsTransform.cpp
index c92d4d7a456..01048354b82 100644
--- a/src/Processors/Transforms/AddingDefaultsTransform.cpp
+++ b/src/Processors/Transforms/AddingDefaultsTransform.cpp
@@ -64,7 +64,7 @@ static void mixNumberColumns(
         if constexpr (!std::is_same_v<DataType, DataTypeString> && !std::is_same_v<DataType, DataTypeFixedString>)
         {
             using FieldType = typename DataType::FieldType;
-            using ColVecType = std::conditional_t<IsDecimalNumber<FieldType>, ColumnDecimal<FieldType>, ColumnVector<FieldType>>;
+            using ColVecType = ColumnVectorOrDecimal<FieldType>;
 
             auto col_read = typeid_cast<ColVecType *>(column_mixed.get());
             if (!col_read)

From 1d4f73ac7b38777a5e6fb2d21320ebfdf586ac03 Mon Sep 17 00:00:00 2001
From: adevyatova <annaconda@bk.ru>
Date: Sat, 11 Sep 2021 02:13:55 +0000
Subject: [PATCH 182/273] Add example

---
 docs/en/interfaces/formats.md        |  11 +++++++++--
 docs/ru/interfaces/formats.md        |  11 +++++++++--
 docs/tmp_msgpac_test_all_types.msgpk | Bin 0 -> 200 bytes
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 docs/tmp_msgpac_test_all_types.msgpk

diff --git a/docs/en/interfaces/formats.md b/docs/en/interfaces/formats.md
index af4fbfbd067..32170b4aec7 100644
--- a/docs/en/interfaces/formats.md
+++ b/docs/en/interfaces/formats.md
@@ -1563,5 +1563,12 @@ ClickHouse supports reading and writing [MessagePack](https://msgpack.org/) data
 | `uint 32`                         | [DateTime](../sql-reference/data-types/datetime.md)                              |
 | `uint 64`                         | [DateTime64](../sql-reference/data-types/datetime.md)                            |
 | `fixarray`, `array 16`, `array 32`| [Array](../sql-reference/data-types/array.md)                                    |
-	
-Unsupported MsgPack data type: `nil`.
+| `nil`                             | [Nothing](../sql-reference/data-types/special-data-types/nothing.md)             |
+
+Example:
+
+```sql
+CREATE TABLE msgpack (uint8 UInt8, uint16 UInt16, uint32 UInt32, uint64 UInt64, int8 Int8, int16 Int16, int32 Int32, int64 Int64, float Float32, double Float64, string String, date Date, datetime DateTime, datetime64 DateTime64, array Array(UInt32)) ENGINE = Memory;
+INSERT INTO msgpack VALUES (255, 65535, 4294967295, 100000000000, -128, -32768, -2147483648, -100000000000, 2.02, 10000.0000001, 'String', 18980, 1639872000, 1639872000000, [1,2,3,4,5]), (4, 1234, 3244467295, 500000000000, -1, -256, -14741221, -7000000000, 100.1, 14321.032141201, 'Another string', 20000, 1839882000, 1639872891123, [5,4,3,2,1]),(42, 42, 42, 42, 42, 42, 42, 42, 42.42, 42.42, '42', 42, 42, 42, [42]);
+SELECT * FROM msgpack INTO OUTFILE 'tmp_msgpac_test_all_types.msgpk' FORMAT MsgPack;
+```
\ No newline at end of file
diff --git a/docs/ru/interfaces/formats.md b/docs/ru/interfaces/formats.md
index 6a3c85d6df4..ea57b3ded13 100644
--- a/docs/ru/interfaces/formats.md
+++ b/docs/ru/interfaces/formats.md
@@ -1477,5 +1477,12 @@ ClickHouse поддерживает запись и чтение из файло
 | `uint 32`                         | [DateTime](../sql-reference/data-types/datetime.md)                              |
 | `uint 64`                         | [DateTime64](../sql-reference/data-types/datetime.md)                            |
 | `fixarray`, `array 16`, `array 32`| [Array](../sql-reference/data-types/array.md)                                    |
-	
-Неподдерживаемый тип данных: `nil`.
\ No newline at end of file
+| `nil`                             | [Nothing](../sql-reference/data-types/special-data-types/nothing.md)             |
+
+Пример:
+
+```sql
+CREATE TABLE msgpack (uint8 UInt8, uint16 UInt16, uint32 UInt32, uint64 UInt64, int8 Int8, int16 Int16, int32 Int32, int64 Int64, float Float32, double Float64, string String, date Date, datetime DateTime, datetime64 DateTime64, array Array(UInt32)) ENGINE = Memory;
+INSERT INTO msgpack VALUES (255, 65535, 4294967295, 100000000000, -128, -32768, -2147483648, -100000000000, 2.02, 10000.0000001, 'String', 18980, 1639872000, 1639872000000, [1,2,3,4,5]), (4, 1234, 3244467295, 500000000000, -1, -256, -14741221, -7000000000, 100.1, 14321.032141201, 'Another string', 20000, 1839882000, 1639872891123, [5,4,3,2,1]),(42, 42, 42, 42, 42, 42, 42, 42, 42.42, 42.42, '42', 42, 42, 42, [42]);
+SELECT * FROM msgpack INTO OUTFILE 'tmp_msgpac_test_all_types.msgpk' FORMAT MsgPack;
+```
\ No newline at end of file
diff --git a/docs/tmp_msgpac_test_all_types.msgpk b/docs/tmp_msgpac_test_all_types.msgpk
new file mode 100644
index 0000000000000000000000000000000000000000..efefdf32a55f96112d8952e725c2023f9687cde3
GIT binary patch
literal 200
zcmX@}|Lp(&=l%o1c?JdsagVYW3>O+MHZWXj0CFz_g<ov%lwdgJ!05j2w8P;Jpy0Iw
z%YsXaGV{{Uda0aC+*if`)W}$S{?7-7sf<j_EUYYNSuUMBn6xAwWMD~FPzS^Ri~kue
z{g)S%2ATIS?no8GDW?<0#-|-l|7ejlem{AgV_tqqMrx5lF~nRyg>$*9;swCwUf}BZ
jJe8G&nTb&g3Qjp`t`j-!;A(oPKStx*A`>H^_(UxL8(vuZ

literal 0
HcmV?d00001


From f7540dad5646b9ee9e745b983806069df7e80991 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 11 Sep 2021 09:13:23 +0300
Subject: [PATCH 183/273] tests: update 01305_replica_create_drop_zookeeper
 after client query printing

---
 .../queries/0_stateless/01305_replica_create_drop_zookeeper.sh  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh b/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
index 6248813c9ba..b7cc7a3bc32 100755
--- a/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
+++ b/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
@@ -11,7 +11,7 @@ function thread()
     while true; do
         $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS test_table_$1 SYNC;
             CREATE TABLE test_table_$1 (a UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r_$1') ORDER BY tuple();" 2>&1 |
-                grep -vP '(^$)|(^Received exception from server)|(^\d+\. )|because the last replica of the table was dropped right now|is already started to be removing by another replica right now| were removed by another replica|Removing leftovers from table|Another replica was suddenly created|was created by another server at the same moment|was suddenly removed|some other replicas were created at the same time'
+                grep -vP '(^$)|(^Received exception from server)|(^\d+\. )|because the last replica of the table was dropped right now|is already started to be removing by another replica right now| were removed by another replica|Removing leftovers from table|Another replica was suddenly created|was created by another server at the same moment|was suddenly removed|some other replicas were created at the same time|^\(query: '
     done
 }
 

From c6b9816d45e3e8255eb1aee9b9059dfe7397fdab Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 11 Sep 2021 09:15:38 +0300
Subject: [PATCH 184/273] tests: mark 00763_lock_buffer as long

https://clickhouse-test-reports.s3.yandex.net/28827/58266e4ed6db77109e6237ecd2612d34c0b19516/functional_stateless_tests_flaky_check_(address).html#fail1
---
 ...763_lock_buffer.reference => 00763_lock_buffer_long.reference} | 0
 .../{00763_lock_buffer.sh => 00763_lock_buffer_long.sh}           | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/queries/0_stateless/{00763_lock_buffer.reference => 00763_lock_buffer_long.reference} (100%)
 rename tests/queries/0_stateless/{00763_lock_buffer.sh => 00763_lock_buffer_long.sh} (100%)

diff --git a/tests/queries/0_stateless/00763_lock_buffer.reference b/tests/queries/0_stateless/00763_lock_buffer_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00763_lock_buffer.reference
rename to tests/queries/0_stateless/00763_lock_buffer_long.reference
diff --git a/tests/queries/0_stateless/00763_lock_buffer.sh b/tests/queries/0_stateless/00763_lock_buffer_long.sh
similarity index 100%
rename from tests/queries/0_stateless/00763_lock_buffer.sh
rename to tests/queries/0_stateless/00763_lock_buffer_long.sh

From ff17de531c2bb652d88ce5cc9e5821291f5cb70c Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 10 Sep 2021 00:18:52 +0300
Subject: [PATCH 185/273] Join MaterializedMySQLSyncThread only if it is
 joinable

It is possible to trigger
MaterializedMySQLSyncThread::stopSynchronization() from the same thread
in case of some exception at startup, when some interpreter holds the
storage refcnt, and later MaterializedMySQLSyncThread will try to join
itself from the main thread.

Here is a stack trace for example:

<details>

    4  0x000000000f7ae45c in Poco::Event::wait (this=0x7f1b90c38170) at ../contrib/poco/Foundation/include/Poco/Event.h:97
    5  ThreadFromGlobalPool::join (this=0x7f1b90c23120) at ../src/Common/ThreadPool.h:210
    6  DB::MaterializeMySQLSyncThread::stopSynchronization (this=0x7f1b8024ca68) at ../src/Databases/MySQL/MaterializeMySQLSyncThread.cpp:229
    7  DB::MaterializeMySQLSyncThread::~MaterializeMySQLSyncThread (this=0x7f1b8024ca68) at ../src/Databases/MySQL/MaterializeMySQLSyncThread.cpp:85
    8  0x000000000f816dc8 in DB::DatabaseMaterializeMySQL<DB::DatabaseAtomic>::~DatabaseMaterializeMySQL (this=0x7f1b8024c918) at ../src/Databases/MySQL/DatabaseMaterializeMySQL.h:21
    11 std::__1::shared_ptr<DB::IDatabase>::~shared_ptr (this=<optimized out>) at ../contrib/libcxx/include/memory:3212
    12 0x000000000f8726a6 in DB::InterpreterCreateQuery::createTable (this=<optimized out>, create=...) at ../src/Interpreters/InterpreterCreateQuery.cpp:952
    13 0x000000000f87735c in DB::InterpreterCreateQuery::execute (this=0x7f1aeef59860) at ../src/Interpreters/InterpreterCreateQuery.cpp:1225
    14 0x000000000fe22253 in DB::executeQueryImpl (begin=<optimized out>, end=<optimized out>, context=..., internal=true, stage=DB::QueryProcessingStage::Complete, has_query_tail=<optimized out>, istr=<optimized out>) at ../src/Interpreters/executeQuery.cpp:574
    15 0x000000000fe208e3 in DB::executeQuery (query=..., context=..., internal=<optimized out>, stage=DB::QueryProcessingStage::FetchColumns, may_have_embedded_data=<optimized out>) at ../src/Interpreters/executeQuery.cpp:933
    16 0x000000000faafcde in DB::MySQLInterpreter::InterpreterMySQLDDLQuery<DB::MySQLInterpreter::InterpreterCreateImpl>::execute (this=<optimized out>) at ../src/Interpreters/MySQL/InterpretersMySQLDDLQuery.h:75
    17 0x000000000faade78 in DB::InterpreterExternalDDLQuery::execute (this=<optimized out>) at ../src/Interpreters/InterpreterExternalDDLQuery.cpp:64
    18 0x000000000fe22253 in DB::executeQueryImpl (begin=<optimized out>, end=<optimized out>, context=..., internal=true, stage=DB::QueryProcessingStage::Complete, has_query_tail=<optimized out>, istr=<optimized out>) at ../src/Interpreters/executeQuery.cpp:574
    19 0x000000000fe208e3 in DB::executeQuery (query=..., context=..., internal=<optimized out>, stage=DB::QueryProcessingStage::FetchColumns, may_have_embedded_data=<optimized out>) at ../src/Interpreters/executeQuery.cpp:933
    20 0x000000000f7ba406 in DB::tryToExecuteQuery (query_to_execute=..., query_context=..., database=..., comment=...) at ../src/Databases/MySQL/MaterializeMySQLSyncThread.cpp:69
    21 0x000000000f7d4b88 in DB::dumpDataForTables() (connection=..., query_prefix=..., database_name=..., mysql_database_name=..., context=..., is_cancelled=..., need_dumping_tables=...) at ../src/Databases/MySQL/MaterializeMySQLSyncThread.cpp:326
    22 DB::MaterializeMySQLSyncThread::prepareSynchronized(DB::MaterializeMetadata&)::$_1::operator()() const (this=<optimized out>) at ../src/Databases/MySQL/MaterializeMySQLSyncThread.cpp:391
    29 DB::commitMetadata() (function=..., persistent_tmp_path=..., persistent_path=...) at ../src/Databases/MySQL/MaterializeMetadata.cpp:197
    30 0x000000000f80a000 in DB::MaterializeMetadata::transaction(DB::MySQLReplication::Position const&, std::__1::function<void ()> const&) (this=0x7f1b6375c3d8, position=..., fun=...) at ../src/Databases/MySQL/MaterializeMetadata.cpp:230
    31 0x000000000f7b2231 in DB::MaterializeMySQLSyncThread::prepareSynchronized (this=0x7f1b8024ca68, metadata=...) at ../src/Databases/MySQL/MaterializeMySQLSyncThread.cpp:388
    32 0x000000000f7b169c in DB::MaterializeMySQLSyncThread::synchronization (this=0x7f1b8024ca68) at ../src/Databases/MySQL/MaterializeMySQLSyncThread.cpp:180
    33 0x000000000f7d4074 in DB::MaterializeMySQLSyncThread::startSynchronization()::$_0::operator()() const (this=<optimized out>) at ../src/Databases/MySQL/MaterializeMySQLSyncThread.cpp:236

</details>
---
 src/Databases/MySQL/MaterializedMySQLSyncThread.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp b/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
index 560d2d716c9..5a51704e98b 100644
--- a/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
+++ b/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
@@ -233,7 +233,8 @@ void MaterializedMySQLSyncThread::stopSynchronization()
     if (!sync_quit && background_thread_pool)
     {
         sync_quit = true;
-        background_thread_pool->join();
+        if (background_thread_pool->joinable())
+            background_thread_pool->join();
         client.disconnect();
     }
 }

From 7e084304fbf954f630df786314c028b8c4e4c63d Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sat, 11 Sep 2021 10:03:06 +0300
Subject: [PATCH 186/273] Skip "no data" exception when reading thermal sensors

---
 src/Interpreters/AsynchronousMetrics.cpp | 6 ++++--
 src/Storages/StorageS3Cluster.cpp        | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Interpreters/AsynchronousMetrics.cpp b/src/Interpreters/AsynchronousMetrics.cpp
index fd02aa4abec..c1e4bb86895 100644
--- a/src/Interpreters/AsynchronousMetrics.cpp
+++ b/src/Interpreters/AsynchronousMetrics.cpp
@@ -1105,7 +1105,8 @@ void AsynchronousMetrics::update(std::chrono::system_clock::time_point update_ti
     }
     catch (...)
     {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
+        if (errno != ENODATA)   /// Ok for thermal sensors.
+            tryLogCurrentException(__PRETTY_FUNCTION__);
 
         /// Files maybe re-created on module load/unload
         try
@@ -1144,7 +1145,8 @@ void AsynchronousMetrics::update(std::chrono::system_clock::time_point update_ti
     }
     catch (...)
     {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
+        if (errno != ENODATA)   /// Ok for thermal sensors.
+            tryLogCurrentException(__PRETTY_FUNCTION__);
 
         /// Files can be re-created on:
         /// - module load/unload
diff --git a/src/Storages/StorageS3Cluster.cpp b/src/Storages/StorageS3Cluster.cpp
index ba2ed4c55cd..a278b9d3dec 100644
--- a/src/Storages/StorageS3Cluster.cpp
+++ b/src/Storages/StorageS3Cluster.cpp
@@ -15,7 +15,6 @@
 #include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeString.h>
-#include <IO/ReadBufferFromS3.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromS3.h>
 #include <IO/WriteHelpers.h>

From a581603964d25b78ae1140d8d2b694408dd40e84 Mon Sep 17 00:00:00 2001
From: Vladimir C <vdimir@yandex-team.ru>
Date: Sat, 11 Sep 2021 10:46:55 +0300
Subject: [PATCH 187/273] Apply suggestions from code review

---
 docs/en/sql-reference/functions/encoding-functions.md | 2 +-
 docs/ru/sql-reference/functions/encoding-functions.md | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/en/sql-reference/functions/encoding-functions.md b/docs/en/sql-reference/functions/encoding-functions.md
index 0abf7bb7da9..69dd14da1bf 100644
--- a/docs/en/sql-reference/functions/encoding-functions.md
+++ b/docs/en/sql-reference/functions/encoding-functions.md
@@ -297,7 +297,7 @@ For a numeric argument `unbin()` does not return the inverse of `bin()`. If you
 !!! note "Note"
     If `unbin` is invoked from within the `clickhouse-client`, binary strings are displayed using UTF-8.
 
-Supports binary digits `0-1`. The number of binary digits does not have to be multiples of eight. If the argument string contains anything other than binary digits, some implementation-defined result is returned (an exception isn’t thrown). 
+Supports binary digits `0` and `1`. The number of binary digits does not have to be multiples of eight. If the argument string contains anything other than binary digits, some implementation-defined result is returned (an exception isn’t thrown). 
 
 **Arguments**
 
diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index ad3aa8d87e6..694dfef7d75 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -85,7 +85,7 @@ hex(arg)
 
 Функция использует прописные буквы `A-F` и не использует никаких префиксов (например, `0x`) или суффиксов (например, `h`).
 
-Для целочисленных аргументов возвращает шестнадцатеричные цифры ("кусочки") от наиболее значимых до наименее значимых (`big endian` или в порядке, понятному человеку).Он начинается с самого значимого ненулевого байта (начальные нулевые байты опущены), но всегда выводит обе цифры каждого байта, даже если начальная цифра равна нулю.
+Для целочисленных аргументов возвращает шестнадцатеричные цифры от наиболее до наименее значимых (`big endian`, человекочитаемый порядок).Он начинается с самого значимого ненулевого байта (начальные нулевые байты опущены), но всегда выводит обе цифры каждого байта, даже если начальная цифра равна нулю.
 
 Значения типа [Date](../../sql-reference/data-types/date.md) и [DateTime](../../sql-reference/data-types/datetime.md) формируются как соответствующие целые числа (количество дней с момента Unix-эпохи для `Date` и значение Unix Timestamp для `DateTime`).
 
@@ -216,7 +216,7 @@ bin(arg)
 
 Синоним: `BIN`.
 
-Для целочисленных аргументов возвращаются двоичные числа от наиболее значимого до наименее значимого (`big-endian` или в понятном человеку порядке). Порядок начинается с самого значимого ненулевого байта (начальные нулевые байты опущены), но всегда возвращает восемь цифр каждого байта, если начальная цифра равна нулю.
+Для целочисленных аргументов возвращаются двоичные числа от наиболее значимого до наименее значимого (`big-endian`, человекочитаемый порядок). Порядок начинается с самого значимого ненулевого байта (начальные нулевые байты опущены), но всегда возвращает восемь цифр каждого байта, если начальная цифра равна нулю.
 
 Значения типа [Date](../../sql-reference/data-types/date.md) и [DateTime](../../sql-reference/data-types/datetime.md) формируются как соответствующие целые числа (количество дней с момента Unix-эпохи для `Date` и значение Unix Timestamp для `DateTime`).
 
@@ -297,7 +297,7 @@ unbin(arg)
 !!! note "Примечание"
     Если `unbin` вызывается из клиента `clickhouse-client`, бинарная строка возвращается в кодировке UTF-8.
 
-Поддерживает двоичные цифры `0-1`. Количество двоичных цифр не обязательно должно быть кратно восьми. Если строка аргумента содержит что-либо, кроме двоичных цифр, возвращается некоторый результат, определенный реализацией (ошибки не возникает). 
+Поддерживает двоичные цифры `0` и `1`. Количество двоичных цифр не обязательно должно быть кратно восьми. Если строка аргумента содержит что-либо, кроме двоичных цифр, возвращается некоторый результат, определенный реализацией (ошибки не возникает). 
 
 **Аргументы**
 

From 9c756fc4b2300315f278fb45c4b851701494d326 Mon Sep 17 00:00:00 2001
From: Pavel Kruglov <avogar@avogar-dev.sas.yp-c.yandex.net>
Date: Sat, 11 Sep 2021 12:56:25 +0300
Subject: [PATCH 188/273] Fix bug with LowCardinality in short-curcuit function
 evaluation

---
 src/Columns/MaskOperations.cpp                | 12 +++++---
 src/Core/Settings.h                           |  2 +-
 .../0_stateless/01822_short_circuit.reference | 30 +++++++++++++++++++
 .../0_stateless/01822_short_circuit.sql       |  5 ++++
 4 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/Columns/MaskOperations.cpp b/src/Columns/MaskOperations.cpp
index 759d0af7127..b63f2d25665 100644
--- a/src/Columns/MaskOperations.cpp
+++ b/src/Columns/MaskOperations.cpp
@@ -4,6 +4,7 @@
 #include <Columns/ColumnNothing.h>
 #include <Columns/ColumnsCommon.h>
 #include <Columns/ColumnConst.h>
+#include <Columns/ColumnLowCardinality.h>
 #include <algorithm>
 
 namespace DB
@@ -177,19 +178,21 @@ MaskInfo extractMaskFromConstOrNull(
 template <bool inverted>
 MaskInfo extractMaskImpl(
     PaddedPODArray<UInt8> & mask,
-    const ColumnPtr & column,
+    const ColumnPtr & col,
     UInt8 null_value,
     const PaddedPODArray<UInt8> * null_bytemap,
     PaddedPODArray<UInt8> * nulls = nullptr)
 {
+    auto column = col->convertToFullColumnIfLowCardinality();
+
     /// Special implementation for Null and Const columns.
     if (column->onlyNull() || checkAndGetColumn<ColumnConst>(*column))
         return extractMaskFromConstOrNull<inverted>(mask, column, null_value, nulls);
 
-    if (const auto * col = checkAndGetColumn<ColumnNullable>(*column))
+    if (const auto * nullable_column = checkAndGetColumn<ColumnNullable>(*column))
     {
-        const PaddedPODArray<UInt8> & null_map = col->getNullMapData();
-        return extractMaskImpl<inverted>(mask, col->getNestedColumnPtr(), null_value, &null_map, nulls);
+        const PaddedPODArray<UInt8> & null_map = nullable_column->getNullMapData();
+        return extractMaskImpl<inverted>(mask, nullable_column->getNestedColumnPtr(), null_value, &null_map, nulls);
     }
 
     MaskInfo mask_info;
@@ -314,3 +317,4 @@ void copyMask(const PaddedPODArray<UInt8> & from, PaddedPODArray<UInt8> & to)
 }
 
 }
+
diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index f331ad2d7d3..325e6ea58c5 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -499,7 +499,7 @@ class IColumn;
     M(UInt64, offset, 0, "Offset on read rows from the most 'end' result for select query", 0) \
     \
     M(UInt64, function_range_max_elements_in_block, 500000000, "Maximum number of values generated by function 'range' per block of data (sum of array sizes for every row in a block, see also 'max_block_size' and 'min_insert_block_size_rows'). It is a safety threshold.", 0) \
-    M(ShortCircuitFunctionEvaluation, short_circuit_function_evaluation, ShortCircuitFunctionEvaluation::ENABLE, "Setting for short-circuit function evaluation configuration. Possible values: 'enable', 'disable', 'force_enable'", 0) \
+    M(ShortCircuitFunctionEvaluation, short_circuit_function_evaluation, ShortCircuitFunctionEvaluation::ENABLE, "Setting for short-circuit function evaluation configuration. Possible values: 'enable' - use short-circuit function evaluation for functions that are suitable for it, 'disable' - disable short-circuit function evaluation, 'force_enable' - use short-circuit function evaluation for all functions.", 0) \
     \
     M(String, local_filesystem_read_method, "pread", "Method of reading data from local filesystem, one of: read, pread, mmap, pread_threadpool.", 0) \
     M(Bool, local_filesystem_read_prefetch, false, "Should use prefetching when reading data from local filesystem.", 0) \
diff --git a/tests/queries/0_stateless/01822_short_circuit.reference b/tests/queries/0_stateless/01822_short_circuit.reference
index 96c4e161244..949d2fa4985 100644
--- a/tests/queries/0_stateless/01822_short_circuit.reference
+++ b/tests/queries/0_stateless/01822_short_circuit.reference
@@ -1803,3 +1803,33 @@ Decimal32
 \N
 \N
 \N
+0
+1
+0
+1
+0
+0
+1
+1
+1
+1
+1
+1
+3
+3
+5
+5
+7
+7
+9
+9
+1
+1
+3
+3
+5
+5
+7
+7
+9
+9
diff --git a/tests/queries/0_stateless/01822_short_circuit.sql b/tests/queries/0_stateless/01822_short_circuit.sql
index fe8a0315d4a..1f0e04cb4b5 100644
--- a/tests/queries/0_stateless/01822_short_circuit.sql
+++ b/tests/queries/0_stateless/01822_short_circuit.sql
@@ -148,3 +148,8 @@ select if(isNull(x), Null, 42 / x) from (select CAST(materialize(Null), 'Nullabl
 select if(isNull(x), Null, x / 0) from (select CAST(materialize(Null), 'Nullable(Decimal32(2))') as x);
 
 select if(isNull(x), Null, intDiv(42, x)) from (select CAST(materialize(Null), 'Nullable(Int64)') as x);
+
+select number % 2 and toLowCardinality(number) from numbers(5);
+select number % 2 or toLowCardinality(number) from numbers(5);
+select if(toLowCardinality(number) % 2, number, number + 1) from numbers(10);
+select multiIf(toLowCardinality(number) % 2, number, number + 1) from numbers(10);

From baac2e561cfb05bc174f0bd25571e607d19c7463 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 11 Sep 2021 15:48:59 +0300
Subject: [PATCH 189/273] Add query to the exception message in case of error
 during processing INSERT block on client

Since client process the INSERT block itself, and only after, send it
to the client, for example:

    clickhouse-client --stacktrace --input_format_null_as_default=1 --query="INSERT INTO FUNCTION null('k Int, v Tuple(Int,Int)') VALUES ()"
    Code: 62. DB::Exception: Cannot parse expression of type Int32 here: ): While executing ValuesBlockInputFormat: (in query: INSERT INTO FUNCTION null('k Int, v Tuple(Int,Int)') VALUES ()): data for INSERT was parsed from query. (SYNTAX_ERROR), Stack trace (when copying this message, always include the lines below):
---
 programs/client/Client.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index c594f01861b..27683e074f2 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -2033,8 +2033,21 @@ private:
         PullingAsyncPipelineExecutor executor(pipeline);
 
         Block block;
-        while (executor.pull(block))
+        while (true)
         {
+            try
+            {
+                if (!executor.pull(block))
+                {
+                    break;
+                }
+            }
+            catch (Exception & e)
+            {
+                e.addMessage(fmt::format("(in query: {})", full_query));
+                throw;
+            }
+
             /// Check if server send Log packet
             receiveLogs();
 

From aa5f1d77faf80e7df799a3150f09db869b928716 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 11 Sep 2021 16:06:28 +0300
Subject: [PATCH 190/273] Add After/Wants time-sync.target for the
 clickhouse-server.service

---
 debian/clickhouse-server.service | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/clickhouse-server.service b/debian/clickhouse-server.service
index b9681f9279e..9bf193be826 100644
--- a/debian/clickhouse-server.service
+++ b/debian/clickhouse-server.service
@@ -1,7 +1,8 @@
 [Unit]
 Description=ClickHouse Server (analytic DBMS for big data)
 Requires=network-online.target
-After=network-online.target
+After=time-sync.target network-online.target
+Wants=time-sync.target
 
 [Service]
 Type=simple

From 5f05ac23b028b00faaab685e232b6786e2e9b4bc Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 11 Sep 2021 16:08:17 +0300
Subject: [PATCH 191/273] Add $time dependency for clickhouse-server.init
 script

---
 debian/clickhouse-server.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/clickhouse-server.init b/debian/clickhouse-server.init
index 4e70d382b36..76c98972c7a 100755
--- a/debian/clickhouse-server.init
+++ b/debian/clickhouse-server.init
@@ -3,7 +3,7 @@
 # Provides:          clickhouse-server
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Required-Start:    $network
+# Required-Start:    $time $network
 # Required-Stop:     $network
 # Short-Description: Yandex clickhouse-server daemon
 ### END INIT INFO

From a13b6f2a09aa497d7788e7186c732114e3f09cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Sat, 11 Sep 2021 03:32:50 +0200
Subject: [PATCH 192/273] WIP: Speed up sum(floating point)

---
 src/AggregateFunctions/AggregateFunctionSum.h | 48 ++++++++++++-------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/AggregateFunctions/AggregateFunctionSum.h b/src/AggregateFunctions/AggregateFunctionSum.h
index 24c1e514a71..657d09d2701 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.h
+++ b/src/AggregateFunctions/AggregateFunctionSum.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstring>
 #include <memory>
 #include <experimental/type_traits>
 #include <type_traits>
@@ -67,6 +68,18 @@ struct AggregateFunctionSumData
 
         if constexpr (std::is_floating_point_v<T>)
         {
+#if defined(__clang__)
+/// With clang we can tell the compiler to vectorize and it should work with all types when possible, including floating types
+/// TODO: Test how this affects non floating point types
+/// Something around the number of SSE registers * the number of elements fit in register.
+/// Recommend half of those for each vectorization
+#pragma clang loop vectorize(enable) vectorize_width(64 / sizeof(T)) unroll_count(128 / sizeof(T))
+            for (size_t i = 0; i < count; i++)
+            {
+                Impl::add(sum, ptr[i]);
+            }
+            return;
+#endif
             /// Compiler cannot unroll this loop, do it manually.
             /// (at least for floats, most likely due to the lack of -fassociative-math)
 
@@ -123,26 +136,27 @@ struct AggregateFunctionSumData
 
         if constexpr (std::is_floating_point_v<T>)
         {
-            constexpr size_t unroll_count = 128 / sizeof(T);
-            T partial_sums[unroll_count]{};
+            /// For floating point we use a similar trick as above, except that now we use a mask instead (0 to discard, 0xFF..FF to keep)
+            /// We reinterpret the floating point number as an unsigned integer of the same size
+            /// This was tested with clang12. gcc11 would need to be tricked into vectorizing by iterating over the integer representation
+            static_assert(sizeof(T) == 4 || sizeof(T) == 8);
+            typedef typename std::conditional<sizeof(T) == 4, uint32_t, uint64_t>::type equivalent_integer;
 
-            const auto * unrolled_end = ptr + (count / unroll_count * unroll_count);
-
-            while (ptr < unrolled_end)
+#if defined(__clang__)
+            /// Without these instructions clang will prefer using a jump as it knows that the number might be zero, and that's
+            /// ~10x slower than doing the bitwise operator and the add under SSE4
+#pragma clang loop vectorize(enable) vectorize_width(64/sizeof(T)) unroll_count(128 / sizeof(T))
+#endif
+            for (size_t i = 0; i < count; i++)
             {
-                for (size_t i = 0; i < unroll_count; ++i)
-                {
-                    if (!condition_map[i] == add_if_zero)
-                    {
-                        Impl::add(partial_sums[i], ptr[i]);
-                    }
-                }
-                ptr += unroll_count;
-                condition_map += unroll_count;
+                equivalent_integer value;
+                std::memcpy(&value, &ptr[i], sizeof(T)); // Will be optimized by the compiler when strict aliasing isn't necessary
+                value &= (!*condition_map != add_if_zero) - 1; // When we want to add it this will &= -1 (no-op)
+                T d;
+                std::memcpy(&d, &value, sizeof(T)); // Same as above
+                Impl::add(sum, d);
             }
-
-            for (size_t i = 0; i < unroll_count; ++i)
-                Impl::add(sum, partial_sums[i]);
+            return;
         }
 
         T local_sum{};

From b7358636c1ed6bef47394314fb669f4055b6dadf Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Sat, 11 Sep 2021 18:10:18 +0300
Subject: [PATCH 193/273] remove duplicated libraries

---
 docker/packager/binary/Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index 6595a4b4fad..0cfe43d5a9a 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -46,8 +46,6 @@ RUN apt-get update \
         gdb \
         git \
         gperf \
-        libicu-dev \
-        libreadline-dev \
         clang-${LLVM_VERSION} \
         clang-tidy-${LLVM_VERSION} \
         lld-${LLVM_VERSION} \

From d2c678928c550e9152599a77599d4cf4a4200948 Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Sat, 11 Sep 2021 18:14:00 +0300
Subject: [PATCH 194/273] remove cases with unspecified behaviour (out of
 UInt64 range)

---
 .../0_stateless/01492_format_readable_quantity.reference     | 5 -----
 tests/queries/0_stateless/01492_format_readable_quantity.sql | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/tests/queries/0_stateless/01492_format_readable_quantity.reference b/tests/queries/0_stateless/01492_format_readable_quantity.reference
index 3736933b5ee..e58a1954eee 100644
--- a/tests/queries/0_stateless/01492_format_readable_quantity.reference
+++ b/tests/queries/0_stateless/01492_format_readable_quantity.reference
@@ -43,8 +43,3 @@
 1739.27 quadrillion	1739.27 quadrillion	-2.15 billion
 4727.84 quadrillion	4727.84 quadrillion	-2.15 billion
 12851.60 quadrillion	12851.60 quadrillion	-2.15 billion
-34934.27 quadrillion	0.00	-2.15 billion
-94961.19 quadrillion	0.00	-2.15 billion
-258131.29 quadrillion	0.00	-2.15 billion
-701673.59 quadrillion	0.00	-2.15 billion
-1907346.57 quadrillion	0.00	-2.15 billion
diff --git a/tests/queries/0_stateless/01492_format_readable_quantity.sql b/tests/queries/0_stateless/01492_format_readable_quantity.sql
index c2ebcfc1a97..3931cde49df 100644
--- a/tests/queries/0_stateless/01492_format_readable_quantity.sql
+++ b/tests/queries/0_stateless/01492_format_readable_quantity.sql
@@ -1,4 +1,4 @@
 WITH round(exp(number), 6) AS x, toUInt64(x) AS y, toInt32(x) AS z
 SELECT formatReadableQuantity(x), formatReadableQuantity(y), formatReadableQuantity(z)
 FROM system.numbers
-LIMIT 50;
+LIMIT 45;

From 3401b32e37357e68f0cd85c6626f78e2c425bafc Mon Sep 17 00:00:00 2001
From: Mike Kot <to@myrrc.dev>
Date: Fri, 10 Sep 2021 23:28:43 +0200
Subject: [PATCH 195/273] Adapted usage of is_decimal concept

---
 base/common/Decimal.h                         | 32 ++++++-------
 base/common/EnumReflection.h                  | 27 +++--------
 base/common/extended_types.h                  |  3 --
 base/common/find_symbols.h                    | 12 +++--
 base/common/strong_typedef.h                  |  2 -
 .../AggregateFunctionAvgWeighted.h            |  4 +-
 .../AggregateFunctionGroupArrayMoving.h       | 25 +++++-----
 src/AggregateFunctions/AggregateFunctionSum.h | 24 ++++++----
 .../AggregateFunctionSumCount.h               | 33 ++++++-------
 src/Columns/ColumnDecimal.cpp                 |  2 +-
 src/Common/ExternalLoaderStatus.h             |  2 +-
 src/Common/RadixSort.h                        |  2 +-
 src/Core/DecimalFunctions.h                   | 20 ++++----
 src/Core/Types.h                              |  3 +-
 src/DataTypes/IDataType.h                     |  2 +-
 src/Dictionaries/DictionaryStructure.h        |  2 +
 src/Functions/FunctionBinaryArithmetic.h      | 47 +++++++------------
 src/Functions/FunctionsRound.h                | 22 ++++-----
 src/Functions/GregorianDate.h                 | 20 ++++----
 src/Functions/array/arrayElement.cpp          |  2 +-
 src/IO/Operators.h                            | 12 +++--
 src/IO/ReadHelpers.h                          |  3 +-
 src/IO/ReadSettings.h                         |  1 +
 src/IO/WriteHelpers.h                         |  6 ++-
 src/Interpreters/RowRefs.cpp                  |  2 +-
 src/Interpreters/RowRefs.h                    |  4 +-
 26 files changed, 146 insertions(+), 168 deletions(-)

diff --git a/base/common/Decimal.h b/base/common/Decimal.h
index 7e21688683b..e856abf23c7 100644
--- a/base/common/Decimal.h
+++ b/base/common/Decimal.h
@@ -1,8 +1,5 @@
 #pragma once
-
-#include <concepts>
 #include "common/extended_types.h"
-#include "common/types.h"
 
 #if !defined(NO_SANITIZE_UNDEFINED)
 #if defined(__clang__)
@@ -12,7 +9,6 @@
 #endif
 #endif
 
-
 namespace DB
 {
 template <class> struct Decimal;
@@ -25,20 +21,20 @@ using Decimal256 = Decimal<Int256>;
 
 template <class T>
 concept is_decimal =
-    std::same_as<T, Decimal32>
-    || std::same_as<T, Decimal64>
-    || std::same_as<T, Decimal128>
-    || std::same_as<T, Decimal256>
-    || std::same_as<T, DateTime64>;
+    std::is_same_v<T, Decimal32>
+    || std::is_same_v<T, Decimal64>
+    || std::is_same_v<T, Decimal128>
+    || std::is_same_v<T, Decimal256>
+    || std::is_same_v<T, DateTime64>;
 
 template <class T>
 concept is_over_big_int =
-    std::same_as<T, Int128>
-    || std::same_as<T, UInt128>
-    || std::same_as<T, Int256>
-    || std::same_as<T, UInt256>
-    || std::same_as<T, Decimal128>
-    || std::same_as<T, Decimal256>;
+    std::is_same_v<T, Int128>
+    || std::is_same_v<T, UInt128>
+    || std::is_same_v<T, Int256>
+    || std::is_same_v<T, UInt256>
+    || std::is_same_v<T, Decimal128>
+    || std::is_same_v<T, Decimal256>;
 
 template <class T> struct NativeTypeT { using Type = T; };
 template <is_decimal T> struct NativeTypeT<T> { using Type = typename T::NativeType; };
@@ -69,7 +65,7 @@ struct Decimal
     template <typename U>
     constexpr U convertTo() const
     {
-        if constexpr(is_decimal<U>)
+        if constexpr (is_decimal<U>)
             return convertTo<typename U::NativeType>();
         else
             return static_cast<U>(value);
@@ -106,8 +102,8 @@ template <typename T> inline Decimal<T> operator* (const Decimal<T> & x, const D
 template <typename T> inline Decimal<T> operator/ (const Decimal<T> & x, const Decimal<T> & y) { return x.value / y.value; }
 template <typename T> inline Decimal<T> operator- (const Decimal<T> & x) { return -x.value; }
 
-// Distinguishable type to allow function resolution/deduction based on value type,
-// but also relatively easy to convert to/from Decimal64.
+/// Distinguishable type to allow function resolution/deduction based on value type,
+/// but also relatively easy to convert to/from Decimal64.
 class DateTime64 : public Decimal64
 {
 public:
diff --git a/base/common/EnumReflection.h b/base/common/EnumReflection.h
index e491f96267d..0d1f8ae0a40 100644
--- a/base/common/EnumReflection.h
+++ b/base/common/EnumReflection.h
@@ -1,27 +1,13 @@
 #pragma once
 
-#include <type_traits>
 #include <magic_enum.hpp>
 #include <fmt/format.h>
 
-namespace DB { template <class T> concept is_enum = std::is_enum_v<T>; }
-
-//template <DB::is_enum E, class F, size_t I1, size_t ...I>
-//constexpr void static_for(F && f, std::index_sequence<I...>)
-//{
-//    constexpr auto constant = std::integral_constant<E, magic_enum::enum_value<E>(I1)>();
-//
-//    if (!std::forward<F>(f)(constant))
-//        return;
-//
-//    if constexpr (sizeof...(I) > 0)
-//        static_for<E>(std::forward<F>(f), std::index_sequence<I...>());
-//}
-//}
+template <class T> concept is_enum = std::is_enum_v<T>;
 
 namespace detail
 {
-template <DB::is_enum E, class F, size_t ...I>
+template <is_enum E, class F, size_t ...I>
 constexpr void static_for(F && f, std::index_sequence<I...>)
 {
     (std::forward<F>(f)(std::integral_constant<E, magic_enum::enum_value<E>(I)>()) , ...);
@@ -34,7 +20,7 @@ constexpr void static_for(F && f, std::index_sequence<I...>)
  * @example static_for<E>([](auto enum_value) { return template_func<enum_value>(); }
  * ^ enum_value can be used as a template parameter
  */
-template <DB::is_enum E, class F>
+template <is_enum E, class F>
 constexpr void static_for(F && f)
 {
     constexpr size_t count = magic_enum::enum_count<E>();
@@ -42,12 +28,11 @@ constexpr void static_for(F && f)
 }
 
 /// Enable printing enum values as strings via fmt + magic_enum
-template <DB::is_enum T>
+template <is_enum T>
 struct fmt::formatter<T> : fmt::formatter<std::string_view>
 {
-    constexpr auto format(T enum_value, auto& format_context)
+    constexpr auto format(T value, auto& format_context)
     {
-        return formatter<string_view>::format(
-            magic_enum::enum_name(enum_value), format_context);
+        return formatter<string_view>::format(magic_enum::enum_name(value), format_context);
     }
 };
diff --git a/base/common/extended_types.h b/base/common/extended_types.h
index 0b3e9654406..cbd5688c491 100644
--- a/base/common/extended_types.h
+++ b/base/common/extended_types.h
@@ -41,8 +41,6 @@ template <> struct is_unsigned<UInt256> { static constexpr bool value = true; };
 template <typename T>
 inline constexpr bool is_unsigned_v = is_unsigned<T>::value;
 
-namespace DB
-{
 template <class T> concept is_integer =
     std::is_integral_v<T>
     || std::is_same_v<T, Int128>
@@ -51,7 +49,6 @@ template <class T> concept is_integer =
     || std::is_same_v<T, UInt256>;
 
 template <class T> concept is_floating_point = std::is_floating_point_v<T>;
-}
 
 template <typename T>
 struct is_arithmetic
diff --git a/base/common/find_symbols.h b/base/common/find_symbols.h
index d8c89a4d91a..b28749afda6 100644
--- a/base/common/find_symbols.h
+++ b/base/common/find_symbols.h
@@ -67,7 +67,11 @@ constexpr uint16_t maybe_negate(uint16_t x)
         return ~x;
 }
 
-enum class ReturnMode { End, Nullptr };
+enum class ReturnMode
+{
+    End,
+    Nullptr,
+};
 
 
 template <bool positive, ReturnMode return_mode, char... symbols>
@@ -180,10 +184,8 @@ inline const char * find_first_symbols_sse42(const char * const begin, const cha
 
 template <bool positive, ReturnMode return_mode, char... symbols>
 inline const char * find_first_symbols_dispatch(const char * begin, const char * end)
+    requires(0 <= sizeof...(symbols) && sizeof...(symbols) <= 16)
 {
-    static_assert(sizeof...(symbols) <= 16, "Symbols mask max size is 16");
-    static_assert(sizeof...(symbols) > 0, "Symbols mask cannot be empty");
-
 #if defined(__SSE4_2__)
     if (sizeof...(symbols) >= 5)
         return find_first_symbols_sse42<positive, return_mode, sizeof...(symbols), symbols...>(begin, end);
@@ -191,8 +193,10 @@ inline const char * find_first_symbols_dispatch(const char * begin, const char *
 #endif
         return find_first_symbols_sse2<positive, return_mode, symbols...>(begin, end);
 }
+
 }
 
+
 template <char... symbols>
 inline const char * find_first_symbols(const char * begin, const char * end)
 {
diff --git a/base/common/strong_typedef.h b/base/common/strong_typedef.h
index 294bfff76f1..0c2e9ca7e8e 100644
--- a/base/common/strong_typedef.h
+++ b/base/common/strong_typedef.h
@@ -14,10 +14,8 @@ private:
 
 public:
     using UnderlyingType = T;
-
     template <class Enable = typename std::is_copy_constructible<T>::type>
     constexpr explicit StrongTypedef(const T & t_) : t(t_) {}
-
     template <class Enable = typename std::is_move_constructible<T>::type>
     constexpr explicit StrongTypedef(T && t_) : t(std::move(t_)) {}
 
diff --git a/src/AggregateFunctions/AggregateFunctionAvgWeighted.h b/src/AggregateFunctions/AggregateFunctionAvgWeighted.h
index 5641851f17b..6189ae92ce4 100644
--- a/src/AggregateFunctions/AggregateFunctionAvgWeighted.h
+++ b/src/AggregateFunctions/AggregateFunctionAvgWeighted.h
@@ -34,10 +34,10 @@ public:
 
     void NO_SANITIZE_UNDEFINED add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
-        const auto& weights = static_cast<const DecimalOrVectorCol<Weight> &>(*columns[1]);
+        const auto& weights = static_cast<const ColumnVectorOrDecimal<Weight> &>(*columns[1]);
 
         this->data(place).numerator += static_cast<Numerator>(
-            static_cast<const DecimalOrVectorCol<Value> &>(*columns[0]).getData()[row_num]) *
+            static_cast<const ColumnVectorOrDecimal<Value> &>(*columns[0]).getData()[row_num]) *
             static_cast<Numerator>(weights.getData()[row_num]);
 
         this->data(place).denominator += static_cast<Denominator>(weights.getData()[row_num]);
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h
index 0c91ebae887..a3b7dc841b6 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h
@@ -92,24 +92,13 @@ public:
     /// Probably for overflow function in the future.
     using ColumnResult = ColumnVectorOrDecimal<ResultT>;
 
-    using DataTypeResult = std::conditional_t<is_decimal<ResultT>,
-        DataTypeDecimal<ResultT>,
-        DataTypeNumber<ResultT>>;
-
     explicit MovingImpl(const DataTypePtr & data_type_, UInt64 window_size_ = std::numeric_limits<UInt64>::max())
         : IAggregateFunctionDataHelper<Data, MovingImpl<T, Tlimit_num_elems, Data>>({data_type_}, {})
         , window_size(window_size_) {}
 
     String getName() const override { return Data::name; }
 
-    DataTypePtr getReturnType() const override
-    {
-        if constexpr (is_decimal<ResultT>)
-            return std::make_shared<DataTypeArray>(std::make_shared<DataTypeResult>(
-                DataTypeResult::maxPrecision(), getDecimalScale(*this->argument_types.at(0))));
-        else
-            return std::make_shared<DataTypeArray>(std::make_shared<DataTypeResult>());
-    }
+    DataTypePtr getReturnType() const override { return std::make_shared<DataTypeArray>(getReturnTypeElement()); }
 
     void NO_SANITIZE_UNDEFINED add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
     {
@@ -192,6 +181,18 @@ public:
     {
         return true;
     }
+
+private:
+    auto getReturnTypeElement() const
+    {
+        if constexpr (!is_decimal<ResultT>)
+            return std::make_shared<DataTypeNumber<ResultT>>();
+        else
+        {
+            using Res = DataTypeDecimal<ResultT>;
+            return std::make_shared<Res>(Res::maxPrecision(), getDecimalScale(*this->argument_types.at(0)));
+        }
+    }
 };
 
 #undef AGGREGATE_FUNCTION_MOVING_MAX_ARRAY_SIZE
diff --git a/src/AggregateFunctions/AggregateFunctionSum.h b/src/AggregateFunctions/AggregateFunctionSum.h
index 2e1357c895d..a592b81ea5c 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.h
+++ b/src/AggregateFunctions/AggregateFunctionSum.h
@@ -104,7 +104,7 @@ struct AggregateFunctionSumData
         const auto * end = ptr + count;
 
         if constexpr (
-            (is_integer_v<T> && !is_big_int_v<T>)
+            (is_integer<T> && !is_big_int_v<T>)
             || (is_decimal<T> && !std::is_same_v<T, Decimal256> && !std::is_same_v<T, Decimal128>))
         {
             /// For integers we can vectorize the operation if we replace the null check using a multiplication (by 0 for null, 1 for not null)
@@ -334,9 +334,7 @@ class AggregateFunctionSum final : public IAggregateFunctionDataHelper<Data, Agg
 public:
     static constexpr bool DateTime64Supported = false;
 
-    using ResultDataType = std::conditional_t<is_decimal<T>, DataTypeDecimal<TResult>, DataTypeNumber<TResult>>;
     using ColVecType = ColumnVectorOrDecimal<T>;
-    using ColVecResult = std::conditional_t<is_decimal<T>, ColumnDecimal<TResult>, ColumnVector<TResult>>;
 
     String getName() const override
     {
@@ -361,10 +359,13 @@ public:
 
     DataTypePtr getReturnType() const override
     {
-        if constexpr (is_decimal<T>)
-            return std::make_shared<ResultDataType>(ResultDataType::maxPrecision(), scale);
+        if constexpr (!is_decimal<T>)
+            return std::make_shared<DataTypeNumber<TResult>>();
         else
-            return std::make_shared<ResultDataType>();
+        {
+            using DataType = DataTypeDecimal<TResult>;
+            return std::make_shared<DataType>(DataType::maxPrecision(), scale);
+        }
     }
 
     bool allocatesMemoryInArena() const override { return false; }
@@ -431,8 +432,7 @@ public:
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
     {
-        auto & column = assert_cast<ColVecResult &>(to);
-        column.getData().push_back(this->data(place).get());
+        castColumnToResult(to).getData().push_back(this->data(place).get());
     }
 
 #if USE_EMBEDDED_COMPILER
@@ -511,6 +511,14 @@ public:
 
 private:
     UInt32 scale;
+
+    static constexpr auto & castColumnToResult(IColumn & to)
+    {
+        if constexpr (is_decimal<T>)
+            return assert_cast<ColumnDecimal<TResult> &>(to);
+        else
+            return assert_cast<ColumnVector<TResult> &>(to);
+    }
 };
 
 }
diff --git a/src/AggregateFunctions/AggregateFunctionSumCount.h b/src/AggregateFunctions/AggregateFunctionSumCount.h
index 493dd90df30..9892c230e1d 100644
--- a/src/AggregateFunctions/AggregateFunctionSumCount.h
+++ b/src/AggregateFunctions/AggregateFunctionSumCount.h
@@ -7,11 +7,6 @@
 
 namespace DB
 {
-template <typename T>
-using DecimalOrNumberDataType = std::conditional_t<is_decimal<T>,
-    DataTypeDecimal<AvgFieldType<T>>,
-    DataTypeNumber<AvgFieldType<T>>>;
-
 template <typename T>
 class AggregateFunctionSumCount final : public AggregateFunctionAvgBase<AvgFieldType<T>, UInt64, AggregateFunctionSumCount<T>>
 {
@@ -23,20 +18,13 @@ public:
 
     DataTypePtr getReturnType() const override
     {
-        DataTypes types;
-        if constexpr (is_decimal<T>)
-            types.emplace_back(std::make_shared<DecimalOrNumberDataType<T>>(DecimalOrNumberDataType<T>::maxPrecision(), scale));
-        else
-            types.emplace_back(std::make_shared<DecimalOrNumberDataType<T>>());
-
-        types.emplace_back(std::make_shared<DataTypeUInt64>());
-
-        return std::make_shared<DataTypeTuple>(types);
+        auto second_elem = std::make_shared<DataTypeUInt64>();
+        return std::make_shared<DataTypeTuple>(DataTypes{getReturnTypeFirstElement(), std::move(second_elem)});
     }
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const final
     {
-        assert_cast<DecimalOrVectorCol<AvgFieldType<T>> &>((assert_cast<ColumnTuple &>(to)).getColumn(0)).getData().push_back(
+        assert_cast<ColumnVectorOrDecimal<AvgFieldType<T>> &>((assert_cast<ColumnTuple &>(to)).getColumn(0)).getData().push_back(
             this->data(place).numerator);
 
         assert_cast<ColumnUInt64 &>((assert_cast<ColumnTuple &>(to)).getColumn(1)).getData().push_back(
@@ -45,7 +33,7 @@ public:
 
     void NO_SANITIZE_UNDEFINED add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const final
     {
-        this->data(place).numerator += static_cast<const DecimalOrVectorCol<T> &>(*columns[0]).getData()[row_num];
+        this->data(place).numerator += static_cast<const ColumnVectorOrDecimal<T> &>(*columns[0]).getData()[row_num];
         ++this->data(place).denominator;
     }
 
@@ -62,6 +50,19 @@ public:
 
 private:
     UInt32 scale;
+
+    auto getReturnTypeFirstElement() const
+    {
+        using FieldType = AvgFieldType<T>;
+
+        if constexpr (!is_decimal<T>)
+            return std::make_shared<DataTypeNumber<FieldType>>();
+        else
+        {
+            using DataType = DataTypeDecimal<FieldType>;
+            return std::make_shared<DataType>(DataType::maxPrecision(), scale);
+        }
+    }
 };
 
 }
diff --git a/src/Columns/ColumnDecimal.cpp b/src/Columns/ColumnDecimal.cpp
index dadb8194ae0..ceda12c4b84 100644
--- a/src/Columns/ColumnDecimal.cpp
+++ b/src/Columns/ColumnDecimal.cpp
@@ -19,7 +19,7 @@
 #include <DataStreams/ColumnGathererStream.h>
 
 
-template <class T> bool decimalLess(T x, T y, UInt32 x_scale, UInt32 y_scale);
+template <typename T> bool decimalLess(T x, T y, UInt32 x_scale, UInt32 y_scale);
 
 namespace DB
 {
diff --git a/src/Common/ExternalLoaderStatus.h b/src/Common/ExternalLoaderStatus.h
index 11f04a318a2..666bb23e75e 100644
--- a/src/Common/ExternalLoaderStatus.h
+++ b/src/Common/ExternalLoaderStatus.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <vector>
-#include <common/types.h>
 #include <common/EnumReflection.h>
+#include <common/types.h>
 
 namespace DB
 {
diff --git a/src/Common/RadixSort.h b/src/Common/RadixSort.h
index 46ebbf2febe..65ef32f3d81 100644
--- a/src/Common/RadixSort.h
+++ b/src/Common/RadixSort.h
@@ -187,7 +187,7 @@ struct RadixSortIntTraits
 
 template <typename T>
 using RadixSortNumTraits = std::conditional_t<
-    DB::is_integer<T>,
+    is_integer<T>,
     std::conditional_t<is_unsigned_v<T>, RadixSortUIntTraits<T>, RadixSortIntTraits<T>>,
     RadixSortFloatTraits<T>>;
 
diff --git a/src/Core/DecimalFunctions.h b/src/Core/DecimalFunctions.h
index cd016f05cb5..8f8e6b304cb 100644
--- a/src/Core/DecimalFunctions.h
+++ b/src/Core/DecimalFunctions.h
@@ -6,6 +6,7 @@
 #include <common/arithmeticOverflow.h>
 
 #include <limits>
+#include <type_traits>
 
 
 namespace DB
@@ -222,16 +223,16 @@ inline typename DecimalType::NativeType getFractionalPart(const DecimalType & de
 template <typename To, typename DecimalType, typename ReturnType>
 ReturnType convertToImpl(const DecimalType & decimal, size_t scale, To & result)
 {
-    using NativeT = typename DecimalType::NativeType;
-    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+    using DecimalNativeType = typename DecimalType::NativeType;
+    static constexpr bool throw_exception = std::is_void_v<ReturnType>;
 
     if constexpr (std::is_floating_point_v<To>)
     {
-        result = static_cast<To>(decimal.value) / static_cast<To>(scaleMultiplier<NativeT>(scale));
+        result = static_cast<To>(decimal.value) / static_cast<To>(scaleMultiplier<DecimalNativeType>(scale));
     }
-    else if constexpr (is_integer<To> && (sizeof(To) >= sizeof(NativeT)))
+    else if constexpr (is_integer<To> && (sizeof(To) >= sizeof(DecimalNativeType)))
     {
-        NativeT whole = getWholePart(decimal, scale);
+        DecimalNativeType whole = getWholePart(decimal, scale);
 
         if constexpr (is_unsigned_v<To>)
         {
@@ -248,13 +249,12 @@ ReturnType convertToImpl(const DecimalType & decimal, size_t scale, To & result)
     }
     else if constexpr (is_integer<To>)
     {
-        using ToNativeT = NativeType<To>;
-        using CastTo = std::conditional_t<(is_big_int_v<NativeT> && std::is_same_v<ToNativeT, UInt8>), uint8_t, ToNativeT>;
+        using CastTo = std::conditional_t<(is_big_int_v<DecimalNativeType> && std::is_same_v<To, UInt8>), uint8_t, To>;
 
-        const NativeT whole = getWholePart(decimal, scale);
+        const DecimalNativeType whole = getWholePart(decimal, scale);
 
-        static const constexpr CastTo min_to = std::numeric_limits<ToNativeT>::min();
-        static const constexpr CastTo max_to = std::numeric_limits<ToNativeT>::max();
+        static const constexpr CastTo min_to = std::numeric_limits<To>::min();
+        static const constexpr CastTo max_to = std::numeric_limits<To>::max();
 
         if (whole < min_to || whole > max_to)
         {
diff --git a/src/Core/Types.h b/src/Core/Types.h
index 01838f3a9e1..e3ff386fe53 100644
--- a/src/Core/Types.h
+++ b/src/Core/Types.h
@@ -46,7 +46,6 @@ struct Null
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
 #endif
-
 /// @note Except explicitly described you should not assume on TypeIndex numbers and/or their orders in this enum.
 enum class TypeIndex
 {
@@ -88,11 +87,11 @@ enum class TypeIndex
     LowCardinality,
     Map,
 };
-
 #if !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 
+
 using UInt128 = ::UInt128;
 using UInt256 = ::UInt256;
 using Int128 = ::Int128;
diff --git a/src/DataTypes/IDataType.h b/src/DataTypes/IDataType.h
index 7e9b3ac873b..bf7869f6b8a 100644
--- a/src/DataTypes/IDataType.h
+++ b/src/DataTypes/IDataType.h
@@ -501,7 +501,7 @@ class DataTypeDate32;
 class DataTypeDateTime;
 class DataTypeDateTime64;
 
-template <typename T> constexpr bool IsDataTypeDecimal<DataTypeDecimal<T>> = true;
+template <is_decimal T> constexpr bool IsDataTypeDecimal<DataTypeDecimal<T>> = true;
 template <> inline constexpr bool IsDataTypeDecimal<DataTypeDateTime64> = true;
 
 template <typename T> constexpr bool IsDataTypeNumber<DataTypeNumber<T>> = true;
diff --git a/src/Dictionaries/DictionaryStructure.h b/src/Dictionaries/DictionaryStructure.h
index e6a243a8ed5..6daba422e92 100644
--- a/src/Dictionaries/DictionaryStructure.h
+++ b/src/Dictionaries/DictionaryStructure.h
@@ -140,5 +140,7 @@ private:
 
     /// parse range_min and range_max
     void parseRangeConfiguration(const Poco::Util::AbstractConfiguration & config, const std::string & structure_prefix);
+
 };
+
 }
diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index 07bd555e549..35d169b9409 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -183,14 +183,8 @@ namespace impl_
 
 enum class OpCase { Vector, LeftConstant, RightConstant };
 
-template <class T>
-inline constexpr const auto & undec(const T & x)
-{
-    if constexpr (is_decimal<T>)
-        return x.value;
-    else
-        return x;
-}
+template <class T> inline constexpr const auto & undec(const T & x) { return x; }
+template <is_decimal T> inline constexpr const auto & undec(const T & x) { return x.value; }
 
 template <typename A, typename B, typename Op, typename OpResultType = typename Op::ResultType>
 struct BinaryOperation
@@ -303,17 +297,15 @@ private:
     using ResultType = OpResultType; // e.g. Decimal32
     using NativeResultType = NativeType<ResultType>; // e.g. UInt32 for Decimal32
 
-    using ResultContainerType = typename std::conditional_t<is_decimal<ResultType>,
-        ColumnDecimal<ResultType>,
-        ColumnVector<ResultType>>::Container;
+    using ResultContainerType = typename ColumnVectorOrDecimal<ResultType>::Container;
 
 public:
-    template <OpCase op_case, bool is_decimal_a, bool is_decimal_b, class A, class B>
-    static void NO_INLINE process(const A & a, const B & b, ResultContainerType & c,
+    template <OpCase op_case, bool is_decimal_a, bool is_decimal_b>
+    static void NO_INLINE process(const auto & a, const auto & b, ResultContainerType & c,
         NativeResultType scale_a, NativeResultType scale_b)
     {
-        if constexpr (op_case == OpCase::LeftConstant) static_assert(!is_decimal<A>);
-        if constexpr (op_case == OpCase::RightConstant) static_assert(!is_decimal<B>);
+        if constexpr (op_case == OpCase::LeftConstant) static_assert(!is_decimal<decltype(a)>);
+        if constexpr (op_case == OpCase::RightConstant) static_assert(!is_decimal<decltype(b)>);
 
         size_t size;
 
@@ -383,10 +375,8 @@ public:
 
     template <bool is_decimal_a, bool is_decimal_b, class A, class B>
     static ResultType process(A a, B b, NativeResultType scale_a, NativeResultType scale_b)
+        requires(!is_decimal<A> && !is_decimal<B>)
     {
-        static_assert(!is_decimal<A>);
-        static_assert(!is_decimal<B>);
-
         if constexpr (is_division && is_decimal_b)
             return applyScaledDiv<is_decimal_a>(a, b, scale_a);
         else if constexpr (is_plus_minus_compare)
@@ -787,13 +777,13 @@ class FunctionBinaryArithmetic : public IFunction
         return function->execute(new_arguments, result_type, input_rows_count);
     }
 
-    template <typename T, typename ResultDataType, typename CC, typename C>
-    static auto helperGetOrConvert(const CC & col_const, const C & col)
+    template <typename T, typename ResultDataType>
+    static auto helperGetOrConvert(const auto & col_const, const auto & col)
     {
         using ResultType = typename ResultDataType::FieldType;
         using NativeResultType = NativeType<ResultType>;
 
-        if constexpr (is_floating_point<ResultDataType> && is_decimal<T>)
+        if constexpr (IsFloatingPoint<ResultDataType> && is_decimal<T>)
             return DecimalUtils::convertTo<NativeResultType>(col_const->template getValue<T>(), col.getScale());
         else if constexpr (is_decimal<T>)
             return col_const->template getValue<T>().value;
@@ -801,9 +791,8 @@ class FunctionBinaryArithmetic : public IFunction
             return col_const->template getValue<T>();
     }
 
-    template <OpCase op_case, bool left_decimal, bool right_decimal, typename OpImpl, typename OpImplCheck,
-              typename L, typename R, typename VR, typename SA, typename SB>
-    void helperInvokeEither(const L& left, const R& right, VR& vec_res, SA scale_a, SB scale_b) const
+    template <OpCase op_case, bool left_decimal, bool right_decimal, typename OpImpl, typename OpImplCheck>
+    void helperInvokeEither(const auto& left, const auto& right, auto& vec_res, auto scale_a, auto scale_b) const
     {
         if (check_decimal_overflow)
             OpImplCheck::template process<op_case, left_decimal, right_decimal>(left, right, vec_res, scale_a, scale_b);
@@ -811,12 +800,11 @@ class FunctionBinaryArithmetic : public IFunction
             OpImpl::template process<op_case, left_decimal, right_decimal>(left, right, vec_res, scale_a, scale_b);
     }
 
-    template <class LeftDataType, class RightDataType, class ResultDataType,
-              class L, class R, class CL, class CR>
+    template <class LeftDataType, class RightDataType, class ResultDataType>
     ColumnPtr executeNumericWithDecimal(
-        const L & left, const R & right,
+        const auto & left, const auto & right,
         const ColumnConst * const col_left_const, const ColumnConst * const col_right_const,
-        const CL * const col_left, const CR * const col_right,
+        const auto * const col_left, const auto * const col_right,
         size_t col_left_size) const
     {
         using T0 = typename LeftDataType::FieldType;
@@ -827,8 +815,7 @@ class FunctionBinaryArithmetic : public IFunction
         using OpImpl = DecimalBinaryOperation<Op, ResultType, false>;
         using OpImplCheck = DecimalBinaryOperation<Op, ResultType, true>;
 
-        using ColVecResult = std::conditional_t<is_decimal<ResultType>,
-            ColumnDecimal<ResultType>, ColumnVector<ResultType>>;
+        using ColVecResult = ColumnVectorOrDecimal<ResultType>;
 
         static constexpr const bool left_is_decimal = is_decimal<T0>;
         static constexpr const bool right_is_decimal = is_decimal<T1>;
diff --git a/src/Functions/FunctionsRound.h b/src/Functions/FunctionsRound.h
index 820107da515..3474790b8b3 100644
--- a/src/Functions/FunctionsRound.h
+++ b/src/Functions/FunctionsRound.h
@@ -451,15 +451,16 @@ public:
 /** Select the appropriate processing algorithm depending on the scale.
   */
 template <typename T, RoundingMode rounding_mode, TieBreakingMode tie_breaking_mode>
-class Dispatcher
+struct Dispatcher
 {
     template <ScaleMode scale_mode>
     using FunctionRoundingImpl = std::conditional_t<std::is_floating_point_v<T>,
         FloatRoundingImpl<T, rounding_mode, scale_mode>,
         IntegerRoundingImpl<T, rounding_mode, scale_mode, tie_breaking_mode>>;
 
-    static ColumnPtr apply(const ColumnVector<T> * col, Scale scale_arg)
+    static ColumnPtr apply(const IColumn * col_general, Scale scale_arg)
     {
+        const auto * const col = checkAndGetColumn<ColumnVector<T>>(col_general);
         auto col_res = ColumnVector<T>::create();
 
         typename ColumnVector<T>::Container & vec_res = col_res->getData();
@@ -486,9 +487,15 @@ class Dispatcher
 
         return col_res;
     }
+};
 
-    static ColumnPtr apply(const ColumnDecimal<T> * col, Scale scale_arg)
+template <is_decimal T, RoundingMode rounding_mode, TieBreakingMode tie_breaking_mode>
+struct Dispatcher<T, rounding_mode, tie_breaking_mode>
+{
+public:
+    static ColumnPtr apply(const IColumn * col_general, Scale scale_arg)
     {
+        const auto * const col = checkAndGetColumn<ColumnDecimal<T>>(col_general);
         const typename ColumnDecimal<T>::Container & vec_src = col->getData();
 
         auto col_res = ColumnDecimal<T>::create(vec_src.size(), vec_src.getScale());
@@ -499,15 +506,6 @@ class Dispatcher
 
         return col_res;
     }
-
-public:
-    static ColumnPtr apply(const IColumn * column, Scale scale_arg)
-    {
-        if constexpr (is_arithmetic_v<T>)
-            return apply(checkAndGetColumn<ColumnVector<T>>(column), scale_arg);
-        else if constexpr (is_decimal<T>)
-            return apply(checkAndGetColumn<ColumnDecimal<T>>(column), scale_arg);
-    }
 };
 
 /** A template for functions that round the value of an input parameter of type
diff --git a/src/Functions/GregorianDate.h b/src/Functions/GregorianDate.h
index 2c1caa6523b..765e8cc2aa3 100644
--- a/src/Functions/GregorianDate.h
+++ b/src/Functions/GregorianDate.h
@@ -38,14 +38,13 @@ namespace DB
           * integral type which should be at least 32 bits wide, and
           * should preferably signed.
           */
-        template <typename T, std::enable_if_t<is_integer<T>> * = nullptr>
-        GregorianDate(T mjd);
+        GregorianDate(is_integer auto mjd);
 
         /** Convert to Modified Julian Day. The type T is an integral type
           * which should be at least 32 bits wide, and should preferably
           * signed.
           */
-        template <typename T, std::enable_if_t<is_integer<T>> * = nullptr>
+        template <is_integer T>
         T toModifiedJulianDay() const;
 
         /** Write the date in text form 'YYYY-MM-DD' to a buffer.
@@ -90,14 +89,13 @@ namespace DB
           * integral type which should be at least 32 bits wide, and
           * should preferably signed.
           */
-        template <typename T, std::enable_if_t<is_integer<T>> * = nullptr>
-        OrdinalDate(T mjd);
+        OrdinalDate(is_integer auto mjd);
 
         /** Convert to Modified Julian Day. The type T is an integral
           * type which should be at least 32 bits wide, and should
           * preferably be signed.
           */
-        template <typename T, std::enable_if_t<is_integer<T>> * = nullptr>
+        template <is_integer T>
         T toModifiedJulianDay() const noexcept;
 
         YearT year() const noexcept
@@ -259,8 +257,7 @@ namespace DB
     }
 
     template <typename YearT>
-    template <typename T, std::enable_if_t<is_integer<T>> *>
-    GregorianDate<YearT>::GregorianDate(T mjd)
+    GregorianDate<YearT>::GregorianDate(is_integer auto mjd)
     {
         const OrdinalDate<YearT> ord(mjd);
         const MonthDay md(gd::is_leap_year(ord.year()), ord.dayOfYear());
@@ -270,7 +267,7 @@ namespace DB
     }
 
     template <typename YearT>
-    template <typename T, std::enable_if_t<is_integer<T>> *>
+    template <is_integer T>
     T GregorianDate<YearT>::toModifiedJulianDay() const
     {
         const MonthDay md(month_, day_of_month_);
@@ -332,8 +329,7 @@ namespace DB
     }
 
     template <typename YearT>
-    template <typename T, std::enable_if_t<is_integer<T>> *>
-    OrdinalDate<YearT>::OrdinalDate(T mjd)
+    OrdinalDate<YearT>::OrdinalDate(is_integer auto mjd)
     {
         const auto a         = mjd + 678575;
         const auto quad_cent = gd::div(a, 146097);
@@ -348,7 +344,7 @@ namespace DB
     }
 
     template <typename YearT>
-    template <typename T, std::enable_if_t<is_integer<T>> *>
+    template <is_integer T>
     T OrdinalDate<YearT>::toModifiedJulianDay() const noexcept
     {
         const auto y = year_ - 1;
diff --git a/src/Functions/array/arrayElement.cpp b/src/Functions/array/arrayElement.cpp
index a4cdc601d84..887203ae58e 100644
--- a/src/Functions/array/arrayElement.cpp
+++ b/src/Functions/array/arrayElement.cpp
@@ -904,7 +904,7 @@ bool FunctionArrayElement::matchKeyToIndexString(
 template <typename FromType, typename ToType>
 static constexpr bool areConvertibleTypes =
     std::is_same_v<FromType, ToType>
-        || (is_integer_v<FromType> && is_integer_v<ToType>
+        || (is_integer<FromType> && is_integer<ToType>
             && std::is_convertible_v<FromType, ToType>);
 
 template <typename F>
diff --git a/src/IO/Operators.h b/src/IO/Operators.h
index 7e08a71acf1..114ab692dc3 100644
--- a/src/IO/Operators.h
+++ b/src/IO/Operators.h
@@ -6,10 +6,11 @@
 #include <IO/WriteHelpers.h>
 
 #include <functional>
-#include <type_traits>
+
 
 namespace DB
 {
+
 /** Implements the ability to write and read data in/from WriteBuffer/ReadBuffer
   *  with the help of << and >> operators and also manipulators,
   *  providing a way of using, similar to iostreams.
@@ -48,10 +49,10 @@ inline QuoteManipWriteBuffer       operator<< (WriteBuffer & buf, QuoteManip)
 inline DoubleQuoteManipWriteBuffer operator<< (WriteBuffer & buf, DoubleQuoteManip) { return buf; }
 inline BinaryManipWriteBuffer      operator<< (WriteBuffer & buf, BinaryManip)      { return buf; }
 
-template <typename T> WriteBuffer & operator<< (EscapeManipWriteBuffer buf,      const T & x) { writeText(x, buf.get());         return buf; }
-template <typename T> WriteBuffer & operator<< (QuoteManipWriteBuffer buf,       const T & x) { writeQuoted(x, buf.get());       return buf; }
-template <typename T> WriteBuffer & operator<< (DoubleQuoteManipWriteBuffer buf, const T & x) { writeDoubleQuoted(x, buf.get()); return buf; }
-template <typename T> WriteBuffer & operator<< (BinaryManipWriteBuffer buf,      const T & x) { writeBinary(x, buf.get());       return buf; }
+template <typename T> WriteBuffer & operator<< (EscapeManipWriteBuffer buf,        const T & x) { writeText(x, buf.get());         return buf; }
+template <typename T> WriteBuffer & operator<< (QuoteManipWriteBuffer buf,         const T & x) { writeQuoted(x, buf.get());       return buf; }
+template <typename T> WriteBuffer & operator<< (DoubleQuoteManipWriteBuffer buf,   const T & x) { writeDoubleQuoted(x, buf.get()); return buf; }
+template <typename T> WriteBuffer & operator<< (BinaryManipWriteBuffer buf,        const T & x) { writeBinary(x, buf.get());       return buf; }
 
 inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, const String & x)   { writeEscapedString(x, buf); return buf; }
 inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, std::string_view x) { writeEscapedString(x, buf); return buf; }
@@ -85,4 +86,5 @@ template <typename T> ReadBuffer & operator>> (EscapeManipReadBuffer buf,      T
 template <typename T> ReadBuffer & operator>> (QuoteManipReadBuffer buf,       T & x) { readQuoted(x, buf.get());       return buf; }
 template <typename T> ReadBuffer & operator>> (DoubleQuoteManipReadBuffer buf, T & x) { readDoubleQuoted(x, buf.get()); return buf; }
 template <typename T> ReadBuffer & operator>> (BinaryManipReadBuffer buf,      T & x) { readBinary(x, buf.get());       return buf; }
+
 }
diff --git a/src/IO/ReadHelpers.h b/src/IO/ReadHelpers.h
index e7aff3b6501..6be57cfd0d3 100644
--- a/src/IO/ReadHelpers.h
+++ b/src/IO/ReadHelpers.h
@@ -926,11 +926,12 @@ readBinaryBigEndian(T & x, ReadBuffer & buf)    /// Assuming little endian archi
     }
 }
 
+
 /// Generic methods to read value in text tab-separated format.
 
 inline void readText(is_integer auto & x, ReadBuffer & buf)
 {
-    if constexpr (std::same_as<decltype(x), bool &>)
+    if constexpr (std::is_same_v<decltype(x), bool &>)
         readBoolText(x, buf);
     else
         readIntText(x, buf);
diff --git a/src/IO/ReadSettings.h b/src/IO/ReadSettings.h
index 81ecd680037..100041d3dec 100644
--- a/src/IO/ReadSettings.h
+++ b/src/IO/ReadSettings.h
@@ -74,4 +74,5 @@ struct ReadSettings
         return res;
     }
 };
+
 }
diff --git a/src/IO/WriteHelpers.h b/src/IO/WriteHelpers.h
index d6eaa085eac..e5395e33df1 100644
--- a/src/IO/WriteHelpers.h
+++ b/src/IO/WriteHelpers.h
@@ -5,6 +5,7 @@
 #include <limits>
 #include <algorithm>
 #include <iterator>
+#include <concepts>
 
 #include <pcg-random/pcg_random.hpp>
 
@@ -178,6 +179,7 @@ inline void writeFloatText(T x, WriteBuffer & buf)
     buf.write(buffer, result);
 }
 
+
 inline void writeString(const char * data, size_t size, WriteBuffer & buf)
 {
     buf.write(data, size);
@@ -884,9 +886,9 @@ inline void writeBinary(const UUID & x, WriteBuffer & buf) { writePODBinary(x, b
 
 inline void writeText(is_integer auto x, WriteBuffer & buf)
 {
-    if constexpr (std::same_as<decltype(x), bool>)
+    if constexpr (std::is_same_v<decltype(x), bool>)
         writeBoolText(x, buf);
-    else if constexpr (std::same_as<decltype(x), char>)
+    else if constexpr (std::is_same_v<decltype(x), char>)
         writeChar(x, buf);
     else
         writeIntText(x, buf);
diff --git a/src/Interpreters/RowRefs.cpp b/src/Interpreters/RowRefs.cpp
index 1b5531b39b6..956ecc94b96 100644
--- a/src/Interpreters/RowRefs.cpp
+++ b/src/Interpreters/RowRefs.cpp
@@ -7,7 +7,6 @@
 #include <Columns/IColumn.h>
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnDecimal.h>
-#include <common/EnumReflection.h>
 
 
 namespace DB
@@ -47,6 +46,7 @@ void callWithType(TypeIndex which, F && f)
 
     __builtin_unreachable();
 }
+
 }
 
 
diff --git a/src/Interpreters/RowRefs.h b/src/Interpreters/RowRefs.h
index 2a07d8e1a34..8e5141be199 100644
--- a/src/Interpreters/RowRefs.h
+++ b/src/Interpreters/RowRefs.h
@@ -23,7 +23,7 @@ struct RowRef
     const Block * block = nullptr;
     SizeT row_num = 0;
 
-    RowRef() = default;
+    RowRef() {}
     RowRef(const Block * block_, size_t row_num_) : block(block_), row_num(row_num_) {}
 };
 
@@ -232,7 +232,7 @@ public:
         Entry<DateTime64>::LookupPtr>;
 
     AsofRowRefs() {}
-    AsofRowRefs(TypeIndex type);
+    AsofRowRefs(TypeIndex t);
 
     static std::optional<TypeIndex> getTypeSize(const IColumn & asof_column, size_t & type_size);
 

From 46eb305eecc60f1cedbe2a44903cd05fcdb9a432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Sat, 11 Sep 2021 20:11:26 +0200
Subject: [PATCH 196/273] T != Value

---
 src/AggregateFunctions/AggregateFunctionSum.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/AggregateFunctions/AggregateFunctionSum.h b/src/AggregateFunctions/AggregateFunctionSum.h
index 657d09d2701..f967aded1fa 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.h
+++ b/src/AggregateFunctions/AggregateFunctionSum.h
@@ -70,7 +70,6 @@ struct AggregateFunctionSumData
         {
 #if defined(__clang__)
 /// With clang we can tell the compiler to vectorize and it should work with all types when possible, including floating types
-/// TODO: Test how this affects non floating point types
 /// Something around the number of SSE registers * the number of elements fit in register.
 /// Recommend half of those for each vectorization
 #pragma clang loop vectorize(enable) vectorize_width(64 / sizeof(T)) unroll_count(128 / sizeof(T))
@@ -139,23 +138,24 @@ struct AggregateFunctionSumData
             /// For floating point we use a similar trick as above, except that now we use a mask instead (0 to discard, 0xFF..FF to keep)
             /// We reinterpret the floating point number as an unsigned integer of the same size
             /// This was tested with clang12. gcc11 would need to be tricked into vectorizing by iterating over the integer representation
-            static_assert(sizeof(T) == 4 || sizeof(T) == 8);
-            typedef typename std::conditional<sizeof(T) == 4, uint32_t, uint64_t>::type equivalent_integer;
+            static_assert(sizeof(Value) == 4 || sizeof(Value) == 8);
+            typedef typename std::conditional<sizeof(Value) == 4, uint32_t, uint64_t>::type equivalent_integer;
 
 #if defined(__clang__)
             /// Without these instructions clang will prefer using a jump as it knows that the number might be zero, and that's
             /// ~10x slower than doing the bitwise operator and the add under SSE4
-#pragma clang loop vectorize(enable) vectorize_width(64/sizeof(T)) unroll_count(128 / sizeof(T))
+#pragma clang loop vectorize(enable) vectorize_width(64/sizeof(Value)) unroll_count(128 / sizeof(Value))
 #endif
             for (size_t i = 0; i < count; i++)
             {
                 equivalent_integer value;
-                std::memcpy(&value, &ptr[i], sizeof(T)); // Will be optimized by the compiler when strict aliasing isn't necessary
-                value &= (!*condition_map != add_if_zero) - 1; // When we want to add it this will &= -1 (no-op)
-                T d;
-                std::memcpy(&d, &value, sizeof(T)); // Same as above
+                std::memcpy(&value, &ptr[i], sizeof(Value)); // Will be optimized by the compiler when strict aliasing isn't necessary
+                value &= (!condition_map[i] != add_if_zero) - 1; // When we want to add it this will &= -1 (no-op)
+                Value d;
+                std::memcpy(&d, &value, sizeof(Value)); // Same as above
                 Impl::add(sum, d);
             }
+
             return;
         }
 

From 2f34ab17178e81a2056d349aec8b82c4732a9811 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 11 Sep 2021 21:59:42 +0300
Subject: [PATCH 197/273] tests: update 00900_long_parquet_load.reference

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

diff --git a/tests/queries/0_stateless/00900_long_parquet_load.reference b/tests/queries/0_stateless/00900_long_parquet_load.reference
index 0fc050891f6..1efd3afd5f5 100644
--- a/tests/queries/0_stateless/00900_long_parquet_load.reference
+++ b/tests/queries/0_stateless/00900_long_parquet_load.reference
@@ -89,7 +89,7 @@ idx10	['This','is','a','test']
 23
 24
 === Try load data from datapage_v2.snappy.parquet
-Code: 33. DB::ParsingEx---tion: Error while reading Parquet data: IOError: Not yet implemented: Unsupported encoding.: While executing ParquetBlockInputFormat: data for INSERT was parsed from stdin. (CANNOT_READ_ALL_DATA)
+Code: 33. DB::ParsingEx---tion: Error while reading Parquet data: IOError: Not yet implemented: Unsupported encoding.: While executing ParquetBlockInputFormat: (in query: INSERT INTO parquet_load FORMAT Parquet): data for INSERT was parsed from stdin. (CANNOT_READ_ALL_DATA)
 
 === Try load data from datatype-date32.parquet
 1925-01-01

From 3c75844a792a5e1d039c51f0135dad16a96bb1f6 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 11 Sep 2021 22:28:46 +0300
Subject: [PATCH 198/273] Fix SIGSEGV for arrayCompact() with consts

arrayCompact() implements useDefaultImplementationForConstants() but it
is a no-op for FunctionArrayMapped, fix this.

CI report [1]:

  [1]: https://clickhouse-test-reports.s3.yandex.net/28890/baac2e561cfb05bc174f0bd25571e607d19c7463/fuzzer_asan/report.html#fail1
---
 src/Functions/array/arrayCompact.cpp                            | 2 +-
 .../queries/0_stateless/01020_function_array_compact.reference  | 2 ++
 tests/queries/0_stateless/01020_function_array_compact.sql      | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Functions/array/arrayCompact.cpp b/src/Functions/array/arrayCompact.cpp
index e0f73207da8..4126f403516 100644
--- a/src/Functions/array/arrayCompact.cpp
+++ b/src/Functions/array/arrayCompact.cpp
@@ -16,7 +16,6 @@ namespace ErrorCodes
 
 struct ArrayCompactImpl
 {
-    static bool useDefaultImplementationForConstants() { return true; }
     static bool needBoolean() { return false; }
     static bool needExpression() { return false; }
     static bool needOneArray() { return false; }
@@ -129,6 +128,7 @@ struct ArrayCompactImpl
     {
         ColumnPtr res;
 
+        mapped = mapped->convertToFullColumnIfConst();
         if (!(executeType< UInt8 >(mapped, array, res) ||
             executeType< UInt16>(mapped, array, res) ||
             executeType< UInt32>(mapped, array, res) ||
diff --git a/tests/queries/0_stateless/01020_function_array_compact.reference b/tests/queries/0_stateless/01020_function_array_compact.reference
index 6627a437251..4a6265b4f55 100644
--- a/tests/queries/0_stateless/01020_function_array_compact.reference
+++ b/tests/queries/0_stateless/01020_function_array_compact.reference
@@ -7,3 +7,5 @@
 [1,2,1]
 [2,1]
 [1,2,3,4,5]
+[0]
+[0]
diff --git a/tests/queries/0_stateless/01020_function_array_compact.sql b/tests/queries/0_stateless/01020_function_array_compact.sql
index eea69dcb6da..d4aaa4d3fca 100644
--- a/tests/queries/0_stateless/01020_function_array_compact.sql
+++ b/tests/queries/0_stateless/01020_function_array_compact.sql
@@ -7,3 +7,5 @@ select arrayCompact([1,1,2]);
 select arrayCompact([1,2,1]);
 select arrayCompact([2,1,1]);
 select arrayCompact([1,2,2,3,3,3,4,4,4,4,5,5,5,5,5]);
+SELECT arrayCompact(x->0, [NULL]);
+SELECT toString(arrayCompact(x->0, [NULL]));

From 6403cbee46284d63b8d63077d9e12c8ba2312fd7 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 11 Sep 2021 22:36:20 +0300
Subject: [PATCH 199/273] Fix arrayDifference() for consts

---
 src/Functions/array/arrayDifference.cpp                         | 2 +-
 tests/queries/0_stateless/02026_arrayDifference_const.reference | 1 +
 tests/queries/0_stateless/02026_arrayDifference_const.sql       | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 tests/queries/0_stateless/02026_arrayDifference_const.reference
 create mode 100644 tests/queries/0_stateless/02026_arrayDifference_const.sql

diff --git a/src/Functions/array/arrayDifference.cpp b/src/Functions/array/arrayDifference.cpp
index 7d11c6e89c8..ce223b5c9d8 100644
--- a/src/Functions/array/arrayDifference.cpp
+++ b/src/Functions/array/arrayDifference.cpp
@@ -20,7 +20,6 @@ namespace ErrorCodes
   */
 struct ArrayDifferenceImpl
 {
-    static bool useDefaultImplementationForConstants() { return true; }
     static bool needBoolean() { return false; }
     static bool needExpression() { return false; }
     static bool needOneArray() { return false; }
@@ -129,6 +128,7 @@ struct ArrayDifferenceImpl
     {
         ColumnPtr res;
 
+        mapped = mapped->convertToFullColumnIfConst();
         if (executeType< UInt8 ,  Int16>(mapped, array, res) ||
             executeType< UInt16,  Int32>(mapped, array, res) ||
             executeType< UInt32,  Int64>(mapped, array, res) ||
diff --git a/tests/queries/0_stateless/02026_arrayDifference_const.reference b/tests/queries/0_stateless/02026_arrayDifference_const.reference
new file mode 100644
index 00000000000..7a0beed21a5
--- /dev/null
+++ b/tests/queries/0_stateless/02026_arrayDifference_const.reference
@@ -0,0 +1 @@
+[0,0]
diff --git a/tests/queries/0_stateless/02026_arrayDifference_const.sql b/tests/queries/0_stateless/02026_arrayDifference_const.sql
new file mode 100644
index 00000000000..55a48d2bedb
--- /dev/null
+++ b/tests/queries/0_stateless/02026_arrayDifference_const.sql
@@ -0,0 +1 @@
+SELECT toString(arrayDifference(x->0, [1, 2]));

From c7e5cd7cda5bd82e8a9cecf285315eb7fcf6c95f Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 11 Sep 2021 22:38:07 +0300
Subject: [PATCH 200/273] Fix arrayCumSumNonNegative() for consts

---
 src/Functions/array/arrayCumSumNonNegative.cpp                  | 2 +-
 .../0_stateless/02027_arrayCumSumNonNegative_const.reference    | 1 +
 .../queries/0_stateless/02027_arrayCumSumNonNegative_const.sql  | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 tests/queries/0_stateless/02027_arrayCumSumNonNegative_const.reference
 create mode 100644 tests/queries/0_stateless/02027_arrayCumSumNonNegative_const.sql

diff --git a/src/Functions/array/arrayCumSumNonNegative.cpp b/src/Functions/array/arrayCumSumNonNegative.cpp
index 288422c1c9c..2d4928f35b6 100644
--- a/src/Functions/array/arrayCumSumNonNegative.cpp
+++ b/src/Functions/array/arrayCumSumNonNegative.cpp
@@ -19,7 +19,6 @@ namespace ErrorCodes
   */
 struct ArrayCumSumNonNegativeImpl
 {
-    static bool useDefaultImplementationForConstants() { return true; }
     static bool needBoolean() { return false; }
     static bool needExpression() { return false; }
     static bool needOneArray() { return false; }
@@ -100,6 +99,7 @@ struct ArrayCumSumNonNegativeImpl
     {
         ColumnPtr res;
 
+        mapped = mapped->convertToFullColumnIfConst();
         if (executeType< UInt8 , UInt64>(mapped, array, res) ||
             executeType< UInt16, UInt64>(mapped, array, res) ||
             executeType< UInt32, UInt64>(mapped, array, res) ||
diff --git a/tests/queries/0_stateless/02027_arrayCumSumNonNegative_const.reference b/tests/queries/0_stateless/02027_arrayCumSumNonNegative_const.reference
new file mode 100644
index 00000000000..7a0beed21a5
--- /dev/null
+++ b/tests/queries/0_stateless/02027_arrayCumSumNonNegative_const.reference
@@ -0,0 +1 @@
+[0,0]
diff --git a/tests/queries/0_stateless/02027_arrayCumSumNonNegative_const.sql b/tests/queries/0_stateless/02027_arrayCumSumNonNegative_const.sql
new file mode 100644
index 00000000000..f9522073154
--- /dev/null
+++ b/tests/queries/0_stateless/02027_arrayCumSumNonNegative_const.sql
@@ -0,0 +1 @@
+SELECT toString(arrayCumSumNonNegative(x->0, [1, 2]));

From 5a0e8af483550ae94ca03dad7df28a13661b72be Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 11 Sep 2021 23:00:07 +0300
Subject: [PATCH 201/273] Use Should-* instead of Required-* for init script

---
 debian/clickhouse-server.init | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/clickhouse-server.init b/debian/clickhouse-server.init
index 76c98972c7a..1dd87fe80ae 100755
--- a/debian/clickhouse-server.init
+++ b/debian/clickhouse-server.init
@@ -3,10 +3,17 @@
 # Provides:          clickhouse-server
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Required-Start:    $time $network
-# Required-Stop:     $network
+# Should-Start:      $time $network
+# Should-Stop:       $network
 # Short-Description: Yandex clickhouse-server daemon
 ### END INIT INFO
+#
+# NOTES:
+# - Should-* -- script can start if the listed facilities are missing, unlike Required-*
+#
+# For the documentation [1]:
+#
+#   [1]: https://wiki.debian.org/LSBInitScripts
 
 CLICKHOUSE_USER=clickhouse
 CLICKHOUSE_GROUP=${CLICKHOUSE_USER}

From 748d5a86d2a10d4db42dd109155f10661b621acd Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sat, 11 Sep 2021 23:11:34 +0300
Subject: [PATCH 202/273] Add some comments for systemd service.

---
 debian/clickhouse-server.service | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/debian/clickhouse-server.service b/debian/clickhouse-server.service
index 9bf193be826..bc19235cb3a 100644
--- a/debian/clickhouse-server.service
+++ b/debian/clickhouse-server.service
@@ -1,6 +1,10 @@
 [Unit]
 Description=ClickHouse Server (analytic DBMS for big data)
 Requires=network-online.target
+# NOTE: that After/Wants=time-sync.target is not enough, you need to ensure
+# that the time was adjusted already, if you use systemd-timesyncd you are
+# safe, but if you use ntp or some other daemon, you should configure it
+# additionaly.
 After=time-sync.target network-online.target
 Wants=time-sync.target
 
@@ -17,4 +21,5 @@ LimitNOFILE=500000
 CapabilityBoundingSet=CAP_NET_ADMIN CAP_IPC_LOCK CAP_SYS_NICE
 
 [Install]
+# ClickHouse should not start from the rescue shell (rescue.target).
 WantedBy=multi-user.target

From 940e075941e0befe31e78a6519b793ef82516b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Sat, 11 Sep 2021 22:36:22 +0200
Subject: [PATCH 203/273] Remove notNull changes

---
 src/AggregateFunctions/AggregateFunctionSum.h | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/AggregateFunctions/AggregateFunctionSum.h b/src/AggregateFunctions/AggregateFunctionSum.h
index f967aded1fa..c28096badfe 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.h
+++ b/src/AggregateFunctions/AggregateFunctionSum.h
@@ -68,17 +68,6 @@ struct AggregateFunctionSumData
 
         if constexpr (std::is_floating_point_v<T>)
         {
-#if defined(__clang__)
-/// With clang we can tell the compiler to vectorize and it should work with all types when possible, including floating types
-/// Something around the number of SSE registers * the number of elements fit in register.
-/// Recommend half of those for each vectorization
-#pragma clang loop vectorize(enable) vectorize_width(64 / sizeof(T)) unroll_count(128 / sizeof(T))
-            for (size_t i = 0; i < count; i++)
-            {
-                Impl::add(sum, ptr[i]);
-            }
-            return;
-#endif
             /// Compiler cannot unroll this loop, do it manually.
             /// (at least for floats, most likely due to the lack of -fassociative-math)
 

From 50360aa5867b65228c92a3095e39791300bec5eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Sat, 11 Sep 2021 22:37:45 +0200
Subject: [PATCH 204/273] Add extra performance tests for Nullable floating
 point Sum

The existing ones aren't that representative since there isn't
any NULL values, so the branch predictor is correct 100% of the time
---
 tests/performance/sum.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/performance/sum.xml b/tests/performance/sum.xml
index 9bee2a580c3..075102998c6 100644
--- a/tests/performance/sum.xml
+++ b/tests/performance/sum.xml
@@ -16,4 +16,15 @@
     <query>SELECT sum(toNullable(toFloat64(number))) FROM numbers(100000000)</query>
     <query>SELECT sumKahan(toNullable(toFloat32(number))) FROM numbers(100000000)</query>
     <query>SELECT sumKahan(toNullable(toFloat64(number))) FROM numbers(100000000)</query>
+
+    <!-- Create a table with ~20% null values. Make it random so the branch predictor doesn't do all the work -->
+    <create_query>CREATE TABLE nullfloat32 (x Nullable(Float32)) ENGINE = Memory</create_query>
+    <fill_query>INSERT INTO nullfloat32
+                SELECT IF(rand() % 5 == 0, NULL::Nullable(Float32), toFloat32(number)) as x
+                FROM numbers_mt(200000000)
+                SETTINGS max_threads = 8
+    </fill_query>
+    <query>SELECT sum(x) FROM nullfloat32</query>
+    <query>SELECT sum(x::Nullable(Float64)) FROM nullfloat32</query>
+    <drop_query>DROP TABLE IF EXISTS nullfloat32</drop_query>
 </test>

From 9fb8eeaea35d497f8fad241f70ff7f4f50e8f962 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Sat, 11 Sep 2021 22:54:30 +0200
Subject: [PATCH 205/273] Use project types

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

diff --git a/src/AggregateFunctions/AggregateFunctionSum.h b/src/AggregateFunctions/AggregateFunctionSum.h
index c28096badfe..05be577d14b 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.h
+++ b/src/AggregateFunctions/AggregateFunctionSum.h
@@ -128,7 +128,7 @@ struct AggregateFunctionSumData
             /// We reinterpret the floating point number as an unsigned integer of the same size
             /// This was tested with clang12. gcc11 would need to be tricked into vectorizing by iterating over the integer representation
             static_assert(sizeof(Value) == 4 || sizeof(Value) == 8);
-            typedef typename std::conditional<sizeof(Value) == 4, uint32_t, uint64_t>::type equivalent_integer;
+            typedef typename std::conditional<sizeof(Value) == 4, UInt32, UInt64>::type equivalent_integer;
 
 #if defined(__clang__)
             /// Without these instructions clang will prefer using a jump as it knows that the number might be zero, and that's

From 02a7edf90211b2757e6bc49e6db81860fd1dcb8d Mon Sep 17 00:00:00 2001
From: Anton Popov <pad11rus@gmail.com>
Date: Sat, 11 Sep 2021 23:24:01 +0300
Subject: [PATCH 206/273] allow to include subccolumns in describe query

---
 src/Core/Settings.h                           |  1 +
 src/DataTypes/IDataType.cpp                   | 29 ++++++--
 src/DataTypes/IDataType.h                     |  3 +
 src/Interpreters/InterpreterDescribeQuery.cpp | 66 +++++++++++++++----
 src/Interpreters/InterpreterDescribeQuery.h   |  4 +-
 ...2026_describe_include_subcolumns.reference | 23 +++++++
 .../02026_describe_include_subcolumns.sql     | 18 +++++
 7 files changed, 121 insertions(+), 23 deletions(-)
 create mode 100644 tests/queries/0_stateless/02026_describe_include_subcolumns.reference
 create mode 100644 tests/queries/0_stateless/02026_describe_include_subcolumns.sql

diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index f331ad2d7d3..9b29b0b1ee6 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -466,6 +466,7 @@ class IColumn;
     M(Bool, force_optimize_projection, false, "If projection optimization is enabled, SELECT queries need to use projection", 0) \
     M(Bool, async_socket_for_remote, true, "Asynchronously read from socket executing remote query", 0) \
     M(Bool, insert_null_as_default, true, "Insert DEFAULT values instead of NULL in INSERT SELECT (UNION ALL)", 0) \
+    M(Bool, describe_include_subcolumns, false, "If true, subcolumns of all table columns will be included into result of DESCRIBE query", 0) \
     \
     M(Bool, optimize_rewrite_sum_if_to_count_if, true, "Rewrite sumIf() and sum(if()) function countIf() function when logically equivalent", 0) \
     M(UInt64, insert_shard_id, 0, "If non zero, when insert into a distributed table, the data will be inserted into the shard `insert_shard_id` synchronously. Possible values range from 1 to `shards_number` of corresponding distributed table", 0) \
diff --git a/src/DataTypes/IDataType.cpp b/src/DataTypes/IDataType.cpp
index 4b727a49861..c69f8ce5e8a 100644
--- a/src/DataTypes/IDataType.cpp
+++ b/src/DataTypes/IDataType.cpp
@@ -87,23 +87,38 @@ ColumnPtr IDataType::getSubcolumn(const String & subcolumn_name, const IColumn &
     throw Exception(ErrorCodes::ILLEGAL_COLUMN, "There is no subcolumn {} in type {}", subcolumn_name, getName());
 }
 
-Names IDataType::getSubcolumnNames() const
+void IDataType::forEachSubcolumn(const SubcolumnCallback & callback) const
 {
-    NameSet res;
-    getDefaultSerialization()->enumerateStreams([&res, this](const ISerialization::SubstreamPath & substream_path)
+    NameSet set;
+    getDefaultSerialization()->enumerateStreams([&, this](const ISerialization::SubstreamPath & substream_path)
     {
         ISerialization::SubstreamPath new_path;
         /// Iterate over path to try to get intermediate subcolumns for complex nested types.
         for (const auto & elem : substream_path)
         {
             new_path.push_back(elem);
-            auto subcolumn_name = ISerialization::getSubcolumnNameForStream(new_path);
-            if (!subcolumn_name.empty() && tryGetSubcolumnType(subcolumn_name))
-                res.insert(subcolumn_name);
+            auto name = ISerialization::getSubcolumnNameForStream(new_path);
+            auto type = tryGetSubcolumnType(name);
+
+            /// Subcolumn names may repeat among several substream paths.
+            if (!name.empty() && type && !set.count(name))
+            {
+                callback(name, type, substream_path);
+                set.insert(name);
+            }
         }
     });
+}
 
-    return Names(std::make_move_iterator(res.begin()), std::make_move_iterator(res.end()));
+Names IDataType::getSubcolumnNames() const
+{
+    Names res;
+    forEachSubcolumn([&](const auto & name, const auto &, const auto &)
+    {
+        res.push_back(name);
+    });
+
+    return res;
 }
 
 void IDataType::insertDefaultInto(IColumn & column) const
diff --git a/src/DataTypes/IDataType.h b/src/DataTypes/IDataType.h
index 9d943769c0a..017534c4743 100644
--- a/src/DataTypes/IDataType.h
+++ b/src/DataTypes/IDataType.h
@@ -80,6 +80,9 @@ public:
     virtual DataTypePtr tryGetSubcolumnType(const String & subcolumn_name) const;
     DataTypePtr getSubcolumnType(const String & subcolumn_name) const;
     virtual ColumnPtr getSubcolumn(const String & subcolumn_name, const IColumn & column) const;
+
+    using SubcolumnCallback = std::function<void(const String &, const DataTypePtr &, const ISerialization::SubstreamPath &)>;
+    void forEachSubcolumn(const SubcolumnCallback & callback) const;
     Names getSubcolumnNames() const;
 
     /// Returns default serialization of data type.
diff --git a/src/Interpreters/InterpreterDescribeQuery.cpp b/src/Interpreters/InterpreterDescribeQuery.cpp
index 705e52da72c..5fd9c2539eb 100644
--- a/src/Interpreters/InterpreterDescribeQuery.cpp
+++ b/src/Interpreters/InterpreterDescribeQuery.cpp
@@ -1,5 +1,4 @@
 #include <Storages/IStorage.h>
-#include <DataStreams/OneBlockInputStream.h>
 #include <DataStreams/BlockIO.h>
 #include <DataTypes/DataTypeString.h>
 #include <Parsers/queryToString.h>
@@ -15,20 +14,14 @@
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/TablePropertiesQueriesASTs.h>
+#include <DataTypes/NestedUtils.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
 
 
 namespace DB
 {
 
-BlockIO InterpreterDescribeQuery::execute()
-{
-    BlockIO res;
-    res.in = executeImpl();
-    return res;
-}
-
-
-Block InterpreterDescribeQuery::getSampleBlock()
+Block InterpreterDescribeQuery::getSampleBlock(bool include_subcolumns)
 {
     Block block;
 
@@ -56,11 +49,19 @@ Block InterpreterDescribeQuery::getSampleBlock()
     col.name = "ttl_expression";
     block.insert(col);
 
+    if (include_subcolumns)
+    {
+        col.name = "is_subcolumn";
+        col.type = std::make_shared<DataTypeUInt8>();
+        col.column = col.type->createColumn();
+        block.insert(col);
+    }
+
     return block;
 }
 
 
-BlockInputStreamPtr InterpreterDescribeQuery::executeImpl()
+BlockIO InterpreterDescribeQuery::execute()
 {
     ColumnsDescription columns;
 
@@ -87,7 +88,8 @@ BlockInputStreamPtr InterpreterDescribeQuery::executeImpl()
         columns = metadata_snapshot->getColumns();
     }
 
-    Block sample_block = getSampleBlock();
+    bool include_subcolumns = getContext()->getSettingsRef().describe_include_subcolumns;
+    Block sample_block = getSampleBlock(include_subcolumns);
     MutableColumns res_columns = sample_block.cloneEmptyColumns();
 
     for (const auto & column : columns)
@@ -117,9 +119,47 @@ BlockInputStreamPtr InterpreterDescribeQuery::executeImpl()
             res_columns[6]->insert(queryToString(column.ttl));
         else
             res_columns[6]->insertDefault();
+
+        if (include_subcolumns)
+            res_columns[7]->insertDefault();
     }
 
-    return std::make_shared<OneBlockInputStream>(sample_block.cloneWithColumns(std::move(res_columns)));
+    if (include_subcolumns)
+    {
+        for (const auto & column : columns)
+        {
+            column.type->forEachSubcolumn([&](const auto & name, const auto & type, const auto & path)
+            {
+                res_columns[0]->insert(Nested::concatenateName(column.name, name));
+                res_columns[1]->insert(type->getName());
+
+                /// It's not trivial to calculate default expression for subcolumn.
+                /// So, leave it empty.
+                res_columns[2]->insertDefault();
+                res_columns[3]->insertDefault();
+                res_columns[4]->insert(column.comment);
+
+                if (column.codec && ISerialization::isSpecialCompressionAllowed(path))
+                    res_columns[5]->insert(queryToString(column.codec->as<ASTFunction>()->arguments));
+                else
+                    res_columns[5]->insertDefault();
+
+                if (column.ttl)
+                    res_columns[6]->insert(queryToString(column.ttl));
+                else
+                    res_columns[6]->insertDefault();
+
+                res_columns[7]->insert(1u);
+            });
+        }
+    }
+
+    BlockIO res;
+    size_t num_rows = res_columns[0]->size();
+    auto source = std::make_shared<SourceFromSingleChunk>(sample_block, Chunk(std::move(res_columns), num_rows));
+    res.pipeline.init(Pipe(std::move(source)));
+
+    return res;
 }
 
 }
diff --git a/src/Interpreters/InterpreterDescribeQuery.h b/src/Interpreters/InterpreterDescribeQuery.h
index 627d1ca0353..c0b380d57ab 100644
--- a/src/Interpreters/InterpreterDescribeQuery.h
+++ b/src/Interpreters/InterpreterDescribeQuery.h
@@ -16,12 +16,10 @@ public:
 
     BlockIO execute() override;
 
-    static Block getSampleBlock();
+    static Block getSampleBlock(bool include_subcolumns);
 
 private:
     ASTPtr query_ptr;
-
-    BlockInputStreamPtr executeImpl();
 };
 
 
diff --git a/tests/queries/0_stateless/02026_describe_include_subcolumns.reference b/tests/queries/0_stateless/02026_describe_include_subcolumns.reference
new file mode 100644
index 00000000000..ba792ea9f74
--- /dev/null
+++ b/tests/queries/0_stateless/02026_describe_include_subcolumns.reference
@@ -0,0 +1,23 @@
+┌─name─┬─type────────────────────────────────────────────────┬─default_type─┬─default_expression─┬─comment─────────────────┬─codec_expression─┬─ttl_expression───────┐
+│ d    │ Date                                                │              │                    │                         │                  │                      │
+│ n    │ Nullable(String)                                    │              │                    │ It is a nullable column │                  │                      │
+│ arr1 │ Array(UInt32)                                       │              │                    │                         │ ZSTD(1)          │                      │
+│ arr2 │ Array(Array(String))                                │              │                    │                         │                  │ d + toIntervalDay(1) │
+│ t    │ Tuple(s String, a Array(Tuple(a UInt32, b UInt32))) │              │                    │                         │ ZSTD(1)          │                      │
+└──────┴─────────────────────────────────────────────────────┴──────────────┴────────────────────┴─────────────────────────┴──────────────────┴──────────────────────┘
+┌─name───────┬─type────────────────────────────────────────────────┬─default_type─┬─default_expression─┬─comment─────────────────┬─codec_expression─┬─ttl_expression───────┬─is_subcolumn─┐
+│ d          │ Date                                                │              │                    │                         │                  │                      │            0 │
+│ n          │ Nullable(String)                                    │              │                    │ It is a nullable column │                  │                      │            0 │
+│ arr1       │ Array(UInt32)                                       │              │                    │                         │ ZSTD(1)          │                      │            0 │
+│ arr2       │ Array(Array(String))                                │              │                    │                         │                  │ d + toIntervalDay(1) │            0 │
+│ t          │ Tuple(s String, a Array(Tuple(a UInt32, b UInt32))) │              │                    │                         │ ZSTD(1)          │                      │            0 │
+│ n.null     │ UInt8                                               │              │                    │ It is a nullable column │                  │                      │            1 │
+│ arr1.size0 │ UInt64                                              │              │                    │                         │                  │                      │            1 │
+│ arr2.size0 │ UInt64                                              │              │                    │                         │                  │ d + toIntervalDay(1) │            1 │
+│ arr2.size1 │ Array(UInt64)                                       │              │                    │                         │                  │ d + toIntervalDay(1) │            1 │
+│ t.s        │ String                                              │              │                    │                         │ ZSTD(1)          │                      │            1 │
+│ t.a        │ Array(Tuple(a UInt32, b UInt32))                    │              │                    │                         │                  │                      │            1 │
+│ t.a.size0  │ UInt64                                              │              │                    │                         │                  │                      │            1 │
+│ t.a.a      │ Array(UInt32)                                       │              │                    │                         │ ZSTD(1)          │                      │            1 │
+│ t.a.b      │ Array(UInt32)                                       │              │                    │                         │ ZSTD(1)          │                      │            1 │
+└────────────┴─────────────────────────────────────────────────────┴──────────────┴────────────────────┴─────────────────────────┴──────────────────┴──────────────────────┴──────────────┘
diff --git a/tests/queries/0_stateless/02026_describe_include_subcolumns.sql b/tests/queries/0_stateless/02026_describe_include_subcolumns.sql
new file mode 100644
index 00000000000..1a58913425c
--- /dev/null
+++ b/tests/queries/0_stateless/02026_describe_include_subcolumns.sql
@@ -0,0 +1,18 @@
+DROP TABLE IF EXISTS t_desc_subcolumns;
+
+CREATE TABLE t_desc_subcolumns
+(
+    d Date,
+    n Nullable(String) COMMENT 'It is a nullable column',
+    arr1 Array(UInt32) CODEC(ZSTD),
+    arr2 Array(Array(String)) TTL d + INTERVAL 1 DAY,
+    t Tuple(s String, a Array(Tuple(a UInt32, b UInt32))) CODEC(ZSTD)
+)
+ENGINE = MergeTree ORDER BY d;
+
+DESCRIBE TABLE t_desc_subcolumns FORMAT PrettyCompactNoEscapes;
+
+DESCRIBE TABLE t_desc_subcolumns FORMAT PrettyCompactNoEscapes
+SETTINGS describe_include_subcolumns = 1;
+
+DROP TABLE t_desc_subcolumns;

From 526c7253d0efb240cd7d8d0a04246ab1881dff77 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 12 Sep 2021 01:15:37 +0300
Subject: [PATCH 207/273] Fix wrong optimization

---
 src/Interpreters/DuplicateOrderByVisitor.h | 35 +++++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/Interpreters/DuplicateOrderByVisitor.h b/src/Interpreters/DuplicateOrderByVisitor.h
index 4231b2600af..a8bb15abe82 100644
--- a/src/Interpreters/DuplicateOrderByVisitor.h
+++ b/src/Interpreters/DuplicateOrderByVisitor.h
@@ -9,12 +9,20 @@
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ASTOrderByElement.h>
 #include <Parsers/IAST.h>
 #include <Common/typeid_cast.h>
 
+
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int UNKNOWN_TYPE_OF_AST_NODE;
+}
+
+
 /// Checks if SELECT has stateful functions
 class ASTFunctionStatefulData
 {
@@ -59,14 +67,33 @@ public:
     {
         if (done)
             return;
+        done = true;
 
-        if (select_query.orderBy() && !select_query.limitBy() && !select_query.limitByOffset() &&
-            !select_query.limitByLength() && !select_query.limitLength() && !select_query.limitOffset())
+        if (select_query.orderBy())
         {
+            /// If we have limits then the ORDER BY is non-removable.
+            if (select_query.limitBy()
+                || select_query.limitByOffset()
+                || select_query.limitByLength()
+                || select_query.limitLength()
+                || select_query.limitOffset())
+            {
+                return;
+            }
+
+            /// If ORDER BY contains filling (in addition to sorting) it is non-removable.
+            for (const auto & child : select_query.orderBy()->children)
+            {
+                auto * ast = child->as<ASTOrderByElement>();
+                if (!ast || ast->children.empty())
+                    throw Exception("Bad order expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
+
+                if (ast->with_fill)
+                    return;
+            }
+
             select_query.setExpression(ASTSelectQuery::Expression::ORDER_BY, nullptr);
         }
-
-        done = true;
     }
 };
 

From d85588210d3b397eefc0d4d113dec58e0da5a85b Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 12 Sep 2021 01:24:02 +0300
Subject: [PATCH 208/273] Fix bad optimization of ORDER BY in subquery if it
 contains WITH FILL

---
 src/Interpreters/DuplicateOrderByVisitor.cpp  | 124 ++++++++++++++++++
 src/Interpreters/DuplicateOrderByVisitor.h    | 111 +---------------
 ...der_by_with_fill_misoptimization.reference |   9 ++
 ...015_order_by_with_fill_misoptimization.sql |   1 +
 4 files changed, 137 insertions(+), 108 deletions(-)
 create mode 100644 src/Interpreters/DuplicateOrderByVisitor.cpp
 create mode 100644 tests/queries/0_stateless/2015_order_by_with_fill_misoptimization.reference
 create mode 100644 tests/queries/0_stateless/2015_order_by_with_fill_misoptimization.sql

diff --git a/src/Interpreters/DuplicateOrderByVisitor.cpp b/src/Interpreters/DuplicateOrderByVisitor.cpp
new file mode 100644
index 00000000000..fe5070f7a1e
--- /dev/null
+++ b/src/Interpreters/DuplicateOrderByVisitor.cpp
@@ -0,0 +1,124 @@
+#include <Interpreters/DuplicateOrderByVisitor.h>
+#include <Functions/FunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <IO/WriteHelpers.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSetQuery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ASTOrderByElement.h>
+#include <Common/typeid_cast.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNKNOWN_TYPE_OF_AST_NODE;
+}
+
+
+namespace
+{
+
+/// Checks if SELECT has stateful functions
+class ASTFunctionStatefulData
+{
+public:
+    using TypeToVisit = ASTFunction;
+
+    ContextPtr context;
+    bool & is_stateful;
+    void visit(ASTFunction & ast_function, ASTPtr &)
+    {
+        auto aggregate_function_properties = AggregateFunctionFactory::instance().tryGetProperties(ast_function.name);
+
+        if (aggregate_function_properties && aggregate_function_properties->is_order_dependent)
+        {
+            is_stateful = true;
+            return;
+        }
+
+        const auto & function = FunctionFactory::instance().tryGet(ast_function.name, context);
+
+        if (function && function->isStateful())
+        {
+            is_stateful = true;
+            return;
+        }
+    }
+};
+
+using ASTFunctionStatefulMatcher = OneTypeMatcher<ASTFunctionStatefulData>;
+using ASTFunctionStatefulVisitor = InDepthNodeVisitor<ASTFunctionStatefulMatcher, true>;
+
+}
+
+
+void DuplicateOrderByFromSubqueriesData::visit(ASTSelectQuery & select_query, ASTPtr &)
+{
+    if (done)
+        return;
+    done = true;
+
+    if (select_query.orderBy())
+    {
+        /// If we have limits then the ORDER BY is non-removable.
+        if (select_query.limitBy()
+            || select_query.limitByOffset()
+            || select_query.limitByLength()
+            || select_query.limitLength()
+            || select_query.limitOffset())
+        {
+            return;
+        }
+
+        /// If ORDER BY contains filling (in addition to sorting) it is non-removable.
+        for (const auto & child : select_query.orderBy()->children)
+        {
+            auto * ast = child->as<ASTOrderByElement>();
+            if (!ast || ast->children.empty())
+                throw Exception("Bad order expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
+
+            if (ast->with_fill)
+                return;
+        }
+
+        select_query.setExpression(ASTSelectQuery::Expression::ORDER_BY, nullptr);
+    }
+}
+
+void DuplicateOrderByData::visit(ASTSelectQuery & select_query, ASTPtr &)
+{
+    if (select_query.orderBy() || select_query.groupBy())
+    {
+        for (auto & elem : select_query.children)
+        {
+            if (elem->as<ASTExpressionList>())
+            {
+                bool is_stateful = false;
+                ASTFunctionStatefulVisitor::Data data{context, is_stateful};
+                ASTFunctionStatefulVisitor(data).visit(elem);
+                if (is_stateful) //-V547
+                    return;
+            }
+        }
+
+        if (auto select_table_ptr = select_query.tables())
+        {
+            if (auto * select_table = select_table_ptr->as<ASTTablesInSelectQuery>())
+            {
+                if (!select_table->children.empty())
+                {
+                    DuplicateOrderByFromSubqueriesVisitor::Data data{false};
+                    DuplicateOrderByFromSubqueriesVisitor(data).visit(select_table->children[0]);
+                }
+            }
+        }
+    }
+}
+
+}
+
diff --git a/src/Interpreters/DuplicateOrderByVisitor.h b/src/Interpreters/DuplicateOrderByVisitor.h
index a8bb15abe82..de8cb4c8f32 100644
--- a/src/Interpreters/DuplicateOrderByVisitor.h
+++ b/src/Interpreters/DuplicateOrderByVisitor.h
@@ -1,59 +1,13 @@
 #pragma once
 
-#include <Functions/FunctionFactory.h>
-#include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <IO/WriteHelpers.h>
 #include <Interpreters/InDepthNodeVisitor.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTSelectQuery.h>
-#include <Parsers/ASTSetQuery.h>
-#include <Parsers/ASTTablesInSelectQuery.h>
-#include <Parsers/ASTOrderByElement.h>
 #include <Parsers/IAST.h>
-#include <Common/typeid_cast.h>
 
 
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int UNKNOWN_TYPE_OF_AST_NODE;
-}
-
-
-/// Checks if SELECT has stateful functions
-class ASTFunctionStatefulData
-{
-public:
-    using TypeToVisit = ASTFunction;
-
-    ContextPtr context;
-    bool & is_stateful;
-    void visit(ASTFunction & ast_function, ASTPtr &)
-    {
-        auto aggregate_function_properties = AggregateFunctionFactory::instance().tryGetProperties(ast_function.name);
-
-        if (aggregate_function_properties && aggregate_function_properties->is_order_dependent)
-        {
-            is_stateful = true;
-            return;
-        }
-
-        const auto & function = FunctionFactory::instance().tryGet(ast_function.name, context);
-
-        if (function && function->isStateful())
-        {
-            is_stateful = true;
-            return;
-        }
-    }
-};
-
-using ASTFunctionStatefulMatcher = OneTypeMatcher<ASTFunctionStatefulData>;
-using ASTFunctionStatefulVisitor = InDepthNodeVisitor<ASTFunctionStatefulMatcher, true>;
-
+class ASTSelectQuery;
 
 /// Erases unnecessary ORDER BY from subquery
 class DuplicateOrderByFromSubqueriesData
@@ -63,38 +17,7 @@ public:
 
     bool done = false;
 
-    void visit(ASTSelectQuery & select_query, ASTPtr &)
-    {
-        if (done)
-            return;
-        done = true;
-
-        if (select_query.orderBy())
-        {
-            /// If we have limits then the ORDER BY is non-removable.
-            if (select_query.limitBy()
-                || select_query.limitByOffset()
-                || select_query.limitByLength()
-                || select_query.limitLength()
-                || select_query.limitOffset())
-            {
-                return;
-            }
-
-            /// If ORDER BY contains filling (in addition to sorting) it is non-removable.
-            for (const auto & child : select_query.orderBy()->children)
-            {
-                auto * ast = child->as<ASTOrderByElement>();
-                if (!ast || ast->children.empty())
-                    throw Exception("Bad order expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
-
-                if (ast->with_fill)
-                    return;
-            }
-
-            select_query.setExpression(ASTSelectQuery::Expression::ORDER_BY, nullptr);
-        }
-    }
+    void visit(ASTSelectQuery & select_query, ASTPtr &);
 };
 
 using DuplicateOrderByFromSubqueriesMatcher = OneTypeMatcher<DuplicateOrderByFromSubqueriesData>;
@@ -109,35 +32,7 @@ public:
 
     ContextPtr context;
 
-    void visit(ASTSelectQuery & select_query, ASTPtr &)
-    {
-        if (select_query.orderBy() || select_query.groupBy())
-        {
-            for (auto & elem : select_query.children)
-            {
-                if (elem->as<ASTExpressionList>())
-                {
-                    bool is_stateful = false;
-                    ASTFunctionStatefulVisitor::Data data{context, is_stateful};
-                    ASTFunctionStatefulVisitor(data).visit(elem);
-                    if (is_stateful) //-V547
-                        return;
-                }
-            }
-
-            if (auto select_table_ptr = select_query.tables())
-            {
-                if (auto * select_table = select_table_ptr->as<ASTTablesInSelectQuery>())
-                {
-                    if (!select_table->children.empty())
-                    {
-                        DuplicateOrderByFromSubqueriesVisitor::Data data{false};
-                        DuplicateOrderByFromSubqueriesVisitor(data).visit(select_table->children[0]);
-                    }
-                }
-            }
-        }
-    }
+    void visit(ASTSelectQuery & select_query, ASTPtr &);
 };
 
 using DuplicateOrderByMatcher = OneTypeMatcher<DuplicateOrderByData>;
diff --git a/tests/queries/0_stateless/2015_order_by_with_fill_misoptimization.reference b/tests/queries/0_stateless/2015_order_by_with_fill_misoptimization.reference
new file mode 100644
index 00000000000..07258cd829a
--- /dev/null
+++ b/tests/queries/0_stateless/2015_order_by_with_fill_misoptimization.reference
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+Hello
diff --git a/tests/queries/0_stateless/2015_order_by_with_fill_misoptimization.sql b/tests/queries/0_stateless/2015_order_by_with_fill_misoptimization.sql
new file mode 100644
index 00000000000..f0d90f151b2
--- /dev/null
+++ b/tests/queries/0_stateless/2015_order_by_with_fill_misoptimization.sql
@@ -0,0 +1 @@
+SELECT s FROM (SELECT 5 AS x, 'Hello' AS s ORDER BY x WITH FILL FROM 1 TO 10) ORDER BY s;

From 8935a70f6090bde76b663631a9a8629418809099 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 12 Sep 2021 01:41:37 +0300
Subject: [PATCH 209/273] Fix another misoptimization

---
 src/Interpreters/DuplicateOrderByVisitor.cpp  |  2 +-
 src/Interpreters/ExpressionAnalyzer.cpp       |  2 +-
 src/Interpreters/TreeOptimizer.cpp            | 24 +++++++++++++++++++
 ...fill_monotonic_functions_removal.reference |  3 +++
 ..._with_fill_monotonic_functions_removal.sql |  6 +++++
 5 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 tests/queries/0_stateless/2016_order_by_with_fill_monotonic_functions_removal.reference
 create mode 100644 tests/queries/0_stateless/2016_order_by_with_fill_monotonic_functions_removal.sql

diff --git a/src/Interpreters/DuplicateOrderByVisitor.cpp b/src/Interpreters/DuplicateOrderByVisitor.cpp
index fe5070f7a1e..df063fc849e 100644
--- a/src/Interpreters/DuplicateOrderByVisitor.cpp
+++ b/src/Interpreters/DuplicateOrderByVisitor.cpp
@@ -80,7 +80,7 @@ void DuplicateOrderByFromSubqueriesData::visit(ASTSelectQuery & select_query, AS
         {
             auto * ast = child->as<ASTOrderByElement>();
             if (!ast || ast->children.empty())
-                throw Exception("Bad order expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
+                throw Exception("Bad ORDER BY expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
 
             if (ast->with_fill)
                 return;
diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
index d5739b51659..5119c4090f8 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -1240,7 +1240,7 @@ ActionsDAGPtr SelectQueryExpressionAnalyzer::appendOrderBy(ExpressionActionsChai
     {
         auto * ast = child->as<ASTOrderByElement>();
         if (!ast || ast->children.empty())
-            throw Exception("Bad order expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
+            throw Exception("Bad ORDER BY expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
 
         if (getContext()->getSettingsRef().enable_positional_arguments)
         {
diff --git a/src/Interpreters/TreeOptimizer.cpp b/src/Interpreters/TreeOptimizer.cpp
index 518c041d785..d4e765638d3 100644
--- a/src/Interpreters/TreeOptimizer.cpp
+++ b/src/Interpreters/TreeOptimizer.cpp
@@ -39,6 +39,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
+    extern const int UNKNOWN_TYPE_OF_AST_NODE;
 }
 
 namespace
@@ -425,6 +426,17 @@ void optimizeMonotonousFunctionsInOrderBy(ASTSelectQuery * select_query, Context
     if (!order_by)
         return;
 
+    for (const auto & child : order_by->children)
+    {
+        auto * order_by_element = child->as<ASTOrderByElement>();
+
+        if (!order_by_element || order_by_element->children.empty())
+            throw Exception("Bad ORDER BY expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
+
+        if (order_by_element->with_fill)
+            return;
+    }
+
     std::unordered_set<String> group_by_hashes;
     if (auto group_by = select_query->groupBy())
     {
@@ -440,6 +452,7 @@ void optimizeMonotonousFunctionsInOrderBy(ASTSelectQuery * select_query, Context
     for (size_t i = 0; i < order_by->children.size(); ++i)
     {
         auto * order_by_element = order_by->children[i]->as<ASTOrderByElement>();
+
         auto & ast_func = order_by_element->children[0];
         if (!ast_func->as<ASTFunction>())
             continue;
@@ -475,6 +488,17 @@ void optimizeRedundantFunctionsInOrderBy(const ASTSelectQuery * select_query, Co
     if (!order_by)
         return;
 
+    for (const auto & child : order_by->children)
+    {
+        auto * order_by_element = child->as<ASTOrderByElement>();
+
+        if (!order_by_element || order_by_element->children.empty())
+            throw Exception("Bad ORDER BY expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
+
+        if (order_by_element->with_fill)
+            return;
+    }
+
     std::unordered_set<String> prev_keys;
     ASTs modified;
     modified.reserve(order_by->children.size());
diff --git a/tests/queries/0_stateless/2016_order_by_with_fill_monotonic_functions_removal.reference b/tests/queries/0_stateless/2016_order_by_with_fill_monotonic_functions_removal.reference
new file mode 100644
index 00000000000..264f29a6ecd
--- /dev/null
+++ b/tests/queries/0_stateless/2016_order_by_with_fill_monotonic_functions_removal.reference
@@ -0,0 +1,3 @@
+2021-07-07 15:21:00
+2021-07-07 15:21:05
+2021-07-07 15:21:10
diff --git a/tests/queries/0_stateless/2016_order_by_with_fill_monotonic_functions_removal.sql b/tests/queries/0_stateless/2016_order_by_with_fill_monotonic_functions_removal.sql
new file mode 100644
index 00000000000..bf232ed5c86
--- /dev/null
+++ b/tests/queries/0_stateless/2016_order_by_with_fill_monotonic_functions_removal.sql
@@ -0,0 +1,6 @@
+SELECT toStartOfMinute(some_time) AS ts
+FROM
+(
+    SELECT toDateTime('2021-07-07 15:21:05') AS some_time
+)
+ORDER BY ts ASC WITH FILL FROM toDateTime('2021-07-07 15:21:00') TO toDateTime('2021-07-07 15:21:15') STEP 5;

From f74350c1483ce063ecc21e37d23526768850444a Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Sun, 12 Sep 2021 02:49:31 +0300
Subject: [PATCH 210/273] fix special build

---
 base/mysqlxx/PoolFactory.cpp                           | 4 ++--
 src/Backups/BackupUtils.cpp                            | 3 +--
 src/Client/HedgedConnectionsFactory.cpp                | 4 ++--
 src/Columns/MaskOperations.cpp                         | 4 ++--
 src/Common/ThreadStatus.cpp                            | 1 -
 src/Dictionaries/getDictionaryConfigurationFromAST.cpp | 8 ++++----
 src/IO/FileEncryptionCommon.cpp                        | 4 ++--
 7 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/base/mysqlxx/PoolFactory.cpp b/base/mysqlxx/PoolFactory.cpp
index f0a5543d723..1d2f9fc74c7 100644
--- a/base/mysqlxx/PoolFactory.cpp
+++ b/base/mysqlxx/PoolFactory.cpp
@@ -79,7 +79,7 @@ PoolWithFailover PoolFactory::get(const Poco::Util::AbstractConfiguration & conf
     std::lock_guard<std::mutex> lock(impl->mutex);
     if (auto entry = impl->pools.find(config_name); entry != impl->pools.end())
     {
-        return *(entry->second.get());
+        return *(entry->second);
     }
     else
     {
@@ -100,7 +100,7 @@ PoolWithFailover PoolFactory::get(const Poco::Util::AbstractConfiguration & conf
             impl->pools.insert_or_assign(config_name, pool);
             impl->pools_by_ids.insert_or_assign(entry_name, config_name);
         }
-        return *(pool.get());
+        return *pool;
     }
 }
 
diff --git a/src/Backups/BackupUtils.cpp b/src/Backups/BackupUtils.cpp
index 974ae252829..06673cae371 100644
--- a/src/Backups/BackupUtils.cpp
+++ b/src/Backups/BackupUtils.cpp
@@ -83,9 +83,8 @@ namespace
     /// Replaces elements of types TEMPORARY_TABLE or ALL_TEMPORARY_TABLES with elements of type TABLE or DATABASE.
     void replaceTemporaryTablesWithTemporaryDatabase(Elements & elements)
     {
-        for (size_t i = 0; i != elements.size(); ++i)
+        for (auto & element : elements)
         {
-            auto & element = elements[i];
             switch (element.type)
             {
                 case ElementType::TEMPORARY_TABLE:
diff --git a/src/Client/HedgedConnectionsFactory.cpp b/src/Client/HedgedConnectionsFactory.cpp
index b0c5a3d22f5..5a42cc0d5c4 100644
--- a/src/Client/HedgedConnectionsFactory.cpp
+++ b/src/Client/HedgedConnectionsFactory.cpp
@@ -27,8 +27,8 @@ HedgedConnectionsFactory::HedgedConnectionsFactory(
     : pool(pool_), settings(settings_), timeouts(timeouts_), table_to_check(table_to_check_), log(&Poco::Logger::get("HedgedConnectionsFactory"))
 {
     shuffled_pools = pool->getShuffledPools(settings);
-    for (size_t i = 0; i != shuffled_pools.size(); ++i)
-        replicas.emplace_back(ConnectionEstablisherAsync(shuffled_pools[i].pool, &timeouts, settings, log, table_to_check.get()));
+    for (auto shuffled_pool : shuffled_pools)
+        replicas.emplace_back(ConnectionEstablisherAsync(shuffled_pool.pool, &timeouts, settings, log, table_to_check.get()));
 
     max_tries
         = (settings ? size_t{settings->connections_with_failover_max_tries} : size_t{DBMS_CONNECTION_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES});
diff --git a/src/Columns/MaskOperations.cpp b/src/Columns/MaskOperations.cpp
index 759d0af7127..aa9abbe2232 100644
--- a/src/Columns/MaskOperations.cpp
+++ b/src/Columns/MaskOperations.cpp
@@ -246,8 +246,8 @@ MaskInfo extractInvertedMask(
 
 void inverseMask(PaddedPODArray<UInt8> & mask, MaskInfo & mask_info)
 {
-    for (size_t i = 0; i != mask.size(); ++i)
-        mask[i] = !mask[i];
+    for (auto & byte : mask)
+        byte = !byte;
     std::swap(mask_info.has_ones, mask_info.has_zeros);
 }
 
diff --git a/src/Common/ThreadStatus.cpp b/src/Common/ThreadStatus.cpp
index 81c6b8eb1c3..0c777623fc7 100644
--- a/src/Common/ThreadStatus.cpp
+++ b/src/Common/ThreadStatus.cpp
@@ -221,7 +221,6 @@ MainThreadStatus & MainThreadStatus::getInstance()
     return thread_status;
 }
 MainThreadStatus::MainThreadStatus()
-    : ThreadStatus()
 {
     main_thread = current_thread;
 }
diff --git a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
index c8cb2611651..04b2af76bd7 100644
--- a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
+++ b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
@@ -181,9 +181,9 @@ Names getPrimaryKeyColumns(const ASTExpressionList * primary_key)
     Names result;
     const auto & children = primary_key->children;
 
-    for (size_t index = 0; index != children.size(); ++index)
+    for (auto child : children)
     {
-        const ASTIdentifier * key_part = children[index]->as<const ASTIdentifier>();
+        const ASTIdentifier * key_part = child->as<const ASTIdentifier>();
         result.push_back(key_part->name());
     }
     return result;
@@ -402,9 +402,9 @@ void buildConfigurationFromFunctionWithKeyValueArguments(
     ContextPtr context)
 {
     const auto & children = ast_expr_list->children;
-    for (size_t i = 0; i != children.size(); ++i)
+    for (auto child : children)
     {
-        const ASTPair * pair = children[i]->as<const ASTPair>();
+        const ASTPair * pair = child->as<const ASTPair>();
         AutoPtr<Element> current_xml_element(doc->createElement(pair->first));
         root->appendChild(current_xml_element);
 
diff --git a/src/IO/FileEncryptionCommon.cpp b/src/IO/FileEncryptionCommon.cpp
index 134c446c102..13d8acb8c7b 100644
--- a/src/IO/FileEncryptionCommon.cpp
+++ b/src/IO/FileEncryptionCommon.cpp
@@ -253,8 +253,8 @@ InitVector InitVector::random()
     std::mt19937 gen{rd()};
     std::uniform_int_distribution<UInt128::base_type> dis;
     UInt128 counter;
-    for (size_t i = 0; i != std::size(counter.items); ++i)
-        counter.items[i] = dis(gen);
+    for (auto & i : counter.items)
+        i = dis(gen);
     return InitVector{counter};
 }
 

From e3611cccce70e495b853419539b758eb64d45cf9 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 12 Sep 2021 02:55:53 +0300
Subject: [PATCH 211/273] Fix yet another issue

---
 src/Interpreters/FillingRow.h                  |  8 ++++----
 src/Interpreters/TreeOptimizer.cpp             |  3 ++-
 src/Processors/Transforms/FillingTransform.cpp | 13 +++++++++----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/Interpreters/FillingRow.h b/src/Interpreters/FillingRow.h
index 434a9270718..604f4b1ee74 100644
--- a/src/Interpreters/FillingRow.h
+++ b/src/Interpreters/FillingRow.h
@@ -24,14 +24,14 @@ public:
 
     void initFromDefaults(size_t from_pos = 0);
 
-    Field & operator[](size_t ind) { return row[ind]; }
-    const Field & operator[](size_t ind) const { return row[ind]; }
+    Field & operator[](size_t index) { return row[index]; }
+    const Field & operator[](size_t index) const { return row[index]; }
     size_t size() const { return row.size(); }
     bool operator<(const FillingRow & other) const;
     bool operator==(const FillingRow & other) const;
 
-    int getDirection(size_t ind) const { return description[ind].direction; }
-    FillColumnDescription & getFillDescription(size_t ind) { return description[ind].fill_description; }
+    int getDirection(size_t index) const { return description[index].direction; }
+    FillColumnDescription & getFillDescription(size_t index) { return description[index].fill_description; }
 
 private:
     Row row;
diff --git a/src/Interpreters/TreeOptimizer.cpp b/src/Interpreters/TreeOptimizer.cpp
index d4e765638d3..833d76a26b8 100644
--- a/src/Interpreters/TreeOptimizer.cpp
+++ b/src/Interpreters/TreeOptimizer.cpp
@@ -283,7 +283,8 @@ void optimizeDuplicatesInOrderBy(const ASTSelectQuery * select_query)
         String name = elem->children.front()->getColumnName();
         const auto & order_by_elem = elem->as<ASTOrderByElement &>();
 
-        if (elems_set.emplace(name, order_by_elem.collation ? order_by_elem.collation->getColumnName() : "").second)
+        if (order_by_elem.with_fill /// Always keep elements WITH FILL as they affects other.
+            || elems_set.emplace(name, order_by_elem.collation ? order_by_elem.collation->getColumnName() : "").second)
             unique_elems.emplace_back(elem);
     }
 
diff --git a/src/Processors/Transforms/FillingTransform.cpp b/src/Processors/Transforms/FillingTransform.cpp
index 831130d06d1..3ff89c302ff 100644
--- a/src/Processors/Transforms/FillingTransform.cpp
+++ b/src/Processors/Transforms/FillingTransform.cpp
@@ -81,7 +81,7 @@ FillingTransform::FillingTransform(
     };
 
     std::vector<bool> is_fill_column(header_.columns());
-    for (size_t i = 0; i < sort_description.size(); ++i)
+    for (size_t i = 0, size = sort_description.size(); i < size; ++i)
     {
         size_t block_position = header_.getPositionByName(sort_description[i].column_name);
         is_fill_column[block_position] = true;
@@ -103,6 +103,11 @@ FillingTransform::FillingTransform(
         }
     }
 
+    std::set<size_t> unique_positions;
+    for (auto pos : fill_column_positions)
+        if (!unique_positions.insert(pos).second)
+            throw Exception("Multiple WITH FILL for identical expressions is not supported in ORDER BY", ErrorCodes::INVALID_WITH_FILL_EXPRESSION);
+
     for (size_t i = 0; i < header_.columns(); ++i)
         if (!is_fill_column[i])
             other_column_positions.push_back(i);
@@ -114,7 +119,7 @@ IProcessor::Status FillingTransform::prepare()
     {
         should_insert_first = next_row < filling_row;
 
-        for (size_t i = 0; i < filling_row.size(); ++i)
+        for (size_t i = 0, size = filling_row.size(); i < size; ++i)
             next_row[i] = filling_row.getFillDescription(i).fill_to;
 
         if (filling_row < next_row)
@@ -227,9 +232,9 @@ void FillingTransform::setResultColumns(Chunk & chunk, MutableColumns & fill_col
     /// fill_columns always non-empty.
     size_t num_rows = fill_columns[0]->size();
 
-    for (size_t i = 0; i < fill_columns.size(); ++i)
+    for (size_t i = 0, size = fill_columns.size(); i < size; ++i)
         result_columns[fill_column_positions[i]] = std::move(fill_columns[i]);
-    for (size_t i = 0; i < other_columns.size(); ++i)
+    for (size_t i = 0, size = other_columns.size(); i < size; ++i)
         result_columns[other_column_positions[i]] = std::move(other_columns[i]);
 
     chunk.setColumns(std::move(result_columns), num_rows);

From 98a25f3ece95d044107cab4eab5e962e641a7012 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 12 Sep 2021 02:56:47 +0300
Subject: [PATCH 212/273] Add a test

---
 .../2018_multiple_with_fill_for_the_same_column.reference        | 0
 .../0_stateless/2018_multiple_with_fill_for_the_same_column.sql  | 1 +
 2 files changed, 1 insertion(+)
 create mode 100644 tests/queries/0_stateless/2018_multiple_with_fill_for_the_same_column.reference
 create mode 100644 tests/queries/0_stateless/2018_multiple_with_fill_for_the_same_column.sql

diff --git a/tests/queries/0_stateless/2018_multiple_with_fill_for_the_same_column.reference b/tests/queries/0_stateless/2018_multiple_with_fill_for_the_same_column.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/2018_multiple_with_fill_for_the_same_column.sql b/tests/queries/0_stateless/2018_multiple_with_fill_for_the_same_column.sql
new file mode 100644
index 00000000000..32b38388cf6
--- /dev/null
+++ b/tests/queries/0_stateless/2018_multiple_with_fill_for_the_same_column.sql
@@ -0,0 +1 @@
+SELECT x, y FROM (SELECT 5 AS x, 'Hello' AS y) ORDER BY x WITH FILL FROM 3 TO 7, y, x WITH FILL FROM 1 TO 10; -- { serverError 475 }

From 7899c6a0f1c67669e1ffc933798b2eeeb9647f74 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 12 Sep 2021 03:00:09 +0300
Subject: [PATCH 213/273] One more

---
 .../2019_multiple_weird_with_fill.reference   | 45 +++++++++++++++++++
 .../2019_multiple_weird_with_fill.sql         | 14 ++++++
 2 files changed, 59 insertions(+)
 create mode 100644 tests/queries/0_stateless/2019_multiple_weird_with_fill.reference
 create mode 100644 tests/queries/0_stateless/2019_multiple_weird_with_fill.sql

diff --git a/tests/queries/0_stateless/2019_multiple_weird_with_fill.reference b/tests/queries/0_stateless/2019_multiple_weird_with_fill.reference
new file mode 100644
index 00000000000..822d290564a
--- /dev/null
+++ b/tests/queries/0_stateless/2019_multiple_weird_with_fill.reference
@@ -0,0 +1,45 @@
+3	-10	
+3	-9	
+3	-8	
+3	-7	
+3	-6	
+3	-5	
+3	-4	
+3	-3	
+3	-2	
+4	-10	
+4	-9	
+4	-8	
+4	-7	
+4	-6	
+4	-5	
+4	-4	
+4	-3	
+4	-2	
+5	-10	
+5	-9	
+5	-8	
+5	-7	
+5	-6	
+5	-5	Hello
+5	-4	
+5	-3	
+5	-2	
+6	-10	
+6	-9	
+6	-8	
+6	-7	
+6	-6	
+6	-5	
+6	-4	
+6	-3	
+6	-2	
+7	-10	
+7	-9	
+7	-8	
+7	-7	
+7	-6	
+7	-5	
+7	-4	
+7	-3	
+7	-2	
diff --git a/tests/queries/0_stateless/2019_multiple_weird_with_fill.sql b/tests/queries/0_stateless/2019_multiple_weird_with_fill.sql
new file mode 100644
index 00000000000..a2ed33c51dd
--- /dev/null
+++ b/tests/queries/0_stateless/2019_multiple_weird_with_fill.sql
@@ -0,0 +1,14 @@
+SELECT
+    x,
+    -x,
+    y
+FROM
+(
+    SELECT
+        5 AS x,
+        'Hello' AS y
+)
+ORDER BY
+    x ASC WITH FILL FROM 3 TO 7,
+    y ASC,
+    -x ASC WITH FILL FROM -10 TO -1;

From 797e1f4fd4c3e8894ad0a4b86cc7b6c508d0c136 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 12 Sep 2021 08:37:51 +0300
Subject: [PATCH 214/273] Add more tests

---
 ...2017_order_by_with_fill_redundant_functions.reference | 9 +++++++++
 .../2017_order_by_with_fill_redundant_functions.sql      | 1 +
 2 files changed, 10 insertions(+)
 create mode 100644 tests/queries/0_stateless/2017_order_by_with_fill_redundant_functions.reference
 create mode 100644 tests/queries/0_stateless/2017_order_by_with_fill_redundant_functions.sql

diff --git a/tests/queries/0_stateless/2017_order_by_with_fill_redundant_functions.reference b/tests/queries/0_stateless/2017_order_by_with_fill_redundant_functions.reference
new file mode 100644
index 00000000000..07193989308
--- /dev/null
+++ b/tests/queries/0_stateless/2017_order_by_with_fill_redundant_functions.reference
@@ -0,0 +1,9 @@
+1
+2
+3
+4
+5
+6
+7
+8
+9
diff --git a/tests/queries/0_stateless/2017_order_by_with_fill_redundant_functions.sql b/tests/queries/0_stateless/2017_order_by_with_fill_redundant_functions.sql
new file mode 100644
index 00000000000..6f3e6787c34
--- /dev/null
+++ b/tests/queries/0_stateless/2017_order_by_with_fill_redundant_functions.sql
@@ -0,0 +1 @@
+SELECT x FROM (SELECT 5 AS x) ORDER BY -x, x WITH FILL FROM 1 TO 10;

From 4bf2d6442710a2432596d7a80711b164f0a3d6c5 Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Sun, 12 Sep 2021 09:12:14 +0300
Subject: [PATCH 215/273] fix special build another try

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

diff --git a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
index 04b2af76bd7..11c3eee3dfb 100644
--- a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
+++ b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
@@ -181,7 +181,7 @@ Names getPrimaryKeyColumns(const ASTExpressionList * primary_key)
     Names result;
     const auto & children = primary_key->children;
 
-    for (auto child : children)
+    for (const auto & child : children)
     {
         const ASTIdentifier * key_part = child->as<const ASTIdentifier>();
         result.push_back(key_part->name());

From c5d6518bb9dc2da0e1ffd1820f80b4a0f658f042 Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Sun, 12 Sep 2021 10:23:19 +0300
Subject: [PATCH 216/273] fix special build (more)

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

diff --git a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
index 11c3eee3dfb..c77ac36ade6 100644
--- a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
+++ b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
@@ -402,7 +402,7 @@ void buildConfigurationFromFunctionWithKeyValueArguments(
     ContextPtr context)
 {
     const auto & children = ast_expr_list->children;
-    for (auto child : children)
+    for (const auto & child : children)
     {
         const ASTPair * pair = child->as<const ASTPair>();
         AutoPtr<Element> current_xml_element(doc->createElement(pair->first));

From 893faa8425555c5eb3ef842d1134ab6cd232f5d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Sun, 12 Sep 2021 13:24:25 +0200
Subject: [PATCH 217/273] Unroll the loop manually

---
 src/AggregateFunctions/AggregateFunctionSum.h | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/AggregateFunctions/AggregateFunctionSum.h b/src/AggregateFunctions/AggregateFunctionSum.h
index 05be577d14b..0133c8c8f9c 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.h
+++ b/src/AggregateFunctions/AggregateFunctionSum.h
@@ -124,28 +124,32 @@ struct AggregateFunctionSumData
 
         if constexpr (std::is_floating_point_v<T>)
         {
-            /// For floating point we use a similar trick as above, except that now we use a mask instead (0 to discard, 0xFF..FF to keep)
-            /// We reinterpret the floating point number as an unsigned integer of the same size
-            /// This was tested with clang12. gcc11 would need to be tricked into vectorizing by iterating over the integer representation
+            /// For floating point we use a similar trick as above, except that now we  reinterpret the floating point number as an unsigned
+            /// integer of the same size and use a mask instead (0 to discard, 0xFF..FF to keep)
             static_assert(sizeof(Value) == 4 || sizeof(Value) == 8);
             typedef typename std::conditional<sizeof(Value) == 4, UInt32, UInt64>::type equivalent_integer;
+            constexpr size_t unroll_count = 128 / sizeof(T);
+            T partial_sums[unroll_count]{};
 
-#if defined(__clang__)
-            /// Without these instructions clang will prefer using a jump as it knows that the number might be zero, and that's
-            /// ~10x slower than doing the bitwise operator and the add under SSE4
-#pragma clang loop vectorize(enable) vectorize_width(64/sizeof(Value)) unroll_count(128 / sizeof(Value))
-#endif
-            for (size_t i = 0; i < count; i++)
+            const auto * unrolled_end = ptr + (count / unroll_count * unroll_count);
+
+            while (ptr < unrolled_end)
             {
-                equivalent_integer value;
-                std::memcpy(&value, &ptr[i], sizeof(Value)); // Will be optimized by the compiler when strict aliasing isn't necessary
-                value &= (!condition_map[i] != add_if_zero) - 1; // When we want to add it this will &= -1 (no-op)
-                Value d;
-                std::memcpy(&d, &value, sizeof(Value)); // Same as above
-                Impl::add(sum, d);
+                for (size_t i = 0; i < unroll_count; ++i)
+                {
+                    equivalent_integer value;
+                    std::memcpy(&value, &ptr[i], sizeof(Value));
+                    value &= (!condition_map[i] != add_if_zero) - 1;
+                    Value d;
+                    std::memcpy(&d, &value, sizeof(Value));
+                    Impl::add(partial_sums[i], d);
+                }
+                ptr += unroll_count;
+                condition_map += unroll_count;
             }
 
-            return;
+            for (size_t i = 0; i < unroll_count; ++i)
+                Impl::add(sum, partial_sums[i]);
         }
 
         T local_sum{};

From 1f6fb3f6ea1fa513a494fe23ae89c48917d8e851 Mon Sep 17 00:00:00 2001
From: Mike Kot <to@myrrc.dev>
Date: Sat, 11 Sep 2021 22:14:34 +0200
Subject: [PATCH 218/273] Fix gtest, add Decimal aliases, Typelist solution for
 bin arithm

---
 src/Common/tests/gtest_wide_integer.cpp       |  8 +-
 .../tests/gtest_compressionCodec.cpp          |  2 +-
 src/DataTypes/DataTypesDecimal.h              |  5 ++
 src/Functions/FunctionBinaryArithmetic.h      | 90 +++++--------------
 src/Functions/castTypeToEither.h              | 22 +++++
 5 files changed, 53 insertions(+), 74 deletions(-)

diff --git a/src/Common/tests/gtest_wide_integer.cpp b/src/Common/tests/gtest_wide_integer.cpp
index 0cdbcb29c02..d1876a7b9a6 100644
--- a/src/Common/tests/gtest_wide_integer.cpp
+++ b/src/Common/tests/gtest_wide_integer.cpp
@@ -13,22 +13,22 @@
 
 static_assert(is_signed_v<Int128>);
 static_assert(!is_unsigned_v<Int128>);
-static_assert(is_integer_v<Int128>);
+static_assert(is_integer<Int128>);
 static_assert(sizeof(Int128) == 16);
 
 static_assert(is_signed_v<Int256>);
 static_assert(!is_unsigned_v<Int256>);
-static_assert(is_integer_v<Int256>);
+static_assert(is_integer<Int256>);
 static_assert(sizeof(Int256) == 32);
 
 static_assert(!is_signed_v<UInt128>);
 static_assert(is_unsigned_v<UInt128>);
-static_assert(is_integer_v<UInt128>);
+static_assert(is_integer<UInt128>);
 static_assert(sizeof(UInt128) == 16);
 
 static_assert(!is_signed_v<UInt256>);
 static_assert(is_unsigned_v<UInt256>);
-static_assert(is_integer_v<UInt256>);
+static_assert(is_integer<UInt256>);
 static_assert(sizeof(UInt256) == 32);
 
 
diff --git a/src/Compression/tests/gtest_compressionCodec.cpp b/src/Compression/tests/gtest_compressionCodec.cpp
index 6ba2d3457ea..dc0334c3c0c 100644
--- a/src/Compression/tests/gtest_compressionCodec.cpp
+++ b/src/Compression/tests/gtest_compressionCodec.cpp
@@ -685,7 +685,7 @@ auto SequentialGenerator = [](auto stride = 1)
 template <typename T>
 using uniform_distribution =
 typename std::conditional_t<std::is_floating_point_v<T>, std::uniform_real_distribution<T>,
-        typename std::conditional_t<is_integer_v<T>, std::uniform_int_distribution<T>, void>>;
+        typename std::conditional_t<is_integer<T>, std::uniform_int_distribution<T>, void>>;
 
 
 template <typename T = Int32>
diff --git a/src/DataTypes/DataTypesDecimal.h b/src/DataTypes/DataTypesDecimal.h
index 24e167e8e8f..7352ba4d8a5 100644
--- a/src/DataTypes/DataTypesDecimal.h
+++ b/src/DataTypes/DataTypesDecimal.h
@@ -47,6 +47,11 @@ public:
     SerializationPtr doGetDefaultSerialization() const override;
 };
 
+using DataTypeDecimal32 = DataTypeDecimal<Decimal32>;
+using DataTypeDecimal64 = DataTypeDecimal<Decimal64>;
+using DataTypeDecimal128 = DataTypeDecimal<Decimal128>;
+using DataTypeDecimal256 = DataTypeDecimal<Decimal256>;
+
 template <typename T>
 inline const DataTypeDecimal<T> * checkDecimal(const IDataType & data_type)
 {
diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index 35d169b9409..998970162ab 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -33,6 +33,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
+#include <Common/TypeList.h>
 #include <common/map.h>
 
 #if !defined(ARCADIA_BUILD)
@@ -183,8 +184,8 @@ namespace impl_
 
 enum class OpCase { Vector, LeftConstant, RightConstant };
 
-template <class T> inline constexpr const auto & undec(const T & x) { return x; }
-template <is_decimal T> inline constexpr const auto & undec(const T & x) { return x.value; }
+constexpr const auto & undec(const auto & x) { return x; }
+constexpr const auto & undec(const is_decimal auto & x) { return x.value; }
 
 template <typename A, typename B, typename Op, typename OpResultType = typename Op::ResultType>
 struct BinaryOperation
@@ -506,83 +507,34 @@ class FunctionBinaryArithmetic : public IFunction
     ContextPtr context;
     bool check_decimal_overflow = true;
 
-    template <typename F>
-    static bool castType(const IDataType * type, F && f)
+    static bool castType(const IDataType * type, auto && f)
     {
-        return castTypeToEither<
-            DataTypeUInt8,
-            DataTypeUInt16,
-            DataTypeUInt32,
-            DataTypeUInt64,
-            DataTypeUInt128,
-            DataTypeUInt256,
-            DataTypeInt8,
-            DataTypeInt16,
-            DataTypeInt32,
-            DataTypeInt64,
-            DataTypeInt128,
-            DataTypeInt256,
-            DataTypeFloat32,
-            DataTypeFloat64,
-            DataTypeDate,
-            DataTypeDateTime,
-            DataTypeDecimal<Decimal32>,
-            DataTypeDecimal<Decimal64>,
-            DataTypeDecimal<Decimal128>,
-            DataTypeDecimal<Decimal256>,
-            DataTypeFixedString
-        >(type, std::forward<F>(f));
-    }
+        using Types = TypeList<
+            DataTypeUInt8, DataTypeUInt16, DataTypeUInt32, DataTypeUInt64, DataTypeUInt128, DataTypeUInt256,
+            DataTypeInt8, DataTypeInt16, DataTypeInt32, DataTypeInt64, DataTypeInt128, DataTypeInt256,
+            DataTypeDecimal32, DataTypeDecimal64, DataTypeDecimal128, DataTypeDecimal256,
+            DataTypeDate, DataTypeDateTime,
+            DataTypeFixedString>;
 
-    template <typename F>
-    static bool castTypeNoFloats(const IDataType * type, F && f)
-    {
-        return castTypeToEither<
-            DataTypeUInt8,
-            DataTypeUInt16,
-            DataTypeUInt32,
-            DataTypeUInt64,
-            DataTypeUInt128,
-            DataTypeUInt256,
-            DataTypeInt8,
-            DataTypeInt16,
-            DataTypeInt32,
-            DataTypeInt64,
-            DataTypeInt128,
-            DataTypeInt256,
-            DataTypeDate,
-            DataTypeDateTime,
-            DataTypeDecimal<Decimal32>,
-            DataTypeDecimal<Decimal64>,
-            DataTypeDecimal<Decimal128>,
-            DataTypeDecimal<Decimal256>,
-            DataTypeFixedString
-        >(type, std::forward<F>(f));
+        using Floats = TypeList<DataTypeFloat32, DataTypeFloat64>;
+
+        using ValidTypes = std::conditional_t<valid_on_float_arguments,
+            typename TypeListConcat<Types, Floats>::Type,
+            Types>;
+
+        return castTypeToEitherTL<ValidTypes>(type, std::forward<decltype(f)>(f));
     }
 
     template <typename F>
     static bool castBothTypes(const IDataType * left, const IDataType * right, F && f)
     {
-        if constexpr (valid_on_float_arguments)
+        return castType(left, [&](const auto & left_)
         {
-            return castType(left, [&](const auto & left_)
+            return castType(right, [&](const auto & right_)
             {
-                return castType(right, [&](const auto & right_)
-                {
-                    return f(left_, right_);
-                });
+                return f(left_, right_);
             });
-        }
-        else
-        {
-            return castTypeNoFloats(left, [&](const auto & left_)
-            {
-                return castTypeNoFloats(right, [&](const auto & right_)
-                {
-                    return f(left_, right_);
-                });
-            });
-        }
+        });
     }
 
     static FunctionOverloadResolverPtr
diff --git a/src/Functions/castTypeToEither.h b/src/Functions/castTypeToEither.h
index bff4047768d..572c97841e1 100644
--- a/src/Functions/castTypeToEither.h
+++ b/src/Functions/castTypeToEither.h
@@ -5,6 +5,20 @@
 namespace DB
 {
 
+namespace detail
+{
+template <typename Typelist, size_t ...I>
+static bool castTypeToEither(const auto * type, auto && f, std::index_sequence<I...>)
+{
+    return (
+        (typeid_cast<const typename Typelist::template At<I> *>(type)
+            ? std::forward<decltype(f)>(f)(
+                *typeid_cast<const typename Typelist::template At<I> *>(type))
+            : false)
+        || ...);
+}
+}
+
 template <typename... Ts, typename T, typename F>
 static bool castTypeToEither(const T * type, F && f)
 {
@@ -12,4 +26,12 @@ static bool castTypeToEither(const T * type, F && f)
     return ((typeid_cast<const Ts *>(type) ? f(*typeid_cast<const Ts *>(type)) : false) || ...);
 }
 
+/// Use Common/TypeList as template argument
+template <class Typelist>
+static constexpr bool castTypeToEitherTL(const auto * type, auto && f)
+{
+    return detail::castTypeToEither<Typelist>(
+            type, std::forward<decltype(f)>(f),
+            std::make_index_sequence<Typelist::size>());
+}
 }

From 51dbedafd9e2b55c5a472343d9d4c2814cfead8e Mon Sep 17 00:00:00 2001
From: Vitaly Baranov <vitbar@yandex-team.ru>
Date: Sun, 12 Sep 2021 16:42:03 +0300
Subject: [PATCH 219/273] Expand macros in RabbitMQ settings.

---
 src/Storages/RabbitMQ/StorageRabbitMQ.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
index 2b37ca0763d..c6799a95e4f 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
@@ -77,27 +77,27 @@ StorageRabbitMQ::StorageRabbitMQ(
         : IStorage(table_id_)
         , WithContext(context_->getGlobalContext())
         , rabbitmq_settings(std::move(rabbitmq_settings_))
-        , exchange_name(rabbitmq_settings->rabbitmq_exchange_name.value)
-        , format_name(rabbitmq_settings->rabbitmq_format.value)
-        , exchange_type(defineExchangeType(rabbitmq_settings->rabbitmq_exchange_type.value))
-        , routing_keys(parseSettings(rabbitmq_settings->rabbitmq_routing_key_list.value))
+        , exchange_name(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_exchange_name))
+        , format_name(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_format))
+        , exchange_type(defineExchangeType(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_exchange_type)))
+        , routing_keys(parseSettings(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_routing_key_list)))
         , row_delimiter(rabbitmq_settings->rabbitmq_row_delimiter.value)
-        , schema_name(rabbitmq_settings->rabbitmq_schema.value)
+        , schema_name(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_schema))
         , num_consumers(rabbitmq_settings->rabbitmq_num_consumers.value)
         , num_queues(rabbitmq_settings->rabbitmq_num_queues.value)
-        , queue_base(rabbitmq_settings->rabbitmq_queue_base.value)
-        , queue_settings_list(parseSettings(rabbitmq_settings->rabbitmq_queue_settings_list.value))
+        , queue_base(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_queue_base))
+        , queue_settings_list(parseSettings(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_queue_settings_list)))
         , persistent(rabbitmq_settings->rabbitmq_persistent.value)
         , use_user_setup(rabbitmq_settings->rabbitmq_queue_consume.value)
         , hash_exchange(num_consumers > 1 || num_queues > 1)
         , log(&Poco::Logger::get("StorageRabbitMQ (" + table_id_.table_name + ")"))
-        , address(rabbitmq_settings->rabbitmq_host_port.value)
+        , address(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_host_port))
         , parsed_address(parseAddress(address, 5672))
         , login_password(std::make_pair(
                     getContext()->getConfigRef().getString("rabbitmq.username"),
                     getContext()->getConfigRef().getString("rabbitmq.password")))
-        , vhost(getContext()->getConfigRef().getString("rabbitmq.vhost", rabbitmq_settings->rabbitmq_vhost.value))
-        , connection_string(rabbitmq_settings->rabbitmq_address)
+        , vhost(getContext()->getConfigRef().getString("rabbitmq.vhost", getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_vhost)))
+        , connection_string(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_address))
         , secure(rabbitmq_settings->rabbitmq_secure.value)
         , semaphore(0, num_consumers)
         , unique_strbase(getRandomName())

From bbb192ee85a7e645b5873869578f260e9470c443 Mon Sep 17 00:00:00 2001
From: Vitaly Baranov <vitbar@yandex-team.ru>
Date: Sun, 12 Sep 2021 15:35:00 +0300
Subject: [PATCH 220/273] Convert skip_list.json into first line comments.

---
 docker/test/coverage/run.sh                   |   4 +-
 docker/test/fasttest/run.sh                   |  81 ++--
 docker/test/stateful/run.sh                   |   2 +-
 docker/test/stateless/run.sh                  |   2 +-
 docker/test/stateless_unbundled/run.sh        |   6 +-
 docker/test/stress/stress                     |  12 +-
 programs/client/CMakeLists.txt                |   1 +
 programs/client/Client.cpp                    |   8 +-
 programs/client/TestTags.cpp                  |  50 ++
 programs/client/TestTags.h                    |  18 +
 tests/clickhouse-test                         | 321 ++++++-------
 tests/queries/skip_list.json                  | 125 +++--
 .../skip_list_to_first_line_comment.py        | 429 ++++++++++++++++++
 13 files changed, 739 insertions(+), 320 deletions(-)
 create mode 100644 programs/client/TestTags.cpp
 create mode 100644 programs/client/TestTags.h
 create mode 100755 tests/queries/skip_list_to_first_line_comment.py

diff --git a/docker/test/coverage/run.sh b/docker/test/coverage/run.sh
index 11b6ce13ea1..807efdf1e47 100755
--- a/docker/test/coverage/run.sh
+++ b/docker/test/coverage/run.sh
@@ -80,7 +80,7 @@ LLVM_PROFILE_FILE='client_coverage_%5m.profraw' clickhouse-client --query "RENAM
 LLVM_PROFILE_FILE='client_coverage_%5m.profraw' clickhouse-client --query "RENAME TABLE datasets.visits_v1 TO test.visits"
 LLVM_PROFILE_FILE='client_coverage_%5m.profraw' clickhouse-client --query "SHOW TABLES FROM test"
 
-LLVM_PROFILE_FILE='client_coverage_%5m.profraw' clickhouse-test -j 8 --testname --shard --zookeeper --print-time --use-skip-list 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee /test_result.txt
+LLVM_PROFILE_FILE='client_coverage_%5m.profraw' clickhouse-test -j 8 --testname --shard --zookeeper --print-time 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee /test_result.txt
 
 readarray -t FAILED_TESTS < <(awk '/FAIL|TIMEOUT|ERROR/ { print substr($3, 1, length($3)-1) }' "/test_result.txt")
 
@@ -97,7 +97,7 @@ then
 
     echo "Going to run again: ${FAILED_TESTS[*]}"
 
-    LLVM_PROFILE_FILE='client_coverage_%5m.profraw' clickhouse-test --order=random --testname --shard --zookeeper --use-skip-list "${FAILED_TESTS[@]}" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee -a /test_result.txt
+    LLVM_PROFILE_FILE='client_coverage_%5m.profraw' clickhouse-test --order=random --testname --shard --zookeeper "${FAILED_TESTS[@]}" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee -a /test_result.txt
 else
     echo "No failed tests"
 fi
diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index 8a6b7f70cba..282bd323847 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -275,11 +275,10 @@ function run_tests
         00834_cancel_http_readonly_queries_on_client_close
         00911_tautological_compare
 
-        # Hyperscan
-        00926_multimatch
-        00929_multi_match_edit_distance
-        01681_hyperscan_debug_assertion
-        02004_max_hyperscan_regex_length
+        00926_multimatch # Hyperscan
+        00929_multi_match_edit_distance # Hyperscan
+        01681_hyperscan_debug_assertion # Hyperscan
+        02004_max_hyperscan_regex_length # Hyperscan
 
         01176_mysql_client_interactive          # requires mysql client
         01031_mutations_interpreter_and_context
@@ -344,70 +343,54 @@ function run_tests
         sha256
         xz
 
-        # Not sure why these two fail even in sequential mode. Disabled for now
-        # to make some progress.
-        00646_url_engine
-        00974_query_profiler
+        00646_url_engine     # Not sure why fail even in sequential mode. Disabled for now to make some progress.
+        00974_query_profiler # Not sure why fail even in sequential mode. Disabled for now to make some progress.
 
-         # In fasttest, ENABLE_LIBRARIES=0, so rocksdb engine is not enabled by default
-        01504_rocksdb
-        01686_rocksdb
+        01504_rocksdb        # In fasttest, ENABLE_LIBRARIES=0, so rocksdb engine is not enabled by default
+        01686_rocksdb        # In fasttest, ENABLE_LIBRARIES=0, so rocksdb engine is not enabled by default
 
-        # Look at DistributedFilesToInsert, so cannot run in parallel.
-        01460_DistributedFilesToInsert
+        01460_DistributedFilesToInsert # Look at DistributedFilesToInsert, so cannot run in parallel.
 
         01541_max_memory_usage_for_user_long
 
-        # Require python libraries like scipy, pandas and numpy
-        01322_ttest_scipy
-        01561_mann_whitney_scipy
+        01322_ttest_scipy        # Require python libraries like scipy, pandas and numpy
+        01561_mann_whitney_scipy # Require python libraries like scipy, pandas and numpy
 
-        01545_system_errors
-        # Checks system.errors
-        01563_distributed_query_finish
+        01545_system_errors            # Checks system.errors
+        01563_distributed_query_finish # Checks system.errors
 
-        # nc - command not found
-        01601_proxy_protocol
-        01622_defaults_for_url_engine
+        01601_proxy_protocol          # nc - command not found
+        01622_defaults_for_url_engine # nc - command not found
 
-        # JSON functions
-        01666_blns
+        01666_blns # JSON functions
 
-        # Requires postgresql-client
-        01802_test_postgresql_protocol_with_row_policy
+        01802_test_postgresql_protocol_with_row_policy # Requires postgresql-client
 
-        # Depends on AWS
-        01801_s3_cluster
-        02012_settings_clause_for_s3
+        01801_s3_cluster             # Depends on AWS
+        02012_settings_clause_for_s3 # Depends on AWS
 
-        # needs psql
-        01889_postgresql_protocol_null_fields
+        01889_postgresql_protocol_null_fields    # needs psql
 
-        # needs pv
-        01923_network_receive_time_metric_insert
+        01923_network_receive_time_metric_insert # needs pv
 
         01889_sqlite_read_write
 
-        # needs s2
-        01849_geoToS2
-        01851_s2_to_geo
-        01852_s2_get_neighbours
-        01853_s2_cells_intersect
-        01854_s2_cap_contains
-        01854_s2_cap_union
+        01849_geoToS2            # needs s2
+        01851_s2_to_geo          # needs s2
+        01852_s2_get_neighbours  # needs s2
+        01853_s2_cells_intersect # needs s2
+        01854_s2_cap_contains    # needs s2
+        01854_s2_cap_union       # needs s2
 
-        # needs s3
-        01944_insert_partition_by
+        01944_insert_partition_by # needs s3
 
-        # depends on Go
-        02013_zlib_read_after_eof
+        02013_zlib_read_after_eof # depends on Go
 
-        # Accesses CH via mysql table function (which is unavailable)
-        01747_system_session_log_long
+        01747_system_session_log_long # Accesses CH via mysql table function (which is unavailable)
     )
 
-    time clickhouse-test --hung-check -j 8 --order=random --use-skip-list \
-            --no-long --testname --shard --zookeeper --skip "${TESTS_TO_SKIP[@]}" \
+    time clickhouse-test --hung-check -j 8 --order=random \
+            --fast-tests-only --no-long --testname --shard --zookeeper \
             -- "$FASTTEST_FOCUS" 2>&1 \
         | ts '%Y-%m-%d %H:%M:%S' \
         | tee "$FASTTEST_OUTPUT/test_log.txt"
diff --git a/docker/test/stateful/run.sh b/docker/test/stateful/run.sh
index de058469192..dd5984fd7b5 100755
--- a/docker/test/stateful/run.sh
+++ b/docker/test/stateful/run.sh
@@ -108,7 +108,7 @@ function run_tests()
         ADDITIONAL_OPTIONS+=('--replicated-database')
     fi
 
-    clickhouse-test --testname --shard --zookeeper --no-stateless --hung-check --use-skip-list --print-time "${ADDITIONAL_OPTIONS[@]}" \
+    clickhouse-test --testname --shard --zookeeper --no-stateless --hung-check --print-time "${ADDITIONAL_OPTIONS[@]}" \
         "$SKIP_TESTS_OPTION" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee test_output/test_result.txt
 }
 
diff --git a/docker/test/stateless/run.sh b/docker/test/stateless/run.sh
index 154126a3880..ed721690281 100755
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@@ -97,7 +97,7 @@ function run_tests()
     fi
 
     clickhouse-test --testname --shard --zookeeper --hung-check --print-time \
-            --use-skip-list --test-runs "$NUM_TRIES" "${ADDITIONAL_OPTIONS[@]}" 2>&1 \
+            --test-runs "$NUM_TRIES" "${ADDITIONAL_OPTIONS[@]}" 2>&1 \
         | ts '%Y-%m-%d %H:%M:%S' \
         | tee -a test_output/test_result.txt
 }
diff --git a/docker/test/stateless_unbundled/run.sh b/docker/test/stateless_unbundled/run.sh
index 8b8612d4211..f8396706ed2 100755
--- a/docker/test/stateless_unbundled/run.sh
+++ b/docker/test/stateless_unbundled/run.sh
@@ -13,8 +13,4 @@ dpkg -i package_folder/clickhouse-test_*.deb
 
 service clickhouse-server start && sleep 5
 
-if grep -q -- "--use-skip-list" /usr/bin/clickhouse-test; then
-    SKIP_LIST_OPT="--use-skip-list"
-fi
-
-clickhouse-test --testname --shard --zookeeper "$SKIP_LIST_OPT" "$ADDITIONAL_OPTIONS" "$SKIP_TESTS_OPTION" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee test_output/test_result.txt
+clickhouse-test --testname --shard --zookeeper "$ADDITIONAL_OPTIONS" "$SKIP_TESTS_OPTION" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee test_output/test_result.txt
diff --git a/docker/test/stress/stress b/docker/test/stress/stress
index c71722809d7..73a84ad4c40 100755
--- a/docker/test/stress/stress
+++ b/docker/test/stress/stress
@@ -10,14 +10,6 @@ import logging
 import time
 
 
-def get_skip_list_cmd(path):
-    with open(path, 'r') as f:
-        for line in f:
-            if '--use-skip-list' in line:
-                return '--use-skip-list'
-    return ''
-
-
 def get_options(i):
     options = []
     client_options = []
@@ -56,8 +48,6 @@ def get_options(i):
 
 
 def run_func_test(cmd, output_prefix, num_processes, skip_tests_option, global_time_limit):
-    skip_list_opt = get_skip_list_cmd(cmd)
-
     global_time_limit_option = ''
     if global_time_limit:
         global_time_limit_option = "--global_time_limit={}".format(global_time_limit)
@@ -66,7 +56,7 @@ def run_func_test(cmd, output_prefix, num_processes, skip_tests_option, global_t
     pipes = []
     for i in range(0, len(output_paths)):
         f = open(output_paths[i], 'w')
-        full_command = "{} {} {} {} {}".format(cmd, skip_list_opt, get_options(i), global_time_limit_option, skip_tests_option)
+        full_command = "{} {} {} {}".format(cmd, get_options(i), global_time_limit_option, skip_tests_option)
         logging.info("Run func tests '%s'", full_command)
         p = Popen(full_command, shell=True, stdout=f, stderr=f)
         pipes.append(p)
diff --git a/programs/client/CMakeLists.txt b/programs/client/CMakeLists.txt
index 1de5ea88aee..9e774deadf0 100644
--- a/programs/client/CMakeLists.txt
+++ b/programs/client/CMakeLists.txt
@@ -4,6 +4,7 @@ set (CLICKHOUSE_CLIENT_SOURCES
     QueryFuzzer.cpp
     Suggest.cpp
     TestHint.cpp
+    TestTags.cpp
 )
 
 set (CLICKHOUSE_CLIENT_LINK
diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index c594f01861b..05f106db181 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -6,6 +6,7 @@
 #include "QueryFuzzer.h"
 #include "Suggest.h"
 #include "TestHint.h"
+#include "TestTags.h"
 
 #if USE_REPLXX
 #   include <common/ReplxxLineReader.h>
@@ -1078,12 +1079,17 @@ private:
 
         bool echo_query = echo_queries;
 
+        /// Test tags are started with "--" so they are interpreted as comments anyway.
+        /// But if the echo is enabled we have to remove the test tags from `all_queries_text`
+        /// because we don't want test tags to be echoed.
+        size_t test_tags_length = test_mode ? getTestTagsLength(all_queries_text) : 0;
+
         /// Several queries separated by ';'.
         /// INSERT data is ended by the end of line, not ';'.
         /// An exception is VALUES format where we also support semicolon in
         /// addition to end of line.
 
-        const char * this_query_begin = all_queries_text.data();
+        const char * this_query_begin = all_queries_text.data() + test_tags_length;
         const char * all_queries_end = all_queries_text.data() + all_queries_text.size();
 
         while (this_query_begin < all_queries_end)
diff --git a/programs/client/TestTags.cpp b/programs/client/TestTags.cpp
new file mode 100644
index 00000000000..a953df599dd
--- /dev/null
+++ b/programs/client/TestTags.cpp
@@ -0,0 +1,50 @@
+#include "TestTags.h"
+
+
+namespace DB
+{
+
+size_t getTestTagsLength(const String & multiline_query)
+{
+    const String & text = multiline_query;
+    size_t pos = 0;
+    bool first_line = true;
+
+    while (true)
+    {
+        size_t line_start = pos;
+
+        /// Skip spaces.
+        while ((pos != text.length()) && (text[pos] == ' ' || text[pos] == '\t'))
+            ++pos;
+
+        /// Skip comment "--".
+        static constexpr const char comment[] = "--";
+        if (text.compare(pos, strlen(comment), comment) != 0)
+            return line_start;
+        pos += strlen(comment);
+
+        /// Skip the prefix "Tags:" if it's the first line.
+        if (first_line)
+        {
+            while ((pos != text.length()) && (text[pos] == ' ' || text[pos] == '\t'))
+                ++pos;
+
+            static constexpr const char tags_prefix[] = "Tags:";
+            if (text.compare(pos, strlen(tags_prefix), tags_prefix) != 0)
+                return 0;
+            pos += strlen(tags_prefix);
+            first_line = false;
+        }
+
+        /// Skip end-of-line.
+        size_t eol_pos = text.find_first_of("\r\n", pos);
+        if (eol_pos == String::npos)
+            return text.length();
+        bool two_chars_eol = (eol_pos + 1 < text.length()) && ((text[eol_pos + 1] == '\r') || (text[eol_pos + 1] == '\n')) && (text[eol_pos + 1] != text[eol_pos]);
+        size_t eol_length = two_chars_eol ? 2 : 1;
+        pos = eol_pos + eol_length;
+    }
+}
+
+}
diff --git a/programs/client/TestTags.h b/programs/client/TestTags.h
new file mode 100644
index 00000000000..e2e36698cb5
--- /dev/null
+++ b/programs/client/TestTags.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <Core/Types.h>
+
+namespace DB
+{
+
+/// Returns the length of a text looking like
+/// -- Tags: x, y, z
+/// -- Tag x: explanation of tag x
+/// -- Tag y: explanation of tag y
+/// -- Tag z: explanation of tag z
+///
+/// at the beginning of a multiline query.
+/// If there are no test tags in the multiline query the function returns 0.
+size_t getTestTagsLength(const String & multiline_query);
+
+}
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index c3136c4fd52..68352c6b78d 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -6,12 +6,11 @@ import os
 import os.path
 import signal
 import re
-import json
 import copy
 import traceback
 
 from argparse import ArgumentParser
-from typing import Tuple, Union, Optional, TextIO
+from typing import Tuple, Union, Optional, TextIO, Dict, Set, List
 import shlex
 import subprocess
 from subprocess import Popen
@@ -83,76 +82,6 @@ def stop_tests():
             os.killpg(os.getpgid(os.getpid()), signal.SIGTERM)
             signal.signal(signal.SIGTERM, signal.SIG_DFL)
 
-def json_minify(string):
-    """
-    Removes all js-style comments from json string. Allows to have comments in skip_list.json.
-    The code was taken from https://github.com/getify/JSON.minify/tree/python under the MIT license.
-    """
-
-    tokenizer = re.compile(r'"|(/\*)|(\*/)|(//)|\n|\r')
-    end_slashes_re = re.compile(r'(\\)*$')
-
-    in_string = False
-    in_multi = False
-    in_single = False
-
-    new_str = []
-    index = 0
-
-    for match in re.finditer(tokenizer, string):
-        if not (in_multi or in_single):
-            tmp = string[index:match.start()]
-            new_str.append(tmp)
-        else:
-            # Replace comments with white space so that the JSON parser reports
-            # the correct column numbers on parsing errors.
-            new_str.append(' ' * (match.start() - index))
-
-        index = match.end()
-        val = match.group()
-
-        if val == '"' and not (in_multi or in_single):
-            escaped = end_slashes_re.search(string, 0, match.start())
-
-            # start of string or unescaped quote character to end string
-            if not in_string or (escaped is None or len(escaped.group()) % 2 == 0):  # noqa
-                in_string = not in_string
-            index -= 1  # include " character in next catch
-        elif not (in_string or in_multi or in_single):
-            if val == '/*':
-                in_multi = True
-            elif val == '//':
-                in_single = True
-        elif val == '*/' and in_multi and not (in_string or in_single):
-            in_multi = False
-            new_str.append(' ' * len(val))
-        elif val in '\r\n' and not (in_multi or in_string) and in_single:
-            in_single = False
-        elif not in_multi or in_single:  # noqa
-            new_str.append(val)
-
-        if val in '\r\n':
-            new_str.append(val)
-        elif in_multi or in_single:
-            new_str.append(' ' * len(val))
-
-    new_str.append(string[index:])
-    return ''.join(new_str)
-
-
-def remove_control_characters(s):
-    """
-    https://github.com/html5lib/html5lib-python/issues/96#issuecomment-43438438
-    """
-    def str_to_int(s, default, base=10):
-        if int(s, base) < 0x10000:
-            return chr(int(s, base))
-        return default
-    s = re.sub(r"&#(\d+);?", lambda c: str_to_int(c.group(1), c.group(0)), s)
-    s = re.sub(r"&#[xX]([0-9a-fA-F]+);?", lambda c: str_to_int(c.group(1), c.group(0), base=16), s)
-    s = re.sub(r"[\x00-\x08\x0b\x0e-\x1f\x7f]", "", s)
-    return s
-
 
 def get_db_engine(args, database_name):
     if args.replicated_database:
@@ -429,48 +358,69 @@ def print_test_time(test_time) -> str:
         return ''
 
 
-def should_skip_test_by_name(name: str, test_ext: str) -> Tuple[bool, str]:
-    if args.skip and any(s in name for s in args.skip):
-        return True, "skip"
-
-    if not args.zookeeper and ('zookeeper' in name or 'replica' in name):
-        return True, "no zookeeper"
-
-    if not args.shard and \
-        ('shard' in name or 'distributed' in name or 'global' in name):
-        return True, "no shard"
-
-    # Tests for races and deadlocks usually are run in a loop for a significant
-    # amount of time
-    if args.no_long and \
-        ('long' in name or 'deadlock' in name or 'race' in name):
-        return True, "no long"
-
-    if not USE_JINJA and test_ext.endswith("j2"):
-        return True, "no jinja"
-
-    return False, ""
-
-
-def should_skip_disabled_test(name: str, suite_dir: str) -> Tuple[bool, str]:
-    disabled_file = os.path.join(suite_dir, name) + '.disabled'
-
-    if os.path.exists(disabled_file) and not args.disabled:
-        return True, open(disabled_file, 'r').read()
-
-    return False, ""
-
-
 # should skip test, should increment skipped_total, skip reason
-def should_skip_test(name: str, test_ext: str, suite_dir: str) -> Tuple[bool, bool, str]:
-    should_skip, skip_reason = should_skip_test_by_name(name, test_ext)
+def should_skip_test(name: str, test_ext: str, suite_dir: str, all_tags: Dict[str, Set[str]]) -> Tuple[bool, bool, str]:
+    tags = all_tags.get(name + test_ext)
 
-    if should_skip:
-        return True, True, skip_reason
+    should_skip = False
+    increment_skip_count = False
+    skip_reason = ''
 
-    should_skip, skip_reason = should_skip_disabled_test(name, suite_dir)
+    if tags and ('disabled' in tags) and not args.disabled:
+        should_skip = True
+        increment_skip_count = False
+        skip_reason = 'disabled'
 
-    return should_skip, False, skip_reason
+    elif os.path.exists(os.path.join(suite_dir, name) + '.disabled') and not args.disabled:
+        should_skip = True
+        increment_skip_count = False
+        skip_reason = 'disabled'
+
+    elif args.skip and any(s in name for s in args.skip):
+        should_skip = True
+        increment_skip_count = True
+        skip_reason = 'skip'
+
+    elif not USE_JINJA and test_ext.endswith("j2"):
+        should_skip = True
+        increment_skip_count = True
+        skip_reason = 'no jinja'
+
+    elif tags and (('zookeeper' in tags) or ('replica' in tags)) and not args.zookeeper:
+        should_skip = True
+        increment_skip_count = True
+        skip_reason = 'no zookeeper'
+
+    elif tags and (('shard' in tags) or ('distributed' in tags) or ('global' in tags)) and not args.shard:
+        should_skip = True
+        increment_skip_count = True
+        skip_reason = 'no shard'
+
+    elif tags and ('no-fasttest' in tags) and args.fast_tests_only:
+        should_skip = True
+        increment_skip_count = True
+        skip_reason = 'running fast tests only'
+
+    elif tags and (('long' in tags) or ('deadlock' in tags) or ('race' in tags)) and args.no_long:
+        # Tests for races and deadlocks usually are run in a loop for a significant amount of time
+        should_skip = True
+        increment_skip_count = True
+        skip_reason = 'not running long tests'
+
+    elif tags and ('no-replicated-database' in tags) and args.replicated_database:
+        should_skip = True
+        increment_skip_count = True
+        skip_reason = 'replicated-database'
+
+    elif tags:
+        for build_flag in args.build_flags:
+            if 'no-' + build_flag in tags:
+                should_skip = True
+                increment_skip_count = True
+                skip_reason = build_flag
+                break
+
+    return should_skip, increment_skip_count, skip_reason
 
 
 def send_test_name_failed(suite: str, case: str) -> bool:
@@ -491,9 +441,9 @@ def send_test_name_failed(suite: str, case: str) -> bool:
 
 restarted_tests = []  # (test, stderr)
 
-# def run_tests_array(all_tests, suite, suite_dir, suite_tmp_dir, run_total):
+# def run_tests_array(all_tests, num_tests, suite, suite_dir, suite_tmp_dir, all_tags):
 def run_tests_array(all_tests_with_params):
-    all_tests, num_tests, suite, suite_dir, suite_tmp_dir = all_tests_with_params
+    all_tests, num_tests, suite, suite_dir, suite_tmp_dir, all_tags = all_tests_with_params
     global stop_time
     global exit_code
     global server_died
@@ -558,7 +508,7 @@ def run_tests_array(all_tests_with_params):
                 status = "{0:72}".format(removesuffix(name, ".gen", ".sql") + ": ")
 
             skip_test, increment_skip_count, skip_reason = \
-                should_skip_test(name, ext, suite_dir)
+                should_skip_test(name, ext, suite_dir, all_tags)
 
             if skip_test:
                 status += MSG_SKIPPED + f" - {skip_reason}\n"
@@ -782,16 +732,15 @@ def check_server_started(client, retry_count):
 
 
 class BuildFlags():
-    THREAD = 'thread-sanitizer'
-    ADDRESS = 'address-sanitizer'
-    UNDEFINED = 'ub-sanitizer'
-    MEMORY = 'memory-sanitizer'
-    DEBUG = 'debug-build'
-    UNBUNDLED = 'unbundled-build'
-    RELEASE = 'release-build'
-    DATABASE_ORDINARY = 'database-ordinary'
+    THREAD = 'tsan'
+    ADDRESS = 'asan'
+    UNDEFINED = 'ubsan'
+    MEMORY = 'msan'
+    DEBUG = 'debug'
+    UNBUNDLED = 'unbundled'
+    RELEASE = 'release'
+    ORDINARY_DATABASE = 'ordinary-database'
     POLYMORPHIC_PARTS = 'polymorphic-parts'
-    DATABASE_REPLICATED = 'database-replicated'
 
 
 def collect_build_flags(client):
@@ -836,7 +785,7 @@ def collect_build_flags(client):
 
     if clickhouse_proc.returncode == 0:
         if b'Ordinary' in stdout:
-            result.append(BuildFlags.DATABASE_ORDINARY)
+            result.append(BuildFlags.ORDINARY_DATABASE)
     else:
         raise Exception("Cannot get information about build from server errorcode {}, stderr {}".format(clickhouse_proc.returncode, stderr))
 
@@ -902,7 +851,7 @@ def open_client_process(
 
 
 
-def do_run_tests(jobs, suite, suite_dir, suite_tmp_dir, all_tests, parallel_tests, sequential_tests, parallel):
+def do_run_tests(jobs, suite, suite_dir, suite_tmp_dir, all_tests, all_tags, parallel_tests, sequential_tests, parallel):
     if jobs > 1 and len(parallel_tests) > 0:
         print("Found", len(parallel_tests), "parallel tests and", len(sequential_tests), "sequential tests")
         run_n, run_total = parallel.split('/')
@@ -920,7 +869,7 @@ def do_run_tests(jobs, suite, suite_dir, suite_tmp_dir, all_tests, parallel_test
         batch_size = max(1, len(parallel_tests) // jobs)
         parallel_tests_array = []
         for _ in range(jobs):
-            parallel_tests_array.append((None, batch_size, suite, suite_dir, suite_tmp_dir))
+            parallel_tests_array.append((None, batch_size, suite, suite_dir, suite_tmp_dir, all_tags))
 
         with closing(multiprocessing.Pool(processes=jobs)) as pool:
             pool.map_async(run_tests_array, parallel_tests_array)
@@ -935,11 +884,11 @@ def do_run_tests(jobs, suite, suite_dir, suite_tmp_dir, all_tests, parallel_test
 
         pool.join()
 
-        run_tests_array((sequential_tests, len(sequential_tests), suite, suite_dir, suite_tmp_dir))
+        run_tests_array((sequential_tests, len(sequential_tests), suite, suite_dir, suite_tmp_dir, all_tags))
         return len(sequential_tests) + len(parallel_tests)
     else:
         num_tests = len(all_tests)
-        run_tests_array((all_tests, num_tests, suite, suite_dir, suite_tmp_dir))
+        run_tests_array((all_tests, num_tests, suite, suite_dir, suite_tmp_dir, all_tags))
         return num_tests
 
 
@@ -1053,23 +1002,10 @@ def main(args):
             "Server is not responding. Cannot execute 'SELECT 1' query. \
             If you are using split build, you have to specify -c option.")
 
-    build_flags = collect_build_flags(args.client)
-
-    if args.replicated_database:
-        build_flags.append(BuildFlags.DATABASE_REPLICATED)
-
-    if args.use_skip_list:
-        tests_to_skip_from_list = collect_tests_to_skip(args.skip_list_path, build_flags)
-    else:
-        tests_to_skip_from_list = set()
+    args.build_flags = collect_build_flags(args.client)
 
     if args.skip:
-        args.skip = set(args.skip) | tests_to_skip_from_list
-    else:
-        args.skip = tests_to_skip_from_list
-
-    if args.use_skip_list and not args.sequential:
-        args.sequential = collect_sequential_list(args.skip_list_path)
+        args.skip = set(args.skip)
 
     base_dir = os.path.abspath(args.queries)
     tmp_dir = os.path.abspath(args.tmp)
@@ -1148,19 +1084,21 @@ def main(args):
             all_tests = get_tests_list(
                 suite_dir, args.test, args.test_runs, tests_in_suite_key_func)
 
-            jobs = args.jobs
+            all_tags = read_test_tags(suite_dir, all_tests)
 
-            parallel_tests = []
             sequential_tests = []
+            if args.sequential:
+                for test in all_tests:
+                    if any(s in test for s in args.sequential):
+                        sequential_tests.append(test)
+            else:
+                sequential_tests = collect_sequential_list(all_tags)
 
-            for test in all_tests:
-                if any(s in test for s in args.sequential):
-                    sequential_tests.append(test)
-                else:
-                    parallel_tests.append(test)
+            sequential_tests_set = set(sequential_tests)
+            parallel_tests = [test for test in all_tests if test not in sequential_tests_set]
 
             total_tests_run += do_run_tests(
-                jobs, suite, suite_dir, suite_tmp_dir, all_tests, parallel_tests, sequential_tests, args.parallel)
+                args.jobs, suite, suite_dir, suite_tmp_dir, all_tests, all_tags, parallel_tests, sequential_tests, args.parallel)
 
     if server_died.is_set():
         exit_code.value = 1
@@ -1232,40 +1170,58 @@ def get_additional_client_options_url(args):
     return ''
 
 
-def collect_tests_to_skip(skip_list_path, build_flags):
-    result = set([])
+def read_test_tags(suite_dir: str, all_tests: List[str]) -> Dict[str, Set[str]]:
+    def get_comment_sign(filename):
+        if filename.endswith('.sql') or filename.endswith('.sql.j2'):
+            return '--'
+        elif filename.endswith('.sh') or filename.endswith('.py') or filename.endswith('.expect'):
+            return '#'
+        else:
+            raise Exception(f'Unknown file_extension: {filename}')
 
-    if not os.path.exists(skip_list_path):
-        return result
+    def parse_tags_from_line(line, comment_sign):
+        if not line.startswith(comment_sign):
+            return None
+        tags_str = line[len(comment_sign):].lstrip()
+        tags_prefix = "Tags:"
+        if not tags_str.startswith(tags_prefix):
+            return None
+        tags_str = tags_str[len(tags_prefix):]
+        tags = tags_str.split(',')
+        tags = {tag.strip() for tag in tags}
+        return tags
 
-    with open(skip_list_path, 'r') as skip_list_file:
-        content = skip_list_file.read()
+    def is_shebang(line):
+        return line.startswith('#!')
 
-        # allows to have comments in skip_list.json
-        skip_dict = json.loads(json_minify(content))
+    def load_tags_from_file(filepath):
+        with open(filepath, 'r') as file:
+            try:
+                line = file.readline()
+                if is_shebang(line):
+                    line = file.readline()
+            except UnicodeDecodeError:
+                return []
+        return parse_tags_from_line(line, get_comment_sign(filepath))
 
-        for build_flag in build_flags:
-            result |= set(skip_dict[build_flag])
-
-    count = len(result)
-
-    if count > 0:
-        print(f"Found file with skip-list {skip_list_path}, {count} test will be skipped")
-
-    return result
+    all_tags = {}
+    start_time = datetime.now()
+    for test_name in all_tests:
+        tags = load_tags_from_file(os.path.join(suite_dir, test_name))
+        if tags:
+            all_tags[test_name] = tags
+    elapsed = (datetime.now() - start_time).total_seconds()
+    if elapsed > 1:
+        print(f"Tags for suite {suite_dir} read in {elapsed:.2f} seconds")
+    return all_tags
 
 
-def collect_sequential_list(skip_list_path):
-    if not os.path.exists(skip_list_path):
-        return set([])
-
-    with open(skip_list_path, 'r') as skip_list_file:
-        content = skip_list_file.read()
-        # allows to have comments in skip_list.json
-        skip_dict = json.loads(json_minify(content))
-        if 'parallel' in skip_dict:
-            return skip_dict['parallel']
-        return set([])
+def collect_sequential_list(all_tags: Dict[str, Set[str]]) -> List[str]:
+    res = []
+    for test_name, tags in all_tags.items():
+        if ('no-parallel' in tags) or ('sequential' in tags):
+            res.append(test_name)
+    return res
 
 
 if __name__ == '__main__':
@@ -1308,10 +1264,9 @@ if __name__ == '__main__':
     parser.add_argument('--test-runs', default=1, nargs='?', type=int, help='Run each test many times (useful for e.g. flaky check)')
     parser.add_argument('-U', '--unified', default=3, type=int, help='output NUM lines of unified context')
     parser.add_argument('-r', '--server-check-retries', default=30, type=int, help='Num of tries to execute SELECT 1 before tests started')
-    parser.add_argument('--skip-list-path', help="Path to skip-list file")
-    parser.add_argument('--use-skip-list', action='store_true', default=False, help="Use skip list to skip tests if found")
     parser.add_argument('--db-engine', help='Database engine name')
     parser.add_argument('--replicated-database', action='store_true', default=False, help='Run tests with Replicated database engine')
+    parser.add_argument('--fast-tests-only', action='store_true', default=False, help='Run only fast tests (the tests without the "no-fasttest" tag)')
     parser.add_argument('--no-stateless', action='store_true', help='Disable all stateless tests')
     parser.add_argument('--no-stateful', action='store_true', help='Disable all stateful tests')
     parser.add_argument('--skip', nargs='+', help="Skip these tests")
@@ -1358,12 +1313,6 @@ if __name__ == '__main__':
 
     print("Using queries from '" + args.queries + "' directory")
 
-    if args.skip_list_path is None:
-        args.skip_list_path = os.path.join(args.queries, 'skip_list.json')
-
-    if args.sequential is None:
-        args.sequential = set([])
-
     if args.tmp is None:
         args.tmp = args.queries
     if args.client is None:
diff --git a/tests/queries/skip_list.json b/tests/queries/skip_list.json
index f280fd4682e..19cb7b24e37 100644
--- a/tests/queries/skip_list.json
+++ b/tests/queries/skip_list.json
@@ -112,12 +112,10 @@
         "01153_attach_mv_uuid",
         "01157_replace_table",
         "01185_create_or_replace_table",
-        /// Sometimes cannot lock file most likely due to concurrent or adjacent tests, but we don't care how it works in Ordinary database.
-        "rocksdb",
+        "rocksdb", /// Sometimes cannot lock file most likely due to concurrent or adjacent tests, but we don't care how it works in Ordinary database
         "01914_exchange_dictionaries" /// Requires Atomic database
     ],
     "database-replicated": [
-        /// Unclassified
         "memory_tracking",
         "memory_usage",
         "live_view",
@@ -125,68 +123,67 @@
         "01269_create_with_null",
         "01451_replicated_detach_drop_and_quorum",
         "01188_attach_table_from_path",
-        /// ON CLUSTER is not allowed
-        "01181_db_atomic_drop_on_cluster",
-        "01175_distributed_ddl_output_mode",
+        
+        "01181_db_atomic_drop_on_cluster",   /// ON CLUSTER is not allowed
+        "01175_distributed_ddl_output_mode", /// ON CLUSTER is not allowed
         "01415_sticking_mutations",
-        /// user_files
-        "01721_engine_file_truncate_on_insert",
-        /// Fails due to additional replicas or shards
-        "quorum",
-        "01650_drop_part_and_deduplication_zookeeper",
-        "01532_execute_merges_on_single_replica",
-        "00652_replicated_mutations_default_database_zookeeper",
-        "00620_optimize_on_nonleader_replica_zookeeper",
-        "01158_zookeeper_log",
-        /// grep -c
-        "01018_ddl_dictionaries_bad_queries",
-        "00908_bloom_filter_index",
-        /// Unsupported type of ALTER query
-        "01650_fetch_patition_with_macro_in_zk_path",
-        "01451_detach_drop_part",
-        "01451_replicated_detach_drop_part",
-        "01417_freeze_partition_verbose",
-        "01417_freeze_partition_verbose_zookeeper",
-        "01130_in_memory_parts_partitons",
-        "01060_shutdown_table_after_detach",
-        "01021_only_tuple_columns",
-        "01015_attach_part",
-        "00955_test_final_mark",
-        "00753_alter_attach",
-        "00626_replace_partition_from_table_zookeeper",
-        "00626_replace_partition_from_table",
-        "00152_insert_different_granularity",
-        "00054_merge_tree_partitions",
-        "01781_merge_tree_deduplication",
-        "00980_zookeeper_merge_tree_alter_settings",
-        "00980_merge_alter_settings",
-        "02009_array_join_partition",
-        "02012_changed_enum_type_non_replicated",
-        "02012_zookeeper_changed_enum_type",
-        "02012_zookeeper_changed_enum_type_incompatible",
-        /// Old syntax is not allowed
-        "01062_alter_on_mutataion_zookeeper",
-        "00925_zookeeper_empty_replicated_merge_tree_optimize_final",
-        "00754_alter_modify_order_by_replicated_zookeeper",
-        "00652_replicated_mutations_zookeeper",
-        "00623_replicated_truncate_table_zookeeper",
-        "00516_deduplication_after_drop_partition_zookeeper",
-        "00446_clear_column_in_partition_concurrent_zookeeper",
-        "00236_replicated_drop_on_non_leader_zookeeper",
-        "00226_zookeeper_deduplication_and_unexpected_parts",
-        "00215_primary_key_order_zookeeper",
-        "00121_drop_column_zookeeper",
-        "00083_create_merge_tree_zookeeper",
-        "00062_replicated_merge_tree_alter_zookeeper",
-        /// Does not support renaming of multiple tables in single query
-        "00634_rename_view",
-        "00140_rename",
-        /// Different query_id
-        "01943_query_id_check",
-        /// Requires investigation
-        "00953_zookeeper_suetin_deduplication_bug",
-        "01783_http_chunk_size",
-        "00166_explain_estimate"
+        "01721_engine_file_truncate_on_insert", /// user_files
+        
+        "quorum",                                                /// Fails due to additional replicas or shards
+        "01650_drop_part_and_deduplication_zookeeper",           /// Fails due to additional replicas or shards
+        "01532_execute_merges_on_single_replica",                /// Fails due to additional replicas or shards
+        "00652_replicated_mutations_default_database_zookeeper", /// Fails due to additional replicas or shards
+        "00620_optimize_on_nonleader_replica_zookeeper",         /// Fails due to additional replicas or shards
+        "01158_zookeeper_log",                                   /// Fails due to additional replicas or shards
+        
+        "01018_ddl_dictionaries_bad_queries", /// grep -c
+        "00908_bloom_filter_index",           /// grep -c
+        
+        "01650_fetch_patition_with_macro_in_zk_path",     /// Unsupported type of ALTER query
+        "01451_detach_drop_part",                         /// Unsupported type of ALTER query
+        "01451_replicated_detach_drop_part",              /// Unsupported type of ALTER query
+        "01417_freeze_partition_verbose",                 /// Unsupported type of ALTER query
+        "01417_freeze_partition_verbose_zookeeper",       /// Unsupported type of ALTER query
+        "01130_in_memory_parts_partitons",                /// Unsupported type of ALTER query
+        "01060_shutdown_table_after_detach",              /// Unsupported type of ALTER query
+        "01021_only_tuple_columns",                       /// Unsupported type of ALTER query
+        "01015_attach_part",                              /// Unsupported type of ALTER query
+        "00955_test_final_mark",                          /// Unsupported type of ALTER query
+        "00753_alter_attach",                             /// Unsupported type of ALTER query
+        "00626_replace_partition_from_table_zookeeper",   /// Unsupported type of ALTER query
+        "00626_replace_partition_from_table",             /// Unsupported type of ALTER query
+        "00152_insert_different_granularity",             /// Unsupported type of ALTER query
+        "00054_merge_tree_partitions",                    /// Unsupported type of ALTER query
+        "01781_merge_tree_deduplication",                 /// Unsupported type of ALTER query
+        "00980_zookeeper_merge_tree_alter_settings",      /// Unsupported type of ALTER query
+        "00980_merge_alter_settings",                     /// Unsupported type of ALTER query
+        "02009_array_join_partition",                     /// Unsupported type of ALTER query
+        "02012_changed_enum_type_non_replicated",         /// Unsupported type of ALTER query
+        "02012_zookeeper_changed_enum_type",              /// Unsupported type of ALTER query
+        "02012_zookeeper_changed_enum_type_incompatible", /// Unsupported type of ALTER query
+        
+        "01062_alter_on_mutataion_zookeeper",                         /// Old syntax is not allowed
+        "00925_zookeeper_empty_replicated_merge_tree_optimize_final", /// Old syntax is not allowed
+        "00754_alter_modify_order_by_replicated_zookeeper",           /// Old syntax is not allowed
+        "00652_replicated_mutations_zookeeper",                       /// Old syntax is not allowed
+        "00623_replicated_truncate_table_zookeeper",                  /// Old syntax is not allowed
+        "00516_deduplication_after_drop_partition_zookeeper",         /// Old syntax is not allowed
+        "00446_clear_column_in_partition_concurrent_zookeeper",       /// Old syntax is not allowed
+        "00236_replicated_drop_on_non_leader_zookeeper",              /// Old syntax is not allowed
+        "00226_zookeeper_deduplication_and_unexpected_parts",         /// Old syntax is not allowed
+        "00215_primary_key_order_zookeeper",                          /// Old syntax is not allowed
+        "00121_drop_column_zookeeper",                                /// Old syntax is not allowed
+        "00083_create_merge_tree_zookeeper",                          /// Old syntax is not allowed
+        "00062_replicated_merge_tree_alter_zookeeper",                /// Old syntax is not allowed
+        
+        "00634_rename_view", /// Does not support renaming of multiple tables in single query
+        "00140_rename",      /// Does not support renaming of multiple tables in single query
+        
+        "01943_query_id_check", /// Different query_id
+        
+        "00953_zookeeper_suetin_deduplication_bug", /// Requires investigation
+        "01783_http_chunk_size",                    /// Requires investigation
+        "00166_explain_estimate"                    /// Requires investigation
     ],
     "polymorphic-parts": [
         "01508_partition_pruning_long", /// bug, shoud be fixed
diff --git a/tests/queries/skip_list_to_first_line_comment.py b/tests/queries/skip_list_to_first_line_comment.py
new file mode 100755
index 00000000000..723127ad218
--- /dev/null
+++ b/tests/queries/skip_list_to_first_line_comment.py
@@ -0,0 +1,429 @@
+#!/usr/bin/python3
+
+import os
+import time
+
+TEST_FILE_EXTENSIONS = ['.sql', '.sql.j2', '.sh', '.py', '.expect']
+TEST_FILE_EXTENSIONS += [ext + '.disabled' for ext in TEST_FILE_EXTENSIONS]
+TAGS_PREFIX = "Tags:"
+
+
+def parse_skip_list_json(text):
+    pos = 0
+    def skip_spaces():
+        nonlocal pos
+        start_pos = pos
+        while pos < len(text) and text[pos].isspace():
+            pos += 1
+        return pos > start_pos
+
+    def skip_comment():
+        nonlocal pos
+        if text.startswith('//', pos):
+            end_of_line = text.find('\n', pos + 1)
+            if end_of_line == -1:
+                pos = len(text)
+                return True
+            pos = end_of_line + 1
+            return True
+        elif text.startswith('/*', pos):
+            end_of_comment = text.find('*/', pos + 2)
+            if end_of_comment == -1:
+                raise Exception(f'Not found the end of a comment at pos {pos}')
+            pos = end_of_comment + 2
+            return True
+        else:
+            return False
+
+    def skip_spaces_or_comments():
+        while skip_spaces() or skip_comment():
+            pass
+
+    def skip_char_only(c):
+        nonlocal pos
+        if not text.startswith(c, pos):
+            return False
+        pos += 1
+        return True
+
+    def skip_char(c):
+        skip_spaces_or_comments()
+        return skip_char_only(c)
+
+    def expect_char(c):
+        nonlocal pos
+        skip_spaces_or_comments()
+        if not text.startswith(c, pos):
+            raise Exception(f"Expected '{c}' at pos {pos}")
+        pos += 1
+
+    def parse_quoted_string():
+        nonlocal pos
+        skip_spaces_or_comments()
+        expect_char('"')
+        end_of_string = text.find('"', pos)
+        if end_of_string == -1:
+            raise Exception(f'Not found the end of a quoted string at pos {pos-1}')
+        str = text[pos:end_of_string]
+        pos = end_of_string + 1
+        return str
+
+    def parse_description_comment():
+        nonlocal pos
+        while pos < len(text) and (text[pos] == ' ' or text[pos] == '\t'):
+            pos += 1
+        if not text.startswith('///', pos):
+            return None
+        end_of_line = text.find('\n', pos + 3)
+        if end_of_line == -1:
+            description = text[pos+3:]
+            pos = len(text)
+        else:
+            description = text[pos+3:end_of_line]
+            pos = end_of_line + 1
+        description = description.strip()
+        return description
+
+    res = {}
+    expect_char('{')
+    while not skip_char('}'):
+        build_flag = parse_quoted_string()
+        expect_char(':')
+        expect_char('[')
+        patterns = []
+        while not skip_char(']'):
+            pattern = parse_quoted_string()
+            skip_char_only(',')
+            description = parse_description_comment()
+            patterns.append((pattern, description))
+        skip_char(',')
+        res[build_flag] = patterns
+    return res
+
+
+def load_skip_list_json(path):
+    if not os.path.exists(path):
+        raise Exception(f'File {path} not found')
+    with open(path, 'r') as file:
+        contents = file.read()
+        skip_dict = parse_skip_list_json(contents)
+        return skip_dict
+
+
+def parse_fasttest_run_sh(text):
+    mark = 'TESTS_TO_SKIP=('
+    pos = text.find(mark)
+    if pos == -1:
+        raise Exception('TESTS_TO_SKIP not found in fasttest/run.sh')
+    pos += len(mark)
+
+    def skip_spaces():
+        nonlocal pos
+        start_pos = pos
+        while pos < len(text) and text[pos].isspace():
+            pos += 1
+        return pos > start_pos
+
+    def skip_comment():
+        nonlocal pos
+        if text.startswith('#', pos):
+            end_of_line = text.find('\n', pos + 1)
+            if end_of_line == -1:
+                pos = len(text)
+                return True
+            pos = end_of_line + 1
+            return True
+        else:
+            return False
+
+    def skip_spaces_or_comments():
+        while skip_spaces() or skip_comment():
+            pass
+
+    def skip_char(c):
+        nonlocal pos
+        skip_spaces_or_comments()
+        if not text.startswith(c, pos):
+            return False
+        pos += 1
+        return True
+
+    def parse_test_pattern():
+        nonlocal pos
+        skip_spaces_or_comments()
+        cur_pos = pos
+        while (cur_pos < len(text)) and (text[cur_pos].isalnum() or text[cur_pos] == '_'):
+            cur_pos += 1
+        if cur_pos == pos:
+            raise Exception(f"Couldn't read a test's name or pattern at pos {pos}")
+        pattern = text[pos:cur_pos]
+        pos = cur_pos
+        return pattern
+        
+    def parse_description_comment():
+        nonlocal pos
+        while pos < len(text) and (text[pos] == ' ' or text[pos] == '\t'):
+            pos += 1
+        if not text.startswith('#', pos):
+            return None
+        end_of_line = text.find('\n', pos + 1)
+        if end_of_line == -1:
+            description = text[pos+1:]
+            pos = len(text)
+        else:
+            description = text[pos+1:end_of_line]
+            pos = end_of_line + 1
+        description = description.strip()
+        return description
+
+    patterns = []
+    while not skip_char(')'):
+        pattern = parse_test_pattern()
+        description = parse_description_comment()
+        patterns.append((pattern, description))
+    return {"fasttest": patterns}
+
+
+def load_fasttest_run_sh(path):
+    if not os.path.exists(path):
+        raise Exception(f'File {path} not found')
+    with open(path, 'r') as file:
+        contents = file.read()
+        skip_dict = parse_fasttest_run_sh(contents)
+        return skip_dict
+
+
+def get_comment_sign(filename):
+    if filename.endswith('.disabled'):
+        filename = filename[:-len('.disabled')]
+    if filename.endswith('.sql') or filename.endswith('.sql.j2'):
+        return '--'
+    elif filename.endswith('.sh') or filename.endswith('.py') or filename.endswith('.expect'):
+        return '#'
+    else:
+        raise Exception(f'Unknown file_extension: {filename}')
+
+
+def is_shebang(line):
+    return line.startswith('#!')
+
+
+def parse_tags_from_line(line, comment_sign):
+    if not line.startswith(comment_sign):
+        return None
+    tags_str = line[len(comment_sign):].lstrip()
+    if not tags_str.startswith(TAGS_PREFIX):
+        return None
+    tags_str = tags_str[len(TAGS_PREFIX):]
+    tags = tags_str.split(',')
+    tags = [tag.strip() for tag in tags]
+    return tags
+
+
+def format_tags_to_line(tags, comment_sign):
+    return comment_sign + ' ' + TAGS_PREFIX + ' ' + ', '.join(tags) + '\n'
+
+
+def load_tags_from_file(filepath):
+    with open(filepath, 'r') as file:
+        try:
+            line = file.readline()
+            if is_shebang(line):
+                line = file.readline()
+        except UnicodeDecodeError:
+            return []
+    return parse_tags_from_line(line, get_comment_sign(filepath))
+
+
+def save_tags_to_file(filepath, tags, description = {}):
+    if not tags:
+        return
+    with open(filepath, 'r') as file:
+        contents = file.read()
+
+    # Skip shebang.
+    shebang_line = ''
+    eol = contents.find('\n')
+    if eol != -1 and is_shebang(contents[:eol+1]):
+        shebang_line = contents[:eol+1]
+        contents = contents[eol+1:]
+
+    # Skip tag line with description lines.
+    eol = contents.find('\n')
+    comment_sign = get_comment_sign(filepath)
+    if eol != -1 and parse_tags_from_line(contents[:eol+1], comment_sign):
+        contents = contents[eol+1:]
+        while True:
+            eol = contents.find('\n')
+            if eol == -1 or contents[:eol+1].isspace():
+                break
+            contents = contents[eol+1:]
+
+    # Skip an empty line after tags.
+    eol = contents.find('\n')
+    if eol != -1 and contents[:eol+1].isspace():
+        contents = contents[eol+1:]
+    empty_line = '\n'
+
+    # New tags line.
+    tags_line = format_tags_to_line(tags, comment_sign)
+
+    # New description lines.
+    tags_with_descriptions = []
+    for tag in tags:
+        if description.get(tag):
+            tags_with_descriptions.append(tag)
+    
+    description_lines = ''
+    if tags_with_descriptions:
+        for tag in tags_with_descriptions:
+            description_lines += comment_sign + ' Tag ' + tag + ': ' + description[tag] + '\n'
+
+    contents = shebang_line + tags_line + description_lines + empty_line + contents
+    with open(filepath, 'w') as file:
+        file.write(contents)
+        print(f'Changed {filepath}')
+
+
+def build_flag_to_tag(build_flag):
+    if build_flag == "thread-sanitizer":
+        return "no-tsan"
+    elif build_flag == "address-sanitizer":
+        return "no-asan"
+    elif build_flag == "ub-sanitizer":
+        return "no-ubsan"
+    elif build_flag == "memory-sanitizer":
+        return "no-msan"
+    elif build_flag == "database-replicated":
+        return "no-replicated-database"
+    elif build_flag == "database-ordinary":
+        return "no-ordinary-database"
+    elif build_flag == "debug-build":
+        return "no-debug"
+    elif build_flag == "release-build":
+        return "no-release"
+    elif build_flag == "unbundled-build":
+        return "no-unbundled"
+    else:
+        return "no-" + build_flag
+
+
+def get_tags(test_name, skip_list):
+    tags = []
+    descriptions = {}
+
+    if test_name.endswith('.disabled'):
+        tags.append("disabled")
+
+    if 'deadlock' in test_name:
+        tags.append("deadlock")
+    elif 'race' in test_name:
+        tags.append("race")
+    elif 'long' in test_name:
+        tags.append("long")
+
+    if 'replica' in test_name:
+        tags.append("replica")
+    elif 'zookeeper' in test_name:
+        tags.append("zookeeper")
+
+    if 'distributed' in test_name:
+        tags.append("distributed")
+    elif 'shard' in test_name:
+        tags.append("shard")
+    elif 'global' in test_name:
+        tags.append("global")
+
+    for build_flag, patterns in skip_list.items():
+        for pattern, description in patterns:
+            if pattern in test_name:
+                tag = build_flag_to_tag(build_flag)
+                if not tag in tags:
+                    tags.append(tag)
+                    if description:
+                        descriptions[tag] = description
+
+    return tags, descriptions
+
+
+def load_all_tags(base_dir):
+    def get_comment_sign(filename):
+        if filename.endswith('.sql') or filename.endswith('.sql.j2'):
+            return '--'
+        elif filename.endswith('.sh') or filename.endswith('.py') or filename.endswith('.expect'):
+            return '#'
+        else:
+            raise Exception(f'Unknown file_extension: {filename}')
+
+    def parse_tags_from_line(line, comment_sign):
+        if not line.startswith(comment_sign):
+            return None
+        tags_str = line[len(comment_sign):].lstrip()
+        tags_prefix = "Tags:"
+        if not tags_str.startswith(tags_prefix):
+            return None
+        tags_str = tags_str[len(tags_prefix):]
+        tags = tags_str.split(',')
+        tags = {tag.strip() for tag in tags}
+        return tags
+
+    def is_shebang(line):
+        return line.startswith('#!')
+
+    def load_tags_from_file(filepath):
+        with open(filepath, 'r') as file:
+            try:
+                line = file.readline()
+                if is_shebang(line):
+                    line = file.readline()
+            except UnicodeDecodeError:
+                return []
+        return parse_tags_from_line(line, get_comment_sign(filepath))
+
+    all_tags = {}
+    for suite in os.listdir(base_dir):
+        suite_dir = os.path.join(base_dir, suite)
+        if not os.path.isdir(suite_dir):
+            continue
+        
+        for test_name in os.listdir(suite_dir):
+            test_path = os.path.join(suite_dir, test_name)
+            if not os.path.isfile(test_path) or all(not test_path.endswith(supported_ext) for supported_ext in TEST_FILE_EXTENSIONS):
+                continue
+            tags = load_tags_from_file(test_path)
+            if tags:
+                all_tags[test_path] = tags
+    return all_tags
+
+
+def load_all_tags_timing(base_dir):
+    start_time = time.time()
+    print(type(load_all_tags(base_dir)))
+    print("--- %s seconds ---" % (time.time() - start_time))
+
+
+def main():
+    base_dir = os.path.dirname(__file__)
+    print(f'base_dir={base_dir}')
+
+    #return load_all_tags_timing(base_dir)
+    
+    skip_dict = load_skip_list_json(os.path.join(base_dir, 'skip_list.json'))
+    skip_dict_from_fasttest_run_sh = load_fasttest_run_sh(os.path.join(base_dir, '../../docker/test/fasttest/run.sh'))
+    skip_dict = {**skip_dict, **skip_dict_from_fasttest_run_sh}
+    #print(f'skip_dict={skip_dict}')
+
+    for suite in os.listdir(base_dir):
+        suite_dir = os.path.join(base_dir, suite)
+        if not os.path.isdir(suite_dir):
+            continue
+        
+        for test_name in os.listdir(suite_dir):
+            test_path = os.path.join(suite_dir, test_name)
+            if not os.path.isfile(test_path) or all(not test_path.endswith(supported_ext) for supported_ext in TEST_FILE_EXTENSIONS):
+                continue
+            tags, descriptions = get_tags(test_path, skip_dict)
+            save_tags_to_file(test_path, tags, descriptions)
+
+if __name__ == '__main__':
+    main()

From 39d73c01b225d5b274c11f75d786b6c81a53f1c8 Mon Sep 17 00:00:00 2001
From: Vitaly Baranov <vitbar@yandex-team.ru>
Date: Sun, 12 Sep 2021 15:35:27 +0300
Subject: [PATCH 221/273] Add tags to tests.

---
 .../0_stateless/00004_shard_format_ast_and_remote_table.sql  | 2 ++
 .../00005_shard_format_ast_and_remote_table_lambda.sql       | 2 ++
 .../0_stateless/00019_shard_quantiles_totals_distributed.sql | 2 ++
 .../0_stateless/00026_shard_something_distributed.sql        | 2 ++
 .../0_stateless/00028_shard_big_agg_aj_distributed.sql       | 2 ++
 .../0_stateless/00029_test_zookeeper_optimize_exception.sh   | 1 +
 tests/queries/0_stateless/00059_shard_global_in.sql          | 2 ++
 .../00062_replicated_merge_tree_alter_zookeeper_long.sql     | 3 +++
 .../0_stateless/00065_shard_float_literals_formatting.sql    | 2 ++
 tests/queries/0_stateless/00067_replicate_segfault.sql       | 2 ++
 .../00075_shard_formatting_negate_of_negative_literal.sql    | 2 ++
 .../0_stateless/00080_show_tables_and_system_tables.sql      | 2 ++
 .../0_stateless/00083_create_merge_tree_zookeeper_long.sql   | 4 ++++
 tests/queries/0_stateless/00090_union_race_conditions_1.sh   | 1 +
 tests/queries/0_stateless/00091_union_race_conditions_2.sh   | 1 +
 tests/queries/0_stateless/00092_union_race_conditions_3.sh   | 1 +
 tests/queries/0_stateless/00093_union_race_conditions_4.sh   | 1 +
 tests/queries/0_stateless/00094_union_race_conditions_5.sh   | 1 +
 .../0_stateless/00097_long_storage_buffer_race_condition.sh  | 1 +
 .../00097_long_storage_buffer_race_condition_mt.sh           | 1 +
 tests/queries/0_stateless/00098_shard_i_union_all.sql        | 2 ++
 ...terialized_views_and_insert_without_explicit_database.sql | 2 ++
 tests/queries/0_stateless/00105_shard_collations.sql         | 2 ++
 .../queries/0_stateless/00108_shard_totals_after_having.sql  | 2 ++
 .../queries/0_stateless/00109_shard_totals_after_having.sql  | 2 ++
 tests/queries/0_stateless/00110_external_sort.sql            | 2 ++
 .../0_stateless/00111_shard_external_sort_distributed.sql    | 2 ++
 .../queries/0_stateless/00112_shard_totals_after_having.sql  | 2 ++
 tests/queries/0_stateless/00113_shard_group_array.sql        | 2 ++
 .../queries/0_stateless/00115_shard_in_incomplete_result.sh  | 1 +
 tests/queries/0_stateless/00116_storage_set.sql              | 2 ++
 tests/queries/0_stateless/00121_drop_column_zookeeper.sql    | 3 +++
 ...merged_result_when_max_distributed_connections_is_one.sql | 2 ++
 .../00124_shard_distributed_with_many_replicas.sql           | 2 ++
 .../00133_long_shard_memory_tracker_and_exception_safety.sh  | 1 +
 .../0_stateless/00154_shard_distributed_with_distinct.sql    | 2 ++
 tests/queries/0_stateless/00155_long_merges.sh               | 1 +
 .../0_stateless/00158_buffer_and_nonexistent_table.sql       | 2 ++
 tests/queries/0_stateless/00162_shard_global_join.sql        | 2 ++
 .../0_stateless/00163_shard_join_with_empty_table.sql        | 2 ++
 .../0_stateless/00171_shard_array_of_tuple_remote.sql        | 2 ++
 tests/queries/0_stateless/00178_function_replicate.sql       | 2 ++
 tests/queries/0_stateless/00180_attach_materialized_view.sql | 2 ++
 tests/queries/0_stateless/00183_skip_unavailable_shards.sql  | 2 ++
 .../00184_shard_distributed_group_by_no_merge.sql            | 2 ++
 tests/queries/0_stateless/00186_very_long_arrays.sh          | 1 +
 tests/queries/0_stateless/00189_time_zones_long.sql          | 1 +
 tests/queries/0_stateless/00193_parallel_replicas.sql        | 2 ++
 .../0_stateless/00195_shard_union_all_and_global_in.sql      | 2 ++
 .../00200_shard_distinct_order_by_limit_distributed.sql      | 2 ++
 .../0_stateless/00211_shard_query_formatting_aliases.sql     | 2 ++
 .../0_stateless/00212_long_shard_aggregate_function_uniq.sql | 2 ++
 tests/queries/0_stateless/00213_multiple_global_in.sql       | 2 ++
 .../0_stateless/00215_primary_key_order_zookeeper_long.sql   | 3 +++
 .../00217_shard_global_subquery_columns_with_same_name.sql   | 2 ++
 .../00220_shard_with_totals_in_subquery_remote_and_limit.sql | 2 ++
 .../00223_shard_distributed_aggregation_memory_efficient.sql | 2 ++
 ...istributed_aggregation_memory_efficient_and_overflows.sql | 2 ++
 ...226_zookeeper_deduplication_and_unexpected_parts_long.sql | 3 +++
 .../00228_shard_quantiles_deterministic_merge_overflow.sql   | 2 ++
 .../00236_replicated_drop_on_non_leader_zookeeper_long.sql   | 3 +++
 .../0_stateless/00252_shard_global_in_aggregate_function.sql | 2 ++
 .../00257_shard_no_aggregates_and_constant_keys.sql          | 2 ++
 tests/queries/0_stateless/00259_hashing_tuples.sql           | 2 ++
 tests/queries/0_stateless/00260_like_and_curly_braces.sql    | 2 ++
 .../0_stateless/00266_shard_global_subquery_and_aliases.sql  | 2 ++
 tests/queries/0_stateless/00274_shard_group_array.sql        | 2 ++
 tests/queries/0_stateless/00275_shard_quantiles_weighted.sql | 2 ++
 .../queries/0_stateless/00286_format_long_negative_float.sql | 2 ++
 .../0_stateless/00290_shard_aggregation_memory_efficient.sql | 2 ++
 tests/queries/0_stateless/00293_shard_max_subquery_depth.sql | 2 ++
 tests/queries/0_stateless/00294_shard_enums.sql              | 2 ++
 .../00295_global_in_one_shard_rows_before_limit.sql          | 2 ++
 .../00297_attach_negative_numbers_zookeeper.sql.disabled     | 2 ++
 tests/queries/0_stateless/00302_http_compression.sh          | 1 +
 tests/queries/0_stateless/00305_http_and_readonly.sh         | 1 +
 tests/queries/0_stateless/00311_array_primary_key.sql        | 2 ++
 tests/queries/0_stateless/00324_hashing_enums.sql            | 2 ++
 .../0_stateless/00325_replacing_merge_tree.sql.disabled      | 2 ++
 tests/queries/0_stateless/00326_long_function_multi_if.sql   | 1 +
 tests/queries/0_stateless/00328_long_case_construction.sql   | 2 ++
 .../0_stateless/00332_quantile_timing_memory_leak.sql        | 2 ++
 tests/queries/0_stateless/00336_shard_stack_trace.sh         | 1 +
 tests/queries/0_stateless/00337_shard_any_heavy.sql          | 2 ++
 .../queries/0_stateless/00338_replicate_array_of_strings.sql | 2 ++
 .../00374_json_each_row_input_with_noisy_fields.sh           | 1 +
 .../0_stateless/00375_shard_group_uniq_array_of_string.sql   | 2 ++
 .../00376_shard_group_uniq_array_of_int_array.sql            | 2 ++
 .../00377_shard_group_uniq_array_of_string_array.sql         | 2 ++
 .../queries/0_stateless/00378_json_quote_64bit_integers.sql  | 2 ++
 .../00380_client_break_at_exception_in_batch_mode.sh         | 1 +
 .../00385_storage_file_and_clickhouse-local_app_long.sh      | 2 ++
 tests/queries/0_stateless/00386_long_in_pk.sh                | 1 +
 tests/queries/0_stateless/00387_use_client_time_zone.sh      | 1 +
 tests/queries/0_stateless/00400_client_external_options.sh   | 1 +
 tests/queries/0_stateless/00409_shard_limit_by.sql           | 2 ++
 .../00411_long_accurate_number_comparison_float.sql          | 2 ++
 .../00411_long_accurate_number_comparison_int1.sh            | 1 +
 .../00411_long_accurate_number_comparison_int2.sh            | 1 +
 .../00411_long_accurate_number_comparison_int3.sh            | 1 +
 .../00411_long_accurate_number_comparison_int4.sh            | 1 +
 .../0_stateless/00416_pocopatch_progress_in_http_headers.sh  | 1 +
 tests/queries/0_stateless/00417_kill_query.sh                | 1 +
 .../queries/0_stateless/00423_storage_log_single_thread.sql  | 2 ++
 .../00424_shard_aggregate_functions_of_nullable.sql          | 2 ++
 tests/queries/0_stateless/00429_long_http_bufferization.sh   | 1 +
 tests/queries/0_stateless/00429_point_in_ellipses.sql        | 2 ++
 tests/queries/0_stateless/00436_convert_charset.sql          | 2 ++
 .../00446_clear_column_in_partition_concurrent_zookeeper.sh  | 2 ++
 .../00446_clear_column_in_partition_zookeeper_long.sql       | 2 ++
 .../0_stateless/00448_replicate_nullable_tuple_generic.sql   | 2 ++
 tests/queries/0_stateless/00462_json_true_false_literals.sql | 2 ++
 .../0_stateless/00463_long_sessions_in_http_interface.sh     | 1 +
 .../0_stateless/00473_output_format_json_quote_denormals.sh  | 1 +
 ...special_line_separators_and_characters_outside_of_bmp.sql | 2 ++
 .../00491_shard_distributed_and_aliases_in_where_having.sql  | 2 ++
 .../0_stateless/00494_shard_alias_substitution_bug.sql       | 2 ++
 tests/queries/0_stateless/00499_json_enum_insert.sql         | 2 ++
 .../00502_custom_partitioning_replicated_zookeeper_long.sql  | 2 ++
 tests/queries/0_stateless/00505_secure.sh                    | 1 +
 tests/queries/0_stateless/00505_shard_secure.sh              | 1 +
 tests/queries/0_stateless/00506_shard_global_in_union.sql    | 2 ++
 tests/queries/0_stateless/00506_union_distributed.sql        | 2 ++
 tests/queries/0_stateless/00508_materialized_view_to.sql     | 2 ++
 .../00509_extended_storage_definition_syntax_zookeeper.sql   | 3 +++
 .../00510_materizlized_view_and_deduplication_zookeeper.sql  | 3 +++
 .../00515_shard_desc_table_functions_and_subqueries.sql      | 2 ++
 .../00516_deduplication_after_drop_partition_zookeeper.sql   | 3 +++
 tests/queries/0_stateless/00531_client_ignore_error.sh       | 1 +
 tests/queries/0_stateless/00534_client_ignore_error.sh       | 1 +
 tests/queries/0_stateless/00534_functions_bad_arguments1.sh  | 3 +++
 tests/queries/0_stateless/00534_functions_bad_arguments10.sh | 3 +++
 tests/queries/0_stateless/00534_functions_bad_arguments11.sh | 3 +++
 tests/queries/0_stateless/00534_functions_bad_arguments12.sh | 3 +++
 tests/queries/0_stateless/00534_functions_bad_arguments13.sh | 3 +++
 tests/queries/0_stateless/00534_functions_bad_arguments2.sh  | 3 +++
 tests/queries/0_stateless/00534_functions_bad_arguments3.sh  | 3 +++
 .../0_stateless/00534_functions_bad_arguments4_long.sh       | 3 +++
 tests/queries/0_stateless/00534_functions_bad_arguments5.sh  | 3 +++
 tests/queries/0_stateless/00534_functions_bad_arguments6.sh  | 3 +++
 tests/queries/0_stateless/00534_functions_bad_arguments7.sh  | 3 +++
 tests/queries/0_stateless/00534_functions_bad_arguments8.sh  | 3 +++
 tests/queries/0_stateless/00534_functions_bad_arguments9.sh  | 3 +++
 .../0_stateless/00539_functions_for_working_with_json.sql    | 2 ++
 .../0_stateless/00546_shard_tuple_element_formatting.sql     | 2 ++
 tests/queries/0_stateless/00552_or_nullable.sql              | 2 ++
 .../00563_insert_into_remote_and_zookeeper_long.sql          | 2 ++
 tests/queries/0_stateless/00563_shard_insert_into_remote.sql | 2 ++
 .../0_stateless/00564_versioned_collapsing_merge_tree.sql    | 2 ++
 .../00571_non_exist_database_when_create_materializ_view.sql | 2 ++
 .../0_stateless/00573_shard_aggregation_by_empty_set.sql     | 2 ++
 .../00575_illegal_column_exception_when_drop_depen_column.sh | 1 +
 .../0_stateless/00580_consistent_hashing_functions.sql       | 2 ++
 .../queries/0_stateless/00588_shard_distributed_prewhere.sql | 2 ++
 tests/queries/0_stateless/00594_alias_in_distributed.sql     | 2 ++
 tests/queries/0_stateless/00597_push_down_predicate_long.sql | 2 ++
 .../queries/0_stateless/00599_create_view_with_subquery.sql  | 2 ++
 tests/queries/0_stateless/00600_replace_running_query.sh     | 1 +
 .../00604_shard_remote_and_columns_with_defaults.sql         | 2 ++
 tests/queries/0_stateless/00604_show_create_database.sql     | 2 ++
 .../0_stateless/00609_distributed_with_case_when_then.sql    | 2 ++
 tests/queries/0_stateless/00609_mv_index_in_in.sql           | 2 ++
 tests/queries/0_stateless/00612_http_max_query_size.sh       | 2 ++
 tests/queries/0_stateless/00612_shard_count.sql              | 2 ++
 .../00613_shard_distributed_max_execution_time.sql           | 2 ++
 ...header_for_local_and_remote_node_in_distributed_query.sql | 2 ++
 tests/queries/0_stateless/00619_union_highlite.sql           | 2 ++
 .../00620_optimize_on_nonleader_replica_zookeeper.sql        | 3 +++
 .../00623_replicated_truncate_table_zookeeper_long.sql       | 3 +++
 tests/queries/0_stateless/00623_truncate_table.sql           | 2 ++
 .../0_stateless/00623_truncate_table_throw_exception.sh      | 1 +
 tests/queries/0_stateless/00625_arrays_in_nested.sql         | 2 ++
 .../0_stateless/00626_replace_partition_from_table.sql       | 3 +++
 .../00626_replace_partition_from_table_zookeeper.sh          | 2 ++
 .../00633_materialized_view_and_too_many_parts_zookeeper.sh  | 2 ++
 tests/queries/0_stateless/00634_logging_shard.sh             | 2 ++
 tests/queries/0_stateless/00634_rename_view.sql              | 2 ++
 tests/queries/0_stateless/00635_shard_distinct_order_by.sql  | 2 ++
 tests/queries/0_stateless/00638_remote_ssrf.sh.disabled      | 1 +
 tests/queries/0_stateless/00643_cast_zookeeper_long.sql      | 2 ++
 tests/queries/0_stateless/00646_url_engine.sh                | 2 ++
 .../00651_default_database_on_client_reconnect.sh            | 1 +
 tests/queries/0_stateless/00652_mergetree_mutations.sh       | 1 +
 .../00652_replicated_mutations_default_database_zookeeper.sh | 2 ++
 .../0_stateless/00652_replicated_mutations_zookeeper.sh      | 2 ++
 ...optimize_final_replicated_without_partition_zookeeper.sql | 2 ++
 .../0_stateless/00675_shard_remote_with_table_function.sql   | 2 ++
 tests/queries/0_stateless/00677_shard_any_heavy_merge.sql    | 2 ++
 tests/queries/0_stateless/00678_shard_funnel_window.sql      | 2 ++
 tests/queries/0_stateless/00682_empty_parts_merge.sh         | 1 +
 .../00685_output_format_json_escape_forward_slashes.sql      | 2 ++
 tests/queries/0_stateless/00686_client_exit_code.sh          | 1 +
 .../00688_low_cardinality_dictionary_deserialization.sql     | 2 ++
 .../0_stateless/00688_low_cardinality_serialization.sql      | 2 ++
 .../00693_max_block_size_system_tables_columns.sql           | 2 ++
 tests/queries/0_stateless/00697_in_subquery_shard.sql        | 2 ++
 .../queries/0_stateless/00699_materialized_view_mutations.sh | 2 ++
 tests/queries/0_stateless/00701_rollup.sql                   | 2 ++
 .../00715_fetch_merged_or_mutated_part_zookeeper.sh          | 1 +
 .../queries/0_stateless/00715_json_each_row_input_nested.sh  | 1 +
 tests/queries/0_stateless/00716_allow_ddl.sql                | 2 ++
 .../00717_low_cardinaliry_distributed_group_by.sql           | 2 ++
 tests/queries/0_stateless/00717_merge_and_distributed.sql    | 2 ++
 tests/queries/0_stateless/00719_parallel_ddl_db.sh           | 2 ++
 ..._force_by_identical_result_after_merge_zookeeper_long.sql | 2 ++
 tests/queries/0_stateless/00725_comment_columns_long.sql     | 2 ++
 tests/queries/0_stateless/00725_memory_tracking.sql          | 2 ++
 tests/queries/0_stateless/00725_quantiles_shard.sql          | 2 ++
 tests/queries/0_stateless/00728_json_each_row_parsing.sh     | 2 ++
 .../0_stateless/00731_long_merge_tree_select_opened_files.sh | 2 ++
 tests/queries/0_stateless/00732_base64_functions.sql         | 2 ++
 ..._quorum_insert_have_data_before_quorum_zookeeper_long.sql | 3 +++
 ...quorum_insert_lost_part_and_alive_part_zookeeper_long.sql | 3 +++
 .../00732_quorum_insert_lost_part_zookeeper_long.sql         | 3 +++
 ...elect_with_old_data_and_without_quorum_zookeeper_long.sql | 3 +++
 ...0732_quorum_insert_simple_test_1_parts_zookeeper_long.sql | 3 +++
 ...0732_quorum_insert_simple_test_2_parts_zookeeper_long.sql | 3 +++
 tests/queries/0_stateless/00735_long_conditional.sql         | 2 ++
 tests/queries/0_stateless/00738_lock_for_inner_table.sh      | 2 ++
 tests/queries/0_stateless/00740_database_in_nested_view.sql  | 2 ++
 tests/queries/0_stateless/00741_client_comment_multiline.sql | 2 ++
 tests/queries/0_stateless/00746_hashing_tuples.sql           | 2 ++
 .../0_stateless/00751_default_databasename_for_view.sql      | 2 ++
 tests/queries/0_stateless/00751_hashing_ints.sql             | 2 ++
 tests/queries/0_stateless/00753_alter_attach.sql             | 3 +++
 .../queries/0_stateless/00753_comment_columns_zookeeper.sql  | 2 ++
 .../00753_distributed_system_columns_and_system_tables.sql   | 2 ++
 .../00753_system_columns_and_system_tables_long.sql          | 2 ++
 .../0_stateless/00754_alter_modify_column_partitions.sql     | 2 ++
 ...00754_alter_modify_order_by_replicated_zookeeper_long.sql | 3 +++
 ...0754_distributed_optimize_skip_select_on_unused_shards.sh | 1 +
 ...ed_optimize_skip_select_on_unused_shards_with_prewhere.sh | 1 +
 .../queries/0_stateless/00760_insert_json_with_defaults.sql  | 2 ++
 tests/queries/0_stateless/00763_lock_buffer_long.sh          | 2 ++
 .../00763_long_lock_buffer_alter_destination_table.sh        | 2 ++
 tests/queries/0_stateless/00800_function_java_hash.sql       | 2 ++
 .../0_stateless/00800_low_cardinality_distributed_insert.sql | 2 ++
 tests/queries/0_stateless/00800_versatile_storage_join.sql   | 2 ++
 tests/queries/0_stateless/00803_odbc_driver_2_format.sql     | 2 ++
 tests/queries/0_stateless/00803_xxhash.sql                   | 2 ++
 .../0_stateless/00804_test_alter_compression_codecs.sql      | 2 ++
 .../0_stateless/00804_test_custom_compression_codecs.sql     | 2 ++
 .../00804_test_custom_compression_codes_log_storages.sql     | 2 ++
 .../0_stateless/00804_test_delta_codec_compression.sql       | 2 ++
 .../00814_replicated_minimalistic_part_header_zookeeper.sql  | 2 ++
 tests/queries/0_stateless/00815_left_join_on_stepanel.sql    | 2 ++
 .../0_stateless/00816_long_concurrent_alter_column.sh        | 1 +
 .../0_stateless/00821_distributed_storage_with_join_on.sql   | 2 ++
 tests/queries/0_stateless/00823_capnproto_input.sh           | 1 +
 .../queries/0_stateless/00825_protobuf_format_array_3dim.sh  | 1 +
 .../0_stateless/00825_protobuf_format_array_of_arrays.sh     | 1 +
 .../0_stateless/00825_protobuf_format_enum_mapping.sh        | 1 +
 tests/queries/0_stateless/00825_protobuf_format_map.sh       | 1 +
 .../0_stateless/00825_protobuf_format_nested_in_nested.sh    | 1 +
 .../0_stateless/00825_protobuf_format_nested_optional.sh     | 1 +
 .../0_stateless/00825_protobuf_format_no_length_delimiter.sh | 1 +
 tests/queries/0_stateless/00825_protobuf_format_persons.sh   | 1 +
 .../0_stateless/00825_protobuf_format_splitted_nested.sh     | 1 +
 tests/queries/0_stateless/00825_protobuf_format_squares.sh   | 1 +
 .../0_stateless/00825_protobuf_format_table_default.sh       | 1 +
 .../00834_cancel_http_readonly_queries_on_client_close.sh    | 1 +
 ...34_dont_allow_to_set_two_configuration_files_in_client.sh | 1 +
 tests/queries/0_stateless/00834_kill_mutation.sh             | 1 +
 .../0_stateless/00834_kill_mutation_replicated_zookeeper.sh  | 1 +
 .../00836_indices_alter_replicated_zookeeper_long.sql        | 2 ++
 .../00837_minmax_index_replicated_zookeeper_long.sql         | 2 ++
 .../0_stateless/00838_system_tables_drop_table_race.sh       | 1 +
 .../00840_long_concurrent_select_and_drop_deadlock.sh        | 1 +
 tests/queries/0_stateless/00850_global_join_dups.sql         | 2 ++
 tests/queries/0_stateless/00851_http_insert_json_defaults.sh | 1 +
 .../0_stateless/00857_global_joinsavel_table_alias.sql       | 2 ++
 .../0_stateless/00877_memory_limit_for_new_delete.sql        | 3 +++
 tests/queries/0_stateless/00899_long_attach_memory_limit.sql | 2 ++
 tests/queries/0_stateless/00900_entropy_shard.sql            | 2 ++
 tests/queries/0_stateless/00900_long_parquet.sh              | 1 +
 tests/queries/0_stateless/00900_long_parquet_decimal.sh      | 1 +
 tests/queries/0_stateless/00900_long_parquet_load.sh         | 1 +
 tests/queries/0_stateless/00900_null_array_orc_load.sh       | 1 +
 tests/queries/0_stateless/00900_orc_arrays_load.sh           | 1 +
 tests/queries/0_stateless/00900_orc_arrow_parquet_maps.sh    | 1 +
 tests/queries/0_stateless/00900_orc_arrow_parquet_nested.sh  | 1 +
 tests/queries/0_stateless/00900_orc_arrow_parquet_tuples.sh  | 1 +
 tests/queries/0_stateless/00900_orc_load.sh                  | 1 +
 tests/queries/0_stateless/00900_orc_nested_arrays_load.sh    | 1 +
 tests/queries/0_stateless/00900_orc_nullable_arrays_load.sh  | 1 +
 tests/queries/0_stateless/00908_bloom_filter_index.sh        | 2 ++
 tests/queries/0_stateless/00908_long_http_insert.sh          | 2 ++
 tests/queries/0_stateless/00910_buffer_prewhere.sql          | 2 ++
 .../0_stateless/00910_client_window_size_detection.sh        | 1 +
 .../00910_crash_when_distributed_modify_order_by.sql         | 2 ++
 ...0_zookeeper_custom_compression_codecs_replicated_long.sql | 2 ++
 .../00910_zookeeper_test_alter_compression_codecs_long.sql   | 2 ++
 tests/queries/0_stateless/00911_tautological_compare.sql     | 2 ++
 tests/queries/0_stateless/00914_replicate.sql                | 2 ++
 tests/queries/0_stateless/00918_json_functions.sql           | 2 ++
 .../0_stateless/00921_datetime64_compatibility_long.sh       | 1 +
 ...eeper_empty_replicated_merge_tree_optimize_final_long.sql | 3 +++
 .../00926_adaptive_index_granularity_merge_tree.sql          | 2 ++
 .../0_stateless/00926_adaptive_index_granularity_pk.sql      | 2 ++
 ...00926_adaptive_index_granularity_replacing_merge_tree.sql | 2 ++
 tests/queries/0_stateless/00926_geo_to_h3.sql                | 2 ++
 tests/queries/0_stateless/00926_multimatch.sql               | 3 +++
 ...adaptive_index_granularity_replicated_merge_tree_long.sql | 2 ++
 tests/queries/0_stateless/00927_asof_join_long.sql           | 2 ++
 tests/queries/0_stateless/00927_disable_hyperscan.sql        | 2 ++
 .../queries/0_stateless/00929_multi_match_edit_distance.sql  | 3 +++
 tests/queries/0_stateless/00933_alter_ttl.sql                | 2 ++
 tests/queries/0_stateless/00933_reserved_word.sql            | 2 ++
 .../00933_test_fix_extra_seek_on_compressed_cache.sh         | 1 +
 .../0_stateless/00933_ttl_replicated_zookeeper_long.sql      | 2 ++
 tests/queries/0_stateless/00933_ttl_with_default.sql         | 2 ++
 tests/queries/0_stateless/00938_fix_rwlock_segfault_long.sh  | 1 +
 .../0_stateless/00941_system_columns_race_condition.sh       | 1 +
 tests/queries/0_stateless/00950_dict_get.sql                 | 2 ++
 ...0952_insert_into_distributed_with_materialized_column.sql | 2 ++
 .../0_stateless/00953_zookeeper_suetin_deduplication_bug.sh  | 2 ++
 .../queries/0_stateless/00954_client_prepared_statements.sh  | 1 +
 tests/queries/0_stateless/00955_test_final_mark.sql          | 3 +++
 tests/queries/0_stateless/00955_test_final_mark_use.sh       | 2 ++
 .../queries/0_stateless/00960_live_view_watch_events_live.py | 2 ++
 .../queries/0_stateless/00961_temporary_live_view_watch.sql  | 2 ++
 .../queries/0_stateless/00962_live_view_periodic_refresh.py  | 2 ++
 .../00962_live_view_periodic_refresh_and_timeout.py          | 2 ++
 .../00962_live_view_periodic_refresh_dictionary.py           | 2 ++
 .../0_stateless/00962_temporary_live_view_watch_live.py      | 2 ++
 .../00963_temporary_live_view_watch_live_timeout.py.disabled | 2 ++
 .../0_stateless/00964_live_view_watch_events_heartbeat.py    | 2 ++
 tests/queries/0_stateless/00965_live_view_watch_heartbeat.py | 2 ++
 .../0_stateless/00965_shard_unresolvable_addresses.sql       | 2 ++
 .../0_stateless/00966_invalid_json_must_not_parse.sql        | 2 ++
 .../queries/0_stateless/00966_live_view_watch_events_http.py | 2 ++
 .../00967_insert_into_distributed_different_types.sql        | 2 ++
 tests/queries/0_stateless/00967_live_view_watch_http.py      | 2 ++
 ...00968_live_view_select_format_jsoneachrowwithprogress.sql | 2 ++
 .../00969_live_view_watch_format_jsoneachrowwithprogress.sql | 2 ++
 .../00970_live_view_watch_events_http_heartbeat.py           | 2 ++
 .../0_stateless/00971_live_view_watch_http_heartbeat.py      | 2 ++
 tests/queries/0_stateless/00972_live_view_select_1.sql       | 2 ++
 tests/queries/0_stateless/00973_live_view_select.sql         | 2 ++
 .../queries/0_stateless/00973_live_view_select_prewhere.sql  | 2 ++
 .../0_stateless/00973_live_view_with_subquery_select.sql     | 2 ++
 .../00973_live_view_with_subquery_select_join.sql            | 2 ++
 .../00973_live_view_with_subquery_select_join_no_alias.sql   | 2 ++
 .../00973_live_view_with_subquery_select_nested.sql          | 2 ++
 ...ive_view_with_subquery_select_nested_with_aggregation.sql | 2 ++
 ...h_subquery_select_nested_with_aggregation_table_alias.sql | 2 ++
 .../00973_live_view_with_subquery_select_table_alias.sql     | 2 ++
 ...00973_live_view_with_subquery_select_with_aggregation.sql | 2 ++
 ...iew_with_subquery_select_with_aggregation_in_subquery.sql | 2 ++
 tests/queries/0_stateless/00974_distributed_join_on.sql      | 2 ++
 .../0_stateless/00974_live_view_select_with_aggregation.sql  | 2 ++
 tests/queries/0_stateless/00974_query_profiler.sql           | 3 +++
 .../00975_indices_mutation_replicated_zookeeper_long.sh      | 1 +
 tests/queries/0_stateless/00975_json_hang.sql                | 2 ++
 tests/queries/0_stateless/00975_live_view_create.sql         | 2 ++
 .../0_stateless/00975_sample_prewhere_distributed.sql        | 2 ++
 tests/queries/0_stateless/00976_live_view_select_version.sql | 2 ++
 .../0_stateless/00976_shard_low_cardinality_achimbab.sql     | 2 ++
 tests/queries/0_stateless/00976_ttl_with_old_parts.sql       | 2 ++
 tests/queries/0_stateless/00977_live_view_watch_events.sql   | 2 ++
 tests/queries/0_stateless/00978_live_view_watch.sql          | 2 ++
 .../00979_live_view_watch_continuous_aggregates.py           | 2 ++
 tests/queries/0_stateless/00979_live_view_watch_live.py      | 2 ++
 .../00979_live_view_watch_live_moving_avg.py.disabled        | 2 ++
 .../0_stateless/00979_live_view_watch_live_with_subquery.py  | 2 ++
 tests/queries/0_stateless/00980_alter_settings_race.sh       | 1 +
 .../queries/0_stateless/00980_create_temporary_live_view.sql | 2 ++
 tests/queries/0_stateless/00980_merge_alter_settings.sql     | 3 +++
 .../00980_shard_aggregation_state_deserialization.sql        | 2 ++
 .../00980_skip_unused_shards_without_sharding_key.sql        | 2 ++
 .../00980_zookeeper_merge_tree_alter_settings.sql            | 3 +++
 tests/queries/0_stateless/00981_topK_topKWeighted_long.sql   | 2 ++
 .../queries/0_stateless/00987_distributed_stack_overflow.sql | 2 ++
 .../00988_constraints_replication_zookeeper_long.sql         | 2 ++
 tests/queries/0_stateless/00989_parallel_parts_loading.sql   | 2 ++
 .../0_stateless/00991_live_view_watch_event_live.sh.disabled | 1 +
 .../0_stateless/00991_live_view_watch_http.sh.disabled       | 1 +
 .../0_stateless/00991_system_parts_race_condition_long.sh    | 1 +
 ...91_temporary_live_view_watch_events_heartbeat.sh.disabled | 1 +
 .../00991_temporary_live_view_watch_live.sh.disabled         | 1 +
 .../00992_system_parts_race_condition_zookeeper_long.sh      | 1 +
 .../00993_system_parts_race_condition_drop_zookeeper.sh      | 1 +
 .../0_stateless/01000_unneeded_substitutions_client.sh       | 1 +
 .../queries/0_stateless/01001_rename_merge_race_condition.sh | 1 +
 .../01002_alter_nullable_adaptive_granularity_long.sh        | 1 +
 tests/queries/0_stateless/01003_kill_query_race_condition.sh | 1 +
 tests/queries/0_stateless/01004_rename_deadlock.sh           | 1 +
 tests/queries/0_stateless/01005_rwr_shard_deadlock.sh        | 1 +
 tests/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.sh      | 1 +
 tests/queries/0_stateless/01009_global_array_join_names.sql  | 2 ++
 .../0_stateless/01010_pmj_right_table_memory_limits.sql      | 2 ++
 .../0_stateless/01012_serialize_array_memory_usage.sql       | 2 ++
 tests/queries/0_stateless/01012_show_tables_limit.sql        | 2 ++
 .../0_stateless/01013_sync_replica_timeout_zookeeper.sh      | 1 +
 tests/queries/0_stateless/01014_lazy_database_basic.sh       | 1 +
 ..._database_concurrent_recreate_reattach_and_show_tables.sh | 1 +
 tests/queries/0_stateless/01015_attach_part.sql              | 3 +++
 tests/queries/0_stateless/01015_database_bad_tables.sql      | 2 ++
 ...17_mutations_with_nondeterministic_functions_zookeeper.sh | 1 +
 .../queries/0_stateless/01017_uniqCombined_memory_usage.sql  | 5 +++++
 tests/queries/0_stateless/01018_Distributed__shard_num.sql   | 2 ++
 .../0_stateless/01018_ddl_dictionaries_bad_queries.sh        | 2 ++
 .../01018_ddl_dictionaries_concurrent_requrests.sh           | 1 +
 tests/queries/0_stateless/01018_ddl_dictionaries_create.sql  | 2 ++
 tests/queries/0_stateless/01018_ddl_dictionaries_select.sql  | 2 ++
 tests/queries/0_stateless/01018_ddl_dictionaries_special.sql | 2 ++
 .../0_stateless/01018_dictionaries_from_dictionaries.sql     | 2 ++
 tests/queries/0_stateless/01018_ip_dictionary_long.sql       | 2 ++
 .../0_stateless/01019_Buffer_and_max_memory_usage.sql        | 2 ++
 tests/queries/0_stateless/01021_only_tuple_columns.sql       | 3 +++
 .../0_stateless/01023_materialized_view_query_context.sql    | 2 ++
 tests/queries/0_stateless/01030_storage_hdfs_syntax.sql      | 2 ++
 .../0_stateless/01031_mutations_interpreter_and_context.sh   | 1 +
 tests/queries/0_stateless/01033_dictionaries_lifetime.sql    | 2 ++
 .../01033_storage_odbc_parsing_exception_check.sql           | 2 ++
 .../0_stateless/01034_move_partition_from_table_zookeeper.sh | 1 +
 .../01034_prewhere_max_parallel_replicas_distributed.sql     | 2 ++
 tests/queries/0_stateless/01034_sample_final_distributed.sql | 2 ++
 tests/queries/0_stateless/01035_avg_weighted_long.sh         | 1 +
 .../01035_concurrent_move_partition_from_table_zookeeper.sh  | 1 +
 .../01036_no_superfluous_dict_reload_on_create_database.sql  | 2 ++
 ...01036_no_superfluous_dict_reload_on_create_database_2.sql | 2 ++
 .../0_stateless/01037_polygon_dicts_correctness_all.sh       | 1 +
 .../0_stateless/01037_polygon_dicts_correctness_fast.sh      | 1 +
 .../0_stateless/01037_polygon_dicts_simple_functions.sh      | 1 +
 .../0_stateless/01037_zookeeper_check_table_empty_pk.sql     | 2 ++
 .../0_stateless/01038_dictionary_lifetime_min_zero_sec.sh    | 1 +
 .../01040_dictionary_invalidate_query_switchover_long.sh     | 1 +
 .../01040_distributed_directory_monitor_batch_inserts.sql    | 2 ++
 tests/queries/0_stateless/01040_h3_get_resolution.sql        | 2 ++
 .../0_stateless/01041_create_dictionary_if_not_exists.sql    | 2 ++
 tests/queries/0_stateless/01041_h3_is_valid.sql              | 2 ++
 tests/queries/0_stateless/01042_h3_k_ring.sql                | 2 ++
 .../01042_system_reload_dictionary_reloads_completely.sh     | 1 +
 .../01043_dictionary_attribute_properties_values.sql         | 2 ++
 tests/queries/0_stateless/01043_h3_edge_length_m.sql         | 2 ++
 tests/queries/0_stateless/01044_h3_edge_angle.sql            | 2 ++
 .../queries/0_stateless/01045_dictionaries_restrictions.sql  | 2 ++
 .../01045_zookeeper_system_mutations_with_parts_names.sh     | 1 +
 .../01046_materialized_view_with_join_over_distributed.sql   | 2 ++
 .../0_stateless/01046_trivial_count_query_distributed.sql    | 2 ++
 tests/queries/0_stateless/01048_exists_query.sql             | 2 ++
 .../queries/0_stateless/01049_join_low_card_bug_long.sql.j2  | 2 ++
 .../01049_zookeeper_synchronous_mutations_long.sql           | 2 ++
 tests/queries/0_stateless/01051_system_stack_trace.sql       | 2 ++
 tests/queries/0_stateless/01053_drop_database_mat_view.sql   | 2 ++
 tests/queries/0_stateless/01053_ssd_dictionary.sh            | 2 ++
 .../0_stateless/01054_cache_dictionary_bunch_update.sh       | 1 +
 .../0_stateless/01054_cache_dictionary_overflow_cell.sql     | 1 +
 tests/queries/0_stateless/01055_compact_parts_1.sql          | 2 ++
 tests/queries/0_stateless/01056_create_table_as.sql          | 2 ++
 .../0_stateless/01057_http_compression_prefer_brotli.sh      | 1 +
 tests/queries/0_stateless/01059_storage_file_compression.sh  | 2 ++
 tests/queries/0_stateless/01060_avro.sh                      | 1 +
 .../0_stateless/01060_shutdown_table_after_detach.sql        | 3 +++
 .../0_stateless/01062_alter_on_mutataion_zookeeper_long.sql  | 3 +++
 tests/queries/0_stateless/01069_database_memory.sql          | 2 ++
 tests/queries/0_stateless/01070_h3_get_base_cell.sql         | 2 ++
 tests/queries/0_stateless/01070_h3_hex_area_m2.sql           | 2 ++
 tests/queries/0_stateless/01070_h3_indexes_are_neighbors.sql | 2 ++
 tests/queries/0_stateless/01070_h3_to_children.sql           | 2 ++
 tests/queries/0_stateless/01070_h3_to_parent.sql             | 2 ++
 tests/queries/0_stateless/01070_h3_to_string.sql             | 2 ++
 tests/queries/0_stateless/01070_materialize_ttl.sql          | 2 ++
 tests/queries/0_stateless/01070_modify_ttl.sql               | 2 ++
 tests/queries/0_stateless/01070_modify_ttl_recalc_only.sql   | 2 ++
 .../0_stateless/01070_mutations_with_dependencies.sql        | 2 ++
 tests/queries/0_stateless/01070_string_to_h3.sql             | 2 ++
 .../0_stateless/01071_force_optimize_skip_unused_shards.sql  | 2 ++
 .../0_stateless/01071_live_view_detach_dependency.sql        | 2 ++
 ...rohibition_secondary_index_with_old_format_merge_tree.sql | 2 ++
 .../01072_json_each_row_data_in_square_brackets.sql          | 2 ++
 .../01072_optimize_skip_unused_shards_const_expr_eval.sql    | 2 ++
 tests/queries/0_stateless/01073_attach_if_not_exists.sql     | 2 ++
 tests/queries/0_stateless/01073_show_tables_not_like.sql     | 2 ++
 tests/queries/0_stateless/01074_h3_range_check.sql           | 2 ++
 tests/queries/0_stateless/01075_allowed_client_hosts.sql     | 2 ++
 .../01076_cache_dictionary_datarace_exception_ptr.sh         | 1 +
 tests/queries/0_stateless/01076_json_each_row_array.sh       | 1 +
 .../0_stateless/01076_parallel_alter_replicated_zookeeper.sh | 1 +
 .../0_stateless/01079_alter_default_zookeeper_long.sql       | 2 ++
 tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh | 1 +
 .../01079_parallel_alter_add_drop_column_zookeeper.sh        | 1 +
 .../01079_parallel_alter_detach_table_zookeeper.sh           | 1 +
 .../01079_parallel_alter_modify_zookeeper_long.sh            | 1 +
 ...01080_check_for_error_incorrect_size_of_nested_column.sql | 2 ++
 .../0_stateless/01083_expressions_in_engine_arguments.sql    | 2 ++
 tests/queries/0_stateless/01084_regexp_empty.sql             | 2 ++
 .../queries/0_stateless/01085_max_distributed_connections.sh | 1 +
 .../0_stateless/01085_max_distributed_connections_http.sh    | 1 +
 tests/queries/0_stateless/01085_simdjson_uint64.sql          | 2 ++
 tests/queries/0_stateless/01086_odbc_roundtrip.sh            | 2 ++
 .../01090_zookeeper_mutations_and_insert_quorum_long.sql     | 3 +++
 tests/queries/0_stateless/01091_insert_with_default_json.sql | 2 ++
 .../0_stateless/01091_query_profiler_does_not_hang.sql       | 2 ++
 tests/queries/0_stateless/01092_base64.sql                   | 2 ++
 tests/queries/0_stateless/01092_memory_profiler.sql          | 2 ++
 tests/queries/0_stateless/01098_msgpack_format.sh            | 1 +
 .../0_stateless/01098_temporary_and_external_tables.sh       | 1 +
 .../0_stateless/01099_parallel_distributed_insert_select.sql | 2 ++
 tests/queries/0_stateless/01102_distributed_local_in_bug.sql | 2 ++
 .../0_stateless/01103_check_cpu_instructions_at_startup.sh   | 2 ++
 .../01103_distributed_product_mode_local_column_renames.sql  | 2 ++
 .../0_stateless/01103_optimize_drop_race_zookeeper.sh        | 1 +
 tests/queries/0_stateless/01104_distributed_numbers_test.sql | 2 ++
 tests/queries/0_stateless/01104_distributed_one_test.sql     | 2 ++
 tests/queries/0_stateless/01107_atomic_db_detach_attach.sh   | 1 +
 .../01108_restart_replicas_rename_deadlock_zookeeper.sh      | 1 +
 tests/queries/0_stateless/01109_exchange_tables.sql          | 2 ++
 .../01110_dictionary_layout_without_arguments.sql            | 2 ++
 .../0_stateless/01113_local_dictionary_type_conversion.sql   | 2 ++
 tests/queries/0_stateless/01114_database_atomic.sh           | 1 +
 .../0_stateless/01114_mysql_database_engine_segfault.sql     | 2 ++
 tests/queries/0_stateless/01115_join_with_dictionary.sql     | 2 ++
 .../queries/0_stateless/01125_dict_ddl_cannot_add_column.sql | 2 ++
 .../01127_month_partitioning_consistency_select.sql          | 2 ++
 .../queries/0_stateless/01130_in_memory_parts_partitons.sql  | 3 +++
 .../0_stateless/01135_default_and_alter_zookeeper.sql        | 2 ++
 .../0_stateless/01138_join_on_distributed_and_tmp.sql        | 2 ++
 .../0_stateless/01148_zookeeper_path_macros_unfolding.sql    | 2 ++
 ...1149_zookeeper_mutation_stuck_after_replace_partition.sql | 2 ++
 tests/queries/0_stateless/01150_ddl_guard_rwr.sh             | 1 +
 tests/queries/0_stateless/01152_cross_replication.sql        | 2 ++
 tests/queries/0_stateless/01153_attach_mv_uuid.sql           | 2 ++
 tests/queries/0_stateless/01154_move_partition_long.sh       | 1 +
 .../0_stateless/01155_rename_move_materialized_view.sql      | 2 ++
 tests/queries/0_stateless/01157_replace_table.sql            | 2 ++
 tests/queries/0_stateless/01158_zookeeper_log_long.sql       | 3 +++
 .../0_stateless/01175_distributed_ddl_output_mode_long.sh    | 3 +++
 .../0_stateless/01176_mysql_client_interactive.expect        | 2 ++
 tests/queries/0_stateless/01180_client_syntax_errors.expect  | 1 +
 .../queries/0_stateless/01181_db_atomic_drop_on_cluster.sql  | 3 +++
 .../0_stateless/01184_long_insert_values_huge_strings.sh     | 1 +
 tests/queries/0_stateless/01185_create_or_replace_table.sql  | 2 ++
 tests/queries/0_stateless/01188_attach_table_from_path.sql   | 2 ++
 tests/queries/0_stateless/01190_full_attach_syntax.sql       | 2 ++
 tests/queries/0_stateless/01191_rename_dictionary.sql        | 2 ++
 tests/queries/0_stateless/01192_rename_database_zookeeper.sh | 1 +
 tests/queries/0_stateless/01193_metadata_loading.sh          | 1 +
 tests/queries/0_stateless/01198_client_quota_key.sh          | 1 +
 .../0_stateless/01200_mutations_memory_consumption.sql       | 2 ++
 ...01_drop_column_compact_part_replicated_zookeeper_long.sql | 2 ++
 .../01211_optimize_skip_unused_shards_type_mismatch.sql      | 2 ++
 .../0_stateless/01213_alter_rename_column_zookeeper_long.sh  | 1 +
 .../01213_alter_rename_primary_key_zookeeper_long.sql        | 2 ++
 .../01213_alter_rename_with_default_zookeeper_long.sql       | 2 ++
 .../01213_optimize_skip_unused_shards_DISTINCT.sql           | 2 ++
 .../queries/0_stateless/01224_no_superfluous_dict_reload.sql | 2 ++
 tests/queries/0_stateless/01225_drop_dictionary_as_table.sql | 2 ++
 .../0_stateless/01225_show_create_table_from_dictionary.sql  | 2 ++
 tests/queries/0_stateless/01226_dist_on_dist_global_in.sql   | 2 ++
 .../0_stateless/01227_distributed_global_in_issue_2610.sql   | 2 ++
 ...1_distributed_aggregation_memory_efficient_mix_levels.sql | 2 ++
 tests/queries/0_stateless/01232_extremes.sql                 | 2 ++
 tests/queries/0_stateless/01232_json_as_string_format.sh     | 1 +
 .../0_stateless/01232_preparing_sets_race_condition_long.sh  | 1 +
 .../queries/0_stateless/01235_live_view_over_distributed.sql | 2 ++
 .../01236_distributed_over_live_view_over_distributed.sql    | 2 ++
 ...iew_over_distributed_with_subquery_select_table_alias.sql | 2 ++
 tests/queries/0_stateless/01238_http_memory_tracking.sh      | 2 ++
 .../01244_optimize_distributed_group_by_sharding_key.sql     | 2 ++
 ...istributed_group_by_no_merge_with-extremes_and_totals.sql | 2 ++
 .../queries/0_stateless/01246_finalize_aggregation_race.sql  | 2 ++
 .../queries/0_stateless/01246_insert_into_watch_live_view.py | 2 ++
 ...timize_distributed_group_by_sharding_key_dist_on_dist.sql | 2 ++
 .../0_stateless/01249_bad_arguments_for_bloom_filter.sql     | 2 ++
 tests/queries/0_stateless/01251_dict_is_in_infinite_loop.sql | 2 ++
 tests/queries/0_stateless/01254_dict_create_without_db.sql   | 2 ++
 .../0_stateless/01254_dict_load_after_detach_attach.sql      | 2 ++
 .../queries/0_stateless/01257_dictionary_mismatch_types.sql  | 2 ++
 .../0_stateless/01259_combinator_distinct_distributed.sql    | 2 ++
 .../0_stateless/01259_dictionary_custom_settings_ddl.sql     | 2 ++
 .../01267_alter_default_key_columns_zookeeper_long.sql       | 2 ++
 tests/queries/0_stateless/01268_dictionary_direct_layout.sql | 2 ++
 tests/queries/0_stateless/01268_shard_avgweighted.sql        | 2 ++
 tests/queries/0_stateless/01269_alias_type_differs.sql       | 2 ++
 tests/queries/0_stateless/01269_create_with_null.sql         | 2 ++
 .../01270_optimize_skip_unused_shards_low_cardinality.sql    | 2 ++
 ...1271_optimize_arithmetic_operations_in_aggr_func_long.sql | 2 ++
 tests/queries/0_stateless/01272_suspicious_codecs.sql        | 2 ++
 tests/queries/0_stateless/01273_arrow.sh                     | 1 +
 tests/queries/0_stateless/01273_arrow_arrays_load.sh         | 1 +
 tests/queries/0_stateless/01273_arrow_decimal.sh             | 1 +
 tests/queries/0_stateless/01273_arrow_dictionaries_load.sh   | 1 +
 tests/queries/0_stateless/01273_arrow_load.sh                | 1 +
 tests/queries/0_stateless/01273_arrow_nested_arrays_load.sh  | 1 +
 .../queries/0_stateless/01273_arrow_nullable_arrays_load.sh  | 1 +
 tests/queries/0_stateless/01273_arrow_stream.sh              | 1 +
 tests/queries/0_stateless/01273_h3EdgeAngle_range_check.sql  | 2 ++
 .../0_stateless/01274_alter_rename_column_distributed.sql    | 2 ++
 .../01277_alter_rename_column_constraint_zookeeper_long.sql  | 2 ++
 .../queries/0_stateless/01280_ssd_complex_key_dictionary.sh  | 1 +
 tests/queries/0_stateless/01280_ttl_where_group_by.sh        | 1 +
 .../0_stateless/01280_ttl_where_group_by_negative.sql        | 2 ++
 .../0_stateless/01281_group_by_limit_memory_tracking.sh      | 2 ++
 .../01281_unsucceeded_insert_select_queries_counter.sql      | 2 ++
 .../0_stateless/01284_escape_sequences_php_mysql_style.sql   | 2 ++
 .../0_stateless/01288_shard_max_network_bandwidth.sql        | 2 ++
 .../0_stateless/01290_max_execution_speed_distributed.sql    | 2 ++
 .../01291_distributed_low_cardinality_memory_efficient.sql   | 2 ++
 tests/queries/0_stateless/01292_create_user.sql              | 2 ++
 .../01293_client_interactive_vertical_multiline.expect       | 1 +
 .../01293_client_interactive_vertical_singleline.expect      | 1 +
 .../queries/0_stateless/01293_system_distribution_queue.sql  | 2 ++
 ...base_concurrent_recreate_reattach_and_show_tables_long.sh | 1 +
 .../0_stateless/01294_system_distributed_on_cluster.sql      | 2 ++
 .../01296_create_row_policy_in_current_database.sql          | 2 ++
 tests/queries/0_stateless/01297_alter_distributed.sql        | 2 ++
 tests/queries/0_stateless/01297_create_quota.sql             | 2 ++
 .../01300_client_save_history_when_terminated_long.expect    | 1 +
 .../01301_aggregate_state_exception_memory_leak.sh           | 1 +
 .../01302_aggregate_state_exception_memory_leak.sh           | 1 +
 tests/queries/0_stateless/01304_direct_io_long.sh            | 1 +
 .../0_stateless/01305_replica_create_drop_zookeeper.sh       | 1 +
 tests/queries/0_stateless/01306_benchmark_json.sh            | 1 +
 ..._order_by_and_distinct_optimize_for_distributed_table.sql | 2 ++
 .../queries/0_stateless/01307_multiple_leaders_zookeeper.sh  | 1 +
 tests/queries/0_stateless/01307_orc_output_format.sh         | 1 +
 tests/queries/0_stateless/01308_orc_output_format_arrays.sh  | 1 +
 tests/queries/0_stateless/01318_decrypt.sql                  | 3 +++
 tests/queries/0_stateless/01318_encrypt.sql                  | 3 +++
 .../01318_long_unsuccessful_mutation_zookeeper.sh            | 1 +
 .../0_stateless/01319_manual_write_to_replicas_long.sql      | 2 ++
 .../01319_optimize_skip_unused_shards_nesting.sql            | 2 ++
 .../01320_create_sync_race_condition_zookeeper.sh            | 1 +
 ...1320_optimize_skip_unused_shards_no_non_deterministic.sql | 2 ++
 tests/queries/0_stateless/01337_mysql_global_variables.sql   | 2 ++
 tests/queries/0_stateless/01338_long_select_and_alter.sh     | 1 +
 .../0_stateless/01338_long_select_and_alter_zookeeper.sh     | 1 +
 tests/queries/0_stateless/01338_sha256_fixedstring.sql       | 2 ++
 .../queries/0_stateless/01339_client_unrecognized_option.sh  | 1 +
 ...46_alter_enum_partition_key_replicated_zookeeper_long.sql | 2 ++
 .../0_stateless/01354_order_by_tuple_collate_const.sql       | 2 ++
 tests/queries/0_stateless/01355_alter_column_with_order.sql  | 2 ++
 tests/queries/0_stateless/01355_ilike.sql                    | 2 ++
 .../01357_version_collapsing_attach_detach_zookeeper.sql     | 2 ++
 tests/queries/0_stateless/01358_lc_parquet.sh                | 1 +
 .../01360_materialized_view_with_join_on_query_log.sql       | 2 ++
 .../01370_client_autocomplete_word_break_characters.expect   | 1 +
 tests/queries/0_stateless/01375_compact_parts_codecs.sql     | 2 ++
 .../01376_GROUP_BY_injective_elimination_dictGet.sql         | 2 ++
 .../0_stateless/01378_alter_rename_with_ttl_zookeeper.sql    | 2 ++
 .../0_stateless/01383_remote_ambiguous_column_shard.sql      | 2 ++
 tests/queries/0_stateless/01388_clear_all_columns.sql        | 2 ++
 tests/queries/0_stateless/01391_join_on_dict_crash.sql       | 2 ++
 tests/queries/0_stateless/01392_column_resolve.sql           | 2 ++
 tests/queries/0_stateless/01393_benchmark_secure_port.sh     | 1 +
 .../01396_inactive_replica_cleanup_nodes_zookeeper.sh        | 1 +
 tests/queries/0_stateless/01411_bayesian_ab_testing.sql      | 2 ++
 tests/queries/0_stateless/01412_cache_dictionary_race.sh     | 1 +
 tests/queries/0_stateless/01412_group_array_moving_shard.sql | 2 ++
 .../0_stateless/01414_mutations_and_errors_zookeeper.sh      | 1 +
 .../0_stateless/01415_inconsistent_merge_tree_settings.sql   | 2 ++
 tests/queries/0_stateless/01415_sticking_mutations.sh        | 1 +
 tests/queries/0_stateless/01417_freeze_partition_verbose.sh  | 2 ++
 .../0_stateless/01417_freeze_partition_verbose_zookeeper.sh  | 2 ++
 tests/queries/0_stateless/01428_h3_range_check.sql           | 2 ++
 tests/queries/0_stateless/01429_empty_arrow_and_parquet.sh   | 1 +
 .../0_stateless/01430_modify_sample_by_zookeeper_long.sql    | 2 ++
 tests/queries/0_stateless/01442_h3kring_range_check.sql      | 2 ++
 tests/queries/0_stateless/01442_merge_detach_attach_long.sh  | 1 +
 tests/queries/0_stateless/01443_merge_truncate_long.sh       | 1 +
 .../0_stateless/01444_create_table_drop_database_race.sh     | 1 +
 tests/queries/0_stateless/01446_json_strings_each_row.sh     | 1 +
 tests/queries/0_stateless/01447_json_strings.sql             | 2 ++
 .../0_stateless/01448_json_compact_strings_each_row.sql      | 2 ++
 tests/queries/0_stateless/01449_json_compact_strings.sql     | 2 ++
 tests/queries/0_stateless/01451_detach_drop_part.sql         | 3 +++
 .../01451_replicated_detach_drop_and_quorum_long.sql         | 2 ++
 .../0_stateless/01451_replicated_detach_drop_part_long.sql   | 3 +++
 tests/queries/0_stateless/01451_wrong_error_long_query.sh    | 1 +
 .../0_stateless/01454_storagememory_data_race_challenge.sh   | 1 +
 tests/queries/0_stateless/01455_opentelemetry_distributed.sh | 2 ++
 .../queries/0_stateless/01455_rank_correlation_spearman.sql  | 2 ++
 .../0_stateless/01455_shard_leaf_max_rows_bytes_to_read.sql  | 2 ++
 tests/queries/0_stateless/01455_time_zones.sql               | 2 ++
 .../0_stateless/01456_ast_optimizations_over_distributed.sql | 2 ++
 .../01456_modify_column_type_via_add_drop_update.sql         | 2 ++
 .../0_stateless/01457_create_as_table_function_structure.sql | 2 ++
 tests/queries/0_stateless/01457_int256_hashing.sql           | 2 ++
 tests/queries/0_stateless/01459_manual_write_to_replicas.sh  | 1 +
 .../0_stateless/01459_manual_write_to_replicas_quorum.sh     | 2 ++
 tests/queries/0_stateless/01460_DistributedFilesToInsert.sql | 3 +++
 .../0_stateless/01463_test_alter_live_view_refresh.sql       | 2 ++
 tests/queries/0_stateless/01465_ttl_recompression.sql        | 2 ++
 tests/queries/0_stateless/01470_show_databases_like.sql      | 2 ++
 .../queries/0_stateless/01471_calculate_ttl_during_merge.sql | 2 ++
 tests/queries/0_stateless/01473_event_time_microseconds.sql  | 2 ++
 tests/queries/0_stateless/01474_bad_global_join.sql          | 2 ++
 tests/queries/0_stateless/01474_executable_dictionary.sql    | 3 +++
 tests/queries/0_stateless/01486_json_array_output.sql        | 2 ++
 .../0_stateless/01487_distributed_in_not_default_db.sql      | 2 ++
 .../01493_alter_remove_no_property_zookeeper_long.sql        | 2 ++
 .../0_stateless/01493_alter_remove_properties_zookeeper.sql  | 2 ++
 tests/queries/0_stateless/01493_storage_set_persistency.sql  | 2 ++
 tests/queries/0_stateless/01494_storage_join_persistency.sql | 2 ++
 tests/queries/0_stateless/01499_json_named_tuples.sql        | 2 ++
 tests/queries/0_stateless/01499_log_deadlock.sql             | 2 ++
 .../0_stateless/01501_cache_dictionary_all_fields.sql        | 2 ++
 .../0_stateless/01501_clickhouse_client_INSERT_exception.sh  | 1 +
 tests/queries/0_stateless/01502_log_tinylog_deadlock_race.sh | 1 +
 .../0_stateless/01502_long_log_tinylog_deadlock_race.sh      | 1 +
 tests/queries/0_stateless/01504_rocksdb.sql                  | 4 ++++
 .../01505_distributed_local_type_conversion_enum.sql         | 2 ++
 tests/queries/0_stateless/01505_log_distributed_deadlock.sql | 2 ++
 .../01507_clickhouse_server_start_with_embedded_config.sh    | 1 +
 tests/queries/0_stateless/01508_partition_pruning_long.sh    | 2 ++
 .../01508_race_condition_rename_clear_zookeeper_long.sh      | 1 +
 .../01509_check_many_parallel_quorum_inserts_long.sh         | 2 ++
 .../0_stateless/01509_check_parallel_quorum_inserts_long.sh  | 2 ++
 tests/queries/0_stateless/01509_dictionary_preallocate.sh    | 1 +
 .../0_stateless/01509_parallel_quorum_and_merge_long.sh      | 2 ++
 .../01509_parallel_quorum_insert_no_replicas_long.sql        | 3 +++
 ...ter_version_versioned_collapsing_merge_tree_zookeeper.sql | 2 ++
 .../01512_create_replicate_merge_tree_one_arg.sql            | 2 ++
 ...nt_without_select_sequence_consistency_zookeeper_long.sql | 2 ++
 .../01513_optimize_aggregation_in_order_memory_long.sql      | 2 ++
 .../0_stateless/01514_distributed_cancel_query_on_error.sh   | 1 +
 .../0_stateless/01514_input_format_json_enum_as_number.sql   | 2 ++
 tests/queries/0_stateless/01515_logtrace_function.sh         | 1 +
 .../0_stateless/01515_with_global_and_with_propagation.sql   | 2 ++
 tests/queries/0_stateless/01516_create_table_primary_key.sql | 2 ++
 tests/queries/0_stateless/01516_drop_table_stress_long.sh    | 1 +
 tests/queries/0_stateless/01517_drop_mv_with_inner_table.sql | 2 ++
 tests/queries/0_stateless/01517_select_final_distributed.sql | 2 ++
 .../0_stateless/01519_topK_distributed_parametrized.sql      | 2 ++
 tests/queries/0_stateless/01520_client_print_query_id.expect | 1 +
 tests/queries/0_stateless/01521_distributed_query_hang.sql   | 2 ++
 tests/queries/0_stateless/01521_global_in_prewhere_15792.sql | 2 ++
 .../0_stateless/01523_client_local_queries_file_parameter.sh | 1 +
 .../01526_alter_add_and_modify_order_zookeeper.sql           | 2 ++
 tests/queries/0_stateless/01526_client_start_and_exit.sh     | 1 +
 .../0_stateless/01526_complex_key_dict_direct_layout.sql     | 2 ++
 tests/queries/0_stateless/01526_max_untracked_memory.sh      | 5 +++++
 tests/queries/0_stateless/01527_clickhouse_local_optimize.sh | 1 +
 .../0_stateless/01527_dist_sharding_key_dictGet_reload.sql   | 2 ++
 ...28_allow_nondeterministic_optimize_skip_unused_shards.sql | 2 ++
 tests/queries/0_stateless/01529_bad_memory_tracking.sh       | 1 +
 .../queries/0_stateless/01530_drop_database_atomic_sync.sql  | 3 +++
 .../queries/0_stateless/01532_collate_in_low_cardinality.sql | 2 ++
 .../01532_execute_merges_on_single_replica_long.sql          | 4 ++++
 .../01532_primary_key_without_order_by_zookeeper.sql         | 2 ++
 tests/queries/0_stateless/01533_collate_in_nullable.sql      | 2 ++
 .../0_stateless/01541_max_memory_usage_for_user_long.sh      | 1 +
 tests/queries/0_stateless/01542_collate_in_array.sql         | 2 ++
 .../0_stateless/01542_dictionary_load_exception_race.sh      | 1 +
 .../0_stateless/01543_avro_deserialization_with_lc.sh        | 1 +
 tests/queries/0_stateless/01543_collate_in_tuple.sql         | 2 ++
 tests/queries/0_stateless/01545_system_errors.sh             | 2 ++
 .../0_stateless/01557_max_parallel_replicas_no_sample.sql    | 2 ++
 tests/queries/0_stateless/01560_merge_distributed_join.sql   | 2 ++
 tests/queries/0_stateless/01560_optimize_on_insert_long.sql  | 2 ++
 .../0_stateless/01560_optimize_on_insert_zookeeper.sql       | 2 ++
 tests/queries/0_stateless/01561_clickhouse_client_stage.sh   | 1 +
 tests/queries/0_stateless/01561_mann_whitney_scipy.sh        | 2 ++
 tests/queries/0_stateless/01563_distributed_query_finish.sh  | 2 ++
 .../0_stateless/01565_reconnect_after_client_error.expect    | 1 +
 .../0_stateless/01568_window_functions_distributed.sql       | 2 ++
 .../queries/0_stateless/01569_query_profiler_big_query_id.sh | 1 +
 .../0_stateless/01575_disable_detach_table_of_dictionary.sql | 2 ++
 .../01581_deduplicate_by_columns_replicated_long.sql         | 2 ++
 .../01584_distributed_buffer_cannot_find_column.sql          | 2 ++
 tests/queries/0_stateless/01585_use_index_for_global_in.sql  | 2 ++
 .../0_stateless/01585_use_index_for_global_in_with_null.sql  | 2 ++
 .../01586_replicated_mutations_empty_partition.sql           | 2 ++
 tests/queries/0_stateless/01592_long_window_functions1.sql   | 2 ++
 .../0_stateless/01593_concurrent_alter_mutations_kill.sh     | 1 +
 ...593_concurrent_alter_mutations_kill_many_replicas_long.sh | 1 +
 tests/queries/0_stateless/01594_too_low_memory_limits.sh     | 5 +++++
 tests/queries/0_stateless/01598_memory_limit_zeros.sql       | 2 ++
 tests/queries/0_stateless/01600_detach_permanently.sh        | 1 +
 .../0_stateless/01600_log_queries_with_extensive_info.sh     | 2 ++
 .../0_stateless/01600_multiple_left_join_with_aliases.sql    | 2 ++
 tests/queries/0_stateless/01600_parts_states_metrics_long.sh | 1 +
 tests/queries/0_stateless/01600_parts_types_metrics_long.sh  | 1 +
 tests/queries/0_stateless/01601_detach_permanently.sql       | 2 ++
 tests/queries/0_stateless/01601_proxy_protocol.sh            | 2 ++
 .../queries/0_stateless/01602_max_distributed_connections.sh | 1 +
 tests/queries/0_stateless/01602_show_create_view.sql         | 2 ++
 tests/queries/0_stateless/01603_read_with_backoff_bug.sql    | 3 +++
 tests/queries/0_stateless/01603_rename_overwrite_bug.sql     | 2 ++
 tests/queries/0_stateless/01610_client_spawn_editor.sh       | 1 +
 .../queries/0_stateless/01615_random_one_shard_insertion.sql | 2 ++
 tests/queries/0_stateless/01622_codec_zstd_long.sql          | 2 ++
 tests/queries/0_stateless/01622_defaults_for_url_engine.sh   | 2 ++
 .../0_stateless/01639_distributed_sync_insert_zero_rows.sql  | 2 ++
 .../01640_distributed_async_insert_compression.sql           | 2 ++
 .../0_stateless/01641_memory_tracking_insert_optimize.sql    | 2 ++
 .../01644_distributed_async_insert_fsync_smoke.sql           | 2 ++
 .../0_stateless/01646_system_restart_replicas_smoke.sql      | 3 +++
 .../01650_drop_part_and_deduplication_zookeeper_long.sql     | 3 +++
 .../01650_fetch_patition_with_macro_in_zk_path_long.sql      | 3 +++
 .../queries/0_stateless/01655_test_isnull_mysql_dialect.sql  | 2 ++
 tests/queries/0_stateless/01656_sequence_next_node_long.sql  | 2 ++
 tests/queries/0_stateless/01656_test_hex_mysql_dialect.sql   | 2 ++
 .../0_stateless/01656_test_query_log_factories_info.sql      | 2 ++
 .../0_stateless/01657_test_toHour_mysql_compatibility.sql    | 2 ++
 tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh | 2 ++
 .../01658_test_base64Encode_mysql_compatibility.sql          | 2 ++
 tests/queries/0_stateless/01659_h3_buffer_overflow.sql       | 2 ++
 .../01659_test_base64Decode_mysql_compatibility.sql          | 2 ++
 .../01660_test_toDayOfYear_mysql_compatibility.sql           | 2 ++
 .../01661_test_toDayOfWeek_mysql_compatibility.sql           | 2 ++
 .../01662_test_toDayOfMonth_mysql_compatibility.sql          | 2 ++
 tests/queries/0_stateless/01663_aes_msan.sql                 | 3 +++
 .../0_stateless/01663_test_toDate_mysql_compatibility.sql    | 2 ++
 .../0_stateless/01664_ntoa_aton_mysql_compatibility.sql      | 2 ++
 tests/queries/0_stateless/01666_blns_long.sql                | 3 +++
 tests/queries/0_stateless/01667_aes_args_check.sql           | 3 +++
 .../queries/0_stateless/01668_test_toMonth_mysql_dialect.sql | 2 ++
 .../0_stateless/01669_columns_declaration_serde_long.sql     | 2 ++
 .../queries/0_stateless/01669_test_toYear_mysql_dialect.sql  | 2 ++
 .../0_stateless/01670_dictionary_create_key_expression.sql   | 2 ++
 .../0_stateless/01670_distributed_bytes_to_throw_insert.sql  | 2 ++
 .../queries/0_stateless/01670_test_repeat_mysql_dialect.sql  | 2 ++
 tests/queries/0_stateless/01671_ddl_hang_timeout_long.sh     | 2 ++
 .../0_stateless/01671_test_toQuarter_mysql_dialect.sql       | 2 ++
 .../0_stateless/01672_test_toSecond_mysql_dialect.sql        | 2 ++
 .../0_stateless/01673_test_toMinute_mysql_dialect.sql        | 2 ++
 .../0_stateless/01674_clickhouse_client_query_param_cte.sh   | 1 +
 .../0_stateless/01674_executable_dictionary_implicit_key.sql | 2 ++
 .../01675_distributed_bytes_to_delay_insert_long.sh          | 1 +
 .../0_stateless/01676_dictget_in_default_expression.sql      | 2 ++
 .../0_stateless/01676_long_clickhouse_client_autocomplete.sh | 1 +
 tests/queries/0_stateless/01676_range_hashed_dictionary.sql  | 2 ++
 .../0_stateless/01681_cache_dictionary_simple_key.sql        | 2 ++
 tests/queries/0_stateless/01681_hyperscan_debug_assertion.sh | 2 ++
 .../0_stateless/01682_cache_dictionary_complex_key.sql       | 2 ++
 tests/queries/0_stateless/01683_codec_encrypted.sql          | 3 +++
 tests/queries/0_stateless/01683_flat_dictionary.sql          | 2 ++
 tests/queries/0_stateless/01683_text_log_deadlock.sh         | 1 +
 tests/queries/0_stateless/01684_insert_specify_shard_id.sql  | 2 ++
 .../0_stateless/01684_ssd_cache_dictionary_simple_key.sh     | 1 +
 .../0_stateless/01685_json_extract_double_as_float.sql       | 2 ++
 .../0_stateless/01685_ssd_cache_dictionary_complex_key.sh    | 1 +
 tests/queries/0_stateless/01686_rocksdb.sql                  | 4 ++++
 tests/queries/0_stateless/01700_system_zookeeper_path_in.sql | 2 ++
 tests/queries/0_stateless/01702_system_query_log.sql         | 2 ++
 tests/queries/0_stateless/01710_projection_fetch_long.sql    | 2 ++
 .../0_stateless/01710_projections_in_distributed_query.sql   | 2 ++
 .../0_stateless/01713_table_ttl_old_syntax_zookeeper.sql     | 2 ++
 .../01715_background_checker_blather_zookeeper_long.sql      | 2 ++
 tests/queries/0_stateless/01717_global_with_subquery_fix.sql | 2 ++
 .../01720_dictionary_create_source_with_functions.sql        | 2 ++
 tests/queries/0_stateless/01721_dictionary_decimal_p_s.sql   | 2 ++
 .../0_stateless/01721_engine_file_truncate_on_insert.sql     | 3 +++
 .../queries/0_stateless/01721_join_implicit_cast_long.sql.j2 | 2 ++
 .../01722_long_brotli_http_compression_json_format.sh        | 1 +
 .../01730_distributed_group_by_no_merge_order_by_long.sql    | 2 ++
 .../0_stateless/01732_race_condition_storage_join_long.sh    | 1 +
 .../01737_clickhouse_server_wait_server_pool_long.sh         | 1 +
 .../queries/0_stateless/01746_executable_pool_dictionary.sql | 2 ++
 .../01746_long_zlib_http_compression_json_format.sh          | 1 +
 .../01746_long_zstd_http_compression_json_format.sh          | 1 +
 .../01747_alter_partition_key_enum_zookeeper_long.sql        | 2 ++
 .../01747_executable_pool_dictionary_implicit_key.sql        | 2 ++
 .../0_stateless/01747_join_view_filter_dictionary.sql        | 2 ++
 tests/queries/0_stateless/01747_system_session_log_long.sh   | 2 ++
 tests/queries/0_stateless/01748_dictionary_table_dot.sql     | 2 ++
 .../queries/0_stateless/01752_distributed_query_sigsegv.sql  | 2 ++
 .../0_stateless/01753_direct_dictionary_simple_key.sql       | 2 ++
 .../01753_system_zookeeper_query_param_path_long.sh          | 1 +
 .../0_stateless/01754_cluster_all_replicas_shard_num.sql     | 2 ++
 .../0_stateless/01754_direct_dictionary_complex_key.sql      | 2 ++
 ...755_client_highlight_multi_line_comment_regression.expect | 1 +
 .../queries/0_stateless/01755_shard_pruning_with_literal.sql | 2 ++
 .../01756_optimize_skip_unused_shards_rewrite_in.sql         | 2 ++
 .../0_stateless/01757_optimize_skip_unused_shards_limit.sql  | 2 ++
 .../0_stateless/01758_optimize_skip_unused_shards_once.sh    | 1 +
 .../0_stateless/01759_dictionary_unique_attribute_names.sql  | 2 ++
 .../01759_optimize_skip_unused_shards_zero_shards.sql        | 2 ++
 .../01760_ddl_dictionary_use_current_database_name.sql       | 2 ++
 tests/queries/0_stateless/01760_polygon_dictionaries.sql     | 2 ++
 tests/queries/0_stateless/01760_system_dictionaries.sql      | 2 ++
 .../0_stateless/01761_alter_decimal_zookeeper_long.sql       | 2 ++
 tests/queries/0_stateless/01763_long_ttl_group_by.sql        | 2 ++
 tests/queries/0_stateless/01763_max_distributed_depth.sql    | 2 ++
 .../queries/0_stateless/01764_table_function_dictionary.sql  | 2 ++
 .../0_stateless/01765_hashed_dictionary_simple_key.sql       | 2 ++
 .../0_stateless/01766_hashed_dictionary_complex_key.sql      | 2 ++
 tests/queries/0_stateless/01776_decrypt_aead_size_check.sql  | 3 +++
 .../queries/0_stateless/01778_hierarchical_dictionaries.sql  | 2 ++
 .../0_stateless/01780_clickhouse_dictionary_source_loop.sql  | 2 ++
 tests/queries/0_stateless/01781_merge_tree_deduplication.sql | 3 +++
 tests/queries/0_stateless/01783_http_chunk_size.sh           | 2 ++
 tests/queries/0_stateless/01785_dictionary_element_count.sql | 2 ++
 tests/queries/0_stateless/01798_uniq_theta_sketch.sql        | 2 ++
 tests/queries/0_stateless/01799_long_uniq_theta_sketch.sql   | 2 ++
 tests/queries/0_stateless/01801_distinct_group_by_shard.sql  | 2 ++
 tests/queries/0_stateless/01801_s3_cluster.sql               | 3 +++
 .../01802_test_postgresql_protocol_with_row_policy.sh        | 3 +++
 .../queries/0_stateless/01804_dictionary_decimal256_type.sql | 2 ++
 .../0_stateless/01810_max_part_removal_threads_long.sh       | 1 +
 tests/queries/0_stateless/01811_filter_by_null.sql           | 3 +++
 .../01812_optimize_skip_unused_shards_single_node.sql        | 2 ++
 .../01813_distributed_scalar_subqueries_alias.sql            | 2 ++
 .../queries/0_stateless/01814_distributed_push_down_limit.sh | 2 ++
 .../0_stateless/01821_dictionary_primary_key_wrong_order.sql | 2 ++
 tests/queries/0_stateless/01821_join_table_race_long.sh      | 1 +
 tests/queries/0_stateless/01821_table_comment.sql            | 2 ++
 tests/queries/0_stateless/01823_explain_json.sh              | 1 +
 .../queries/0_stateless/01824_prefer_global_in_and_join.sql  | 2 ++
 .../queries/0_stateless/01833_test_collation_alvarotuso.sql  | 2 ++
 .../0_stateless/01837_database_memory_ddl_dictionaries.sql   | 2 ++
 tests/queries/0_stateless/01849_geoToS2.sql                  | 3 +++
 .../queries/0_stateless/01850_dist_INSERT_preserve_error.sql | 2 ++
 tests/queries/0_stateless/01851_s2_to_geo.sql                | 3 +++
 .../queries/0_stateless/01852_dictionary_found_rate_long.sql | 2 ++
 tests/queries/0_stateless/01852_s2_get_neighbours.sql        | 3 +++
 .../queries/0_stateless/01853_dictionary_cache_duplicates.sh | 1 +
 tests/queries/0_stateless/01853_s2_cells_intersect.sql       | 3 +++
 .../01854_dictionary_range_hashed_min_max_attr.sql           | 2 ++
 tests/queries/0_stateless/01854_s2_cap_contains.sql          | 3 +++
 tests/queries/0_stateless/01854_s2_cap_union.sql             | 3 +++
 tests/queries/0_stateless/01856_create_function.sql          | 2 ++
 .../0_stateless/01860_Distributed__shard_num_GROUP_BY.sql    | 2 ++
 tests/queries/0_stateless/01870_buffer_flush.sql             | 2 ++
 tests/queries/0_stateless/01870_modulo_partition_key.sql     | 2 ++
 .../01875_ssd_cache_dictionary_decimal256_type.sh            | 1 +
 tests/queries/0_stateless/01883_subcolumns_distributed.sql   | 2 ++
 .../01889_check_row_policy_defined_using_user_function.sh    | 1 +
 .../0_stateless/01889_clickhouse_client_config_format.sh     | 1 +
 .../0_stateless/01889_postgresql_protocol_null_fields.sh     | 2 ++
 tests/queries/0_stateless/01889_sql_json_functions.sql       | 2 ++
 tests/queries/0_stateless/01889_sqlite_read_write.sh         | 1 +
 .../0_stateless/01890_jit_aggregation_function_sum_long.sql  | 2 ++
 .../0_stateless/01890_materialized_distributed_join.sh       | 1 +
 tests/queries/0_stateless/01890_stem.sql                     | 3 +++
 .../0_stateless/01891_jit_aggregation_function_any_long.sql  | 2 ++
 .../queries/0_stateless/01891_partition_hash_no_long_int.sql | 2 ++
 .../01892_jit_aggregation_function_any_last_long.sql         | 2 ++
 .../0_stateless/01892_setting_limit_offset_distributed.sql   | 2 ++
 .../0_stateless/01893_jit_aggregation_function_min_long.sql  | 2 ++
 .../0_stateless/01894_jit_aggregation_function_max_long.sql  | 2 ++
 .../0_stateless/01895_jit_aggregation_function_avg_long.sql  | 2 ++
 .../0_stateless/01896_jit_aggregation_function_if_long.sql   | 2 ++
 .../01897_jit_aggregation_function_avg_weighted_long.sql     | 2 ++
 .../queries/0_stateless/01900_kill_mutation_parallel_long.sh | 1 +
 tests/queries/0_stateless/01901_in_literal_shard_prune.sql   | 2 ++
 .../queries/0_stateless/01901_test_attach_partition_from.sql | 2 ++
 tests/queries/0_stateless/01902_dictionary_array_type.sql    | 2 ++
 .../0_stateless/01902_table_function_merge_db_repr.sql       | 2 ++
 .../0_stateless/01903_ssd_cache_dictionary_array_type.sh     | 1 +
 .../0_stateless/01904_dictionary_default_nullable_type.sql   | 2 ++
 .../01904_ssd_cache_dictionary_default_nullable_type.sh      | 1 +
 tests/queries/0_stateless/01905_to_json_string.sql           | 2 ++
 tests/queries/0_stateless/01906_h3_to_geo.sql                | 2 ++
 .../01910_client_replxx_container_overflow_long.expect       | 1 +
 tests/queries/0_stateless/01910_memory_tracking_topk.sql     | 2 ++
 tests/queries/0_stateless/01910_view_dictionary.sql          | 2 ++
 tests/queries/0_stateless/01913_replace_dictionary.sql       | 2 ++
 tests/queries/0_stateless/01914_exchange_dictionaries.sql    | 3 +++
 .../0_stateless/01915_create_or_replace_dictionary.sql       | 2 ++
 tests/queries/0_stateless/01915_json_extract_raw_string.sql  | 2 ++
 .../01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh | 1 +
 tests/queries/0_stateless/01922_client_param.sh              | 1 +
 .../0_stateless/01923_network_receive_time_metric_insert.sh  | 2 ++
 .../0_stateless/01925_broken_partition_id_zookeeper.sql      | 2 ++
 .../01925_jit_aggregation_function_count_long.sql            | 2 ++
 .../01925_json_as_string_data_in_square_brackets.sql         | 2 ++
 .../queries/0_stateless/01925_test_storage_merge_aliases.sql | 2 ++
 tests/queries/0_stateless/01926_json_as_string_array.sh      | 1 +
 .../01930_optimize_skip_unused_shards_rewrite_in.sql         | 2 ++
 tests/queries/0_stateless/01932_global_in_function.sql       | 2 ++
 .../queries/0_stateless/01932_remote_sharding_key_column.sql | 2 ++
 .../0_stateless/01933_client_replxx_convert_history.expect   | 2 ++
 tests/queries/0_stateless/01939_type_map_json.sql            | 2 ++
 .../queries/0_stateless/01939_user_with_default_database.sh  | 1 +
 tests/queries/0_stateless/01940_custom_tld_sharding_key.sql  | 2 ++
 tests/queries/0_stateless/01943_query_id_check.sql           | 3 +++
 tests/queries/0_stateless/01944_insert_partition_by.sql      | 3 +++
 .../queries/0_stateless/01946_test_wrong_host_name_access.sh | 1 +
 ...ecompression_with_escape_sequence_at_the_end_of_buffer.sh | 1 +
 .../0_stateless/01948_dictionary_quoted_database_name.sql    | 2 ++
 .../0_stateless/01951_distributed_push_down_limit.sql        | 2 ++
 .../01952_optimize_distributed_group_by_sharding_key.sql     | 2 ++
 .../0_stateless/01954_clickhouse_benchmark_multiple_long.sh  | 1 +
 .../01955_clickhouse_benchmark_connection_hang.sh            | 3 +++
 .../01956_skip_unavailable_shards_excessive_attempts.sh      | 1 +
 tests/queries/0_stateless/01961_roaring_memory_tracking.sql  | 2 ++
 tests/queries/0_stateless/01999_grant_with_replace.sql       | 2 ++
 .../02001_add_default_database_to_system_users.sql           | 3 +++
 tests/queries/0_stateless/02001_shard_num_shard_count.sql    | 2 ++
 .../02002_global_subqueries_subquery_or_table_name.sql       | 2 ++
 tests/queries/0_stateless/02002_row_level_filter_bug.sh      | 2 ++
 tests/queries/0_stateless/02003_compress_bz2.sh              | 2 ++
 .../queries/0_stateless/02003_memory_limit_in_client.expect  | 1 +
 .../queries/0_stateless/02004_max_hyperscan_regex_length.sql | 3 +++
 .../0_stateless/02006_client_test_hint_error_name.sql        | 2 ++
 .../0_stateless/02006_client_test_hint_no_such_error_name.sh | 1 +
 .../0_stateless/02008_aliased_column_distributed_bug.sql     | 2 ++
 .../02008_complex_key_range_hashed_dictionary.sql            | 2 ++
 tests/queries/0_stateless/02009_array_join_partition.sql     | 3 +++
 tests/queries/0_stateless/02009_mysql_client_empty_result.sh | 1 +
 .../0_stateless/02011_dictionary_empty_attribute_list.sql    | 2 ++
 .../0_stateless/02012_changed_enum_type_non_replicated.sql   | 3 +++
 tests/queries/0_stateless/02012_settings_clause_for_s3.sql   | 3 +++
 tests/queries/0_stateless/02012_sha512_fixedstring.sql       | 3 +++
 .../0_stateless/02012_zookeeper_changed_enum_type.sql        | 3 +++
 .../02012_zookeeper_changed_enum_type_incompatible.sql       | 3 +++
 tests/queries/0_stateless/02013_zlib_read_after_eof.sh       | 2 ++
 .../queries/0_stateless/02015_shard_crash_clang_12_build.sh  | 1 +
 .../0_stateless/02017_create_distributed_table_coredump.sql  | 2 ++
 tests/queries/1_stateful/00009_uniq_distributed.sql          | 2 ++
 tests/queries/1_stateful/00012_sorting_distributed.sql       | 2 ++
 .../00016_any_if_distributed_cond_always_false.sql           | 2 ++
 .../1_stateful/00020_distinct_order_by_distributed.sql       | 2 ++
 tests/queries/1_stateful/00046_uniq_upto_distributed.sql     | 2 ++
 tests/queries/1_stateful/00053_replicate_segfault.sql        | 2 ++
 tests/queries/1_stateful/00054_merge_tree_partitions.sql     | 3 +++
 .../1_stateful/00066_sorting_distributed_many_replicas.sql   | 2 ++
 .../00088_global_in_one_shard_and_rows_before_limit.sql      | 2 ++
 tests/queries/1_stateful/00090_thread_pool_deadlock.sh       | 1 +
 tests/queries/1_stateful/00095_hyperscan_profiler.sql        | 2 ++
 tests/queries/1_stateful/00140_rename.sql                    | 3 +++
 .../1_stateful/00147_global_in_aggregate_function.sql        | 2 ++
 .../1_stateful/00149_quantiles_timing_distributed.sql        | 2 ++
 .../00151_replace_partition_with_different_granularity.sql   | 2 ++
 .../1_stateful/00152_insert_different_granularity.sql        | 3 +++
 tests/queries/1_stateful/00153_aggregate_arena_race.sql      | 2 ++
 tests/queries/1_stateful/00154_avro.sql                      | 2 ++
 tests/queries/1_stateful/00157_cache_dictionary.sql          | 2 ++
 tests/queries/1_stateful/00158_cache_dictionary_has.sql      | 2 ++
 .../1_stateful/00159_parallel_formatting_json_and_friends.sh | 1 +
 tests/queries/1_stateful/00166_explain_estimate.sql          | 3 +++
 tests/queries/bugs/01482_move_to_prewhere_and_cast.sql       | 3 +++
 1026 files changed, 1909 insertions(+)

diff --git a/tests/queries/0_stateless/00004_shard_format_ast_and_remote_table.sql b/tests/queries/0_stateless/00004_shard_format_ast_and_remote_table.sql
index defbf1aabc9..8bc1c39b574 100644
--- a/tests/queries/0_stateless/00004_shard_format_ast_and_remote_table.sql
+++ b/tests/queries/0_stateless/00004_shard_format_ast_and_remote_table.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT (dummy AS x) - 1 FROM remote('127.0.0.{2,3}', system, one)
diff --git a/tests/queries/0_stateless/00005_shard_format_ast_and_remote_table_lambda.sql b/tests/queries/0_stateless/00005_shard_format_ast_and_remote_table_lambda.sql
index f9d1380bae4..7f236212a4c 100644
--- a/tests/queries/0_stateless/00005_shard_format_ast_and_remote_table_lambda.sql
+++ b/tests/queries/0_stateless/00005_shard_format_ast_and_remote_table_lambda.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT count() FROM remote('127.0.0.{2,3}', system, one) WHERE arrayExists((x) -> x = 1, [1, 2, 3])
diff --git a/tests/queries/0_stateless/00019_shard_quantiles_totals_distributed.sql b/tests/queries/0_stateless/00019_shard_quantiles_totals_distributed.sql
index b7e672a32b6..84956f0d97e 100644
--- a/tests/queries/0_stateless/00019_shard_quantiles_totals_distributed.sql
+++ b/tests/queries/0_stateless/00019_shard_quantiles_totals_distributed.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT quantilesTiming(0.1, 0.5, 0.9)(dummy) FROM remote('127.0.0.{2,3}', system, one) GROUP BY 1 WITH TOTALS
diff --git a/tests/queries/0_stateless/00026_shard_something_distributed.sql b/tests/queries/0_stateless/00026_shard_something_distributed.sql
index aff6d02c1ed..23598edb574 100644
--- a/tests/queries/0_stateless/00026_shard_something_distributed.sql
+++ b/tests/queries/0_stateless/00026_shard_something_distributed.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT NOT dummy FROM remote('127.0.0.{2,3}', system, one) WHERE NOT dummy
diff --git a/tests/queries/0_stateless/00028_shard_big_agg_aj_distributed.sql b/tests/queries/0_stateless/00028_shard_big_agg_aj_distributed.sql
index 64415c3269c..f16679d6dc3 100644
--- a/tests/queries/0_stateless/00028_shard_big_agg_aj_distributed.sql
+++ b/tests/queries/0_stateless/00028_shard_big_agg_aj_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS big_array;
 CREATE TABLE big_array (x Array(UInt8)) ENGINE=TinyLog;
 SET min_insert_block_size_rows = 0, min_insert_block_size_bytes = 0;
diff --git a/tests/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh b/tests/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh
index 3360b8da83d..20be34499d5 100755
--- a/tests/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh
+++ b/tests/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00059_shard_global_in.sql b/tests/queries/0_stateless/00059_shard_global_in.sql
index 4da93e0a14a..e9ab21490bf 100644
--- a/tests/queries/0_stateless/00059_shard_global_in.sql
+++ b/tests/queries/0_stateless/00059_shard_global_in.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT number FROM remote('127.0.0.{2,3}', system, numbers) WHERE number GLOBAL IN (SELECT number FROM remote('127.0.0.{2,3}', system, numbers) WHERE number % 2 = 1 LIMIT 10) LIMIT 10;
diff --git a/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper_long.sql b/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper_long.sql
index 9901dfad9c8..e8d1a713c21 100644
--- a/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, replica, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS replicated_alter1;
 DROP TABLE IF EXISTS replicated_alter2;
 
diff --git a/tests/queries/0_stateless/00065_shard_float_literals_formatting.sql b/tests/queries/0_stateless/00065_shard_float_literals_formatting.sql
index 2c3f0dfb0e3..9ee5c4d8915 100644
--- a/tests/queries/0_stateless/00065_shard_float_literals_formatting.sql
+++ b/tests/queries/0_stateless/00065_shard_float_literals_formatting.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT toTypeName(1.0) FROM remote('127.0.0.{2,3}', system, one)
diff --git a/tests/queries/0_stateless/00067_replicate_segfault.sql b/tests/queries/0_stateless/00067_replicate_segfault.sql
index bf1a756d887..bf4c90d5adf 100644
--- a/tests/queries/0_stateless/00067_replicate_segfault.sql
+++ b/tests/queries/0_stateless/00067_replicate_segfault.sql
@@ -1,2 +1,4 @@
+-- Tags: replica
+
 SELECT arrayFilter(x -> materialize(0), materialize([0])) AS p, arrayAll(y -> arrayExists(x -> y != x, p), p) AS test;
 SELECT arrayFilter(x -> materialize(0), materialize([''])) AS p, arrayAll(y -> arrayExists(x -> y != x, p), p) AS test;
diff --git a/tests/queries/0_stateless/00075_shard_formatting_negate_of_negative_literal.sql b/tests/queries/0_stateless/00075_shard_formatting_negate_of_negative_literal.sql
index 351f18ef4bd..5305c0d05fb 100644
--- a/tests/queries/0_stateless/00075_shard_formatting_negate_of_negative_literal.sql
+++ b/tests/queries/0_stateless/00075_shard_formatting_negate_of_negative_literal.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT -(-1) FROM remote('127.0.0.{2,3}', system, one)
diff --git a/tests/queries/0_stateless/00080_show_tables_and_system_tables.sql b/tests/queries/0_stateless/00080_show_tables_and_system_tables.sql
index efb7ccf5f71..137dfb5b6f0 100644
--- a/tests/queries/0_stateless/00080_show_tables_and_system_tables.sql
+++ b/tests/queries/0_stateless/00080_show_tables_and_system_tables.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_show_tables;
 
 CREATE DATABASE test_show_tables;
diff --git a/tests/queries/0_stateless/00083_create_merge_tree_zookeeper_long.sql b/tests/queries/0_stateless/00083_create_merge_tree_zookeeper_long.sql
index 65247d7b12c..3418d093f70 100644
--- a/tests/queries/0_stateless/00083_create_merge_tree_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00083_create_merge_tree_zookeeper_long.sql
@@ -1,3 +1,7 @@
+-- Tags: long, zookeeper, no-replicated-database, no-parallel
+-- Tag no-replicated-database: Old syntax is not allowed
+-- Tag no-parallel: leftovers
+
 SET optimize_on_insert = 0;
 
 DROP TABLE IF EXISTS merge_tree;
diff --git a/tests/queries/0_stateless/00090_union_race_conditions_1.sh b/tests/queries/0_stateless/00090_union_race_conditions_1.sh
index afec8b5bac9..241436369b1 100755
--- a/tests/queries/0_stateless/00090_union_race_conditions_1.sh
+++ b/tests/queries/0_stateless/00090_union_race_conditions_1.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00091_union_race_conditions_2.sh b/tests/queries/0_stateless/00091_union_race_conditions_2.sh
index 78a6cca2b2b..aadbbe8d7d3 100755
--- a/tests/queries/0_stateless/00091_union_race_conditions_2.sh
+++ b/tests/queries/0_stateless/00091_union_race_conditions_2.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00092_union_race_conditions_3.sh b/tests/queries/0_stateless/00092_union_race_conditions_3.sh
index 9be2613f70a..a6f8fa5f6ec 100755
--- a/tests/queries/0_stateless/00092_union_race_conditions_3.sh
+++ b/tests/queries/0_stateless/00092_union_race_conditions_3.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00093_union_race_conditions_4.sh b/tests/queries/0_stateless/00093_union_race_conditions_4.sh
index ab1a025c5b2..3e3713f4024 100755
--- a/tests/queries/0_stateless/00093_union_race_conditions_4.sh
+++ b/tests/queries/0_stateless/00093_union_race_conditions_4.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00094_union_race_conditions_5.sh b/tests/queries/0_stateless/00094_union_race_conditions_5.sh
index b546b6a0092..fcd2b8bebb6 100755
--- a/tests/queries/0_stateless/00094_union_race_conditions_5.sh
+++ b/tests/queries/0_stateless/00094_union_race_conditions_5.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00097_long_storage_buffer_race_condition.sh b/tests/queries/0_stateless/00097_long_storage_buffer_race_condition.sh
index b3c0b37e0c0..bcd6cbefaff 100755
--- a/tests/queries/0_stateless/00097_long_storage_buffer_race_condition.sh
+++ b/tests/queries/0_stateless/00097_long_storage_buffer_race_condition.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00097_long_storage_buffer_race_condition_mt.sh b/tests/queries/0_stateless/00097_long_storage_buffer_race_condition_mt.sh
index 3856da7f214..a2a08105804 100755
--- a/tests/queries/0_stateless/00097_long_storage_buffer_race_condition_mt.sh
+++ b/tests/queries/0_stateless/00097_long_storage_buffer_race_condition_mt.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00098_shard_i_union_all.sql b/tests/queries/0_stateless/00098_shard_i_union_all.sql
index b02a468bc82..5151f9ad0e5 100644
--- a/tests/queries/0_stateless/00098_shard_i_union_all.sql
+++ b/tests/queries/0_stateless/00098_shard_i_union_all.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS report1;
 DROP TABLE IF EXISTS report2;
 
diff --git a/tests/queries/0_stateless/00101_materialized_views_and_insert_without_explicit_database.sql b/tests/queries/0_stateless/00101_materialized_views_and_insert_without_explicit_database.sql
index 9885c3c6f44..2fd097b9538 100644
--- a/tests/queries/0_stateless/00101_materialized_views_and_insert_without_explicit_database.sql
+++ b/tests/queries/0_stateless/00101_materialized_views_and_insert_without_explicit_database.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE IF NOT EXISTS test_00101_0;
 
 USE test_00101_0;
diff --git a/tests/queries/0_stateless/00105_shard_collations.sql b/tests/queries/0_stateless/00105_shard_collations.sql
index a73c441cc19..3a4151eebf8 100644
--- a/tests/queries/0_stateless/00105_shard_collations.sql
+++ b/tests/queries/0_stateless/00105_shard_collations.sql
@@ -1,3 +1,5 @@
+-- Tags: shard, no-fasttest
+
 SELECT 'Русский (default)';
 SELECT arrayJoin(['а', 'я', 'ё', 'А', 'Я', 'Ё']) AS x ORDER BY x;
 
diff --git a/tests/queries/0_stateless/00108_shard_totals_after_having.sql b/tests/queries/0_stateless/00108_shard_totals_after_having.sql
index 37825b269f7..db0527c27ab 100644
--- a/tests/queries/0_stateless/00108_shard_totals_after_having.sql
+++ b/tests/queries/0_stateless/00108_shard_totals_after_having.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SET max_rows_to_group_by = 100000;
 SET group_by_overflow_mode = 'any';
 
diff --git a/tests/queries/0_stateless/00109_shard_totals_after_having.sql b/tests/queries/0_stateless/00109_shard_totals_after_having.sql
index ae143f594c5..2a616b4a39d 100644
--- a/tests/queries/0_stateless/00109_shard_totals_after_having.sql
+++ b/tests/queries/0_stateless/00109_shard_totals_after_having.sql
@@ -1,3 +1,5 @@
+-- Tags: shard, no-parallel, no-fasttest
+
 SET max_rows_to_group_by = 100000;
 SET max_block_size = 100001;
 SET group_by_overflow_mode = 'any';
diff --git a/tests/queries/0_stateless/00110_external_sort.sql b/tests/queries/0_stateless/00110_external_sort.sql
index e7284796552..dd65c3e9546 100644
--- a/tests/queries/0_stateless/00110_external_sort.sql
+++ b/tests/queries/0_stateless/00110_external_sort.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 SET max_memory_usage = 300000000;
 SET max_bytes_before_external_sort = 20000000;
 SELECT number FROM (SELECT number FROM system.numbers LIMIT 10000000) ORDER BY number * 1234567890123456789 LIMIT 9999990, 10;
diff --git a/tests/queries/0_stateless/00111_shard_external_sort_distributed.sql b/tests/queries/0_stateless/00111_shard_external_sort_distributed.sql
index 5f5fa5443fd..112f5edae36 100644
--- a/tests/queries/0_stateless/00111_shard_external_sort_distributed.sql
+++ b/tests/queries/0_stateless/00111_shard_external_sort_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SET max_memory_usage = 300000000;
 SET max_bytes_before_external_sort = 20000000;
 
diff --git a/tests/queries/0_stateless/00112_shard_totals_after_having.sql b/tests/queries/0_stateless/00112_shard_totals_after_having.sql
index bea0bd36ef2..27952ae28c4 100644
--- a/tests/queries/0_stateless/00112_shard_totals_after_having.sql
+++ b/tests/queries/0_stateless/00112_shard_totals_after_having.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SET totals_mode = 'after_having_auto';
 SET max_rows_to_group_by = 100000;
 SET group_by_overflow_mode = 'any';
diff --git a/tests/queries/0_stateless/00113_shard_group_array.sql b/tests/queries/0_stateless/00113_shard_group_array.sql
index b960144ac4e..b589f9ce047 100644
--- a/tests/queries/0_stateless/00113_shard_group_array.sql
+++ b/tests/queries/0_stateless/00113_shard_group_array.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT intDiv(number, 100) AS k, length(groupArray(number)) FROM (SELECT * FROM system.numbers LIMIT 1000000) GROUP BY k WITH TOTALS ORDER BY k LIMIT 10;
 
 SELECT '';
diff --git a/tests/queries/0_stateless/00115_shard_in_incomplete_result.sh b/tests/queries/0_stateless/00115_shard_in_incomplete_result.sh
index 1348989e244..5c3918dea9f 100755
--- a/tests/queries/0_stateless/00115_shard_in_incomplete_result.sh
+++ b/tests/queries/0_stateless/00115_shard_in_incomplete_result.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: shard
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00116_storage_set.sql b/tests/queries/0_stateless/00116_storage_set.sql
index 0eeed7e859a..b06ee254c69 100644
--- a/tests/queries/0_stateless/00116_storage_set.sql
+++ b/tests/queries/0_stateless/00116_storage_set.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS set;
 DROP TABLE IF EXISTS set2;
 
diff --git a/tests/queries/0_stateless/00121_drop_column_zookeeper.sql b/tests/queries/0_stateless/00121_drop_column_zookeeper.sql
index 2aee56135f2..fd32f3d32d2 100644
--- a/tests/queries/0_stateless/00121_drop_column_zookeeper.sql
+++ b/tests/queries/0_stateless/00121_drop_column_zookeeper.sql
@@ -1,3 +1,6 @@
+-- Tags: zookeeper, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS alter_00121;
 CREATE TABLE alter_00121 (d Date, x UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test/alter_00121/t1', 'r1', d, (d), 8192);
 
diff --git a/tests/queries/0_stateless/00123_shard_unmerged_result_when_max_distributed_connections_is_one.sql b/tests/queries/0_stateless/00123_shard_unmerged_result_when_max_distributed_connections_is_one.sql
index 396be0683d3..788f16c2202 100644
--- a/tests/queries/0_stateless/00123_shard_unmerged_result_when_max_distributed_connections_is_one.sql
+++ b/tests/queries/0_stateless/00123_shard_unmerged_result_when_max_distributed_connections_is_one.sql
@@ -1,2 +1,4 @@
+-- Tags: distributed
+
 SET max_distributed_connections = 1;
 SELECT count() + 1 FROM remote('127.0.0.{2,3}', system, one);
diff --git a/tests/queries/0_stateless/00124_shard_distributed_with_many_replicas.sql b/tests/queries/0_stateless/00124_shard_distributed_with_many_replicas.sql
index 5352a8eba1a..6bc5fe268d6 100644
--- a/tests/queries/0_stateless/00124_shard_distributed_with_many_replicas.sql
+++ b/tests/queries/0_stateless/00124_shard_distributed_with_many_replicas.sql
@@ -1,3 +1,5 @@
+-- Tags: replica, distributed
+
 SET max_parallel_replicas = 2;
 
 DROP TABLE IF EXISTS report;
diff --git a/tests/queries/0_stateless/00133_long_shard_memory_tracker_and_exception_safety.sh b/tests/queries/0_stateless/00133_long_shard_memory_tracker_and_exception_safety.sh
index 05ebe9d19a8..389a2cd9684 100755
--- a/tests/queries/0_stateless/00133_long_shard_memory_tracker_and_exception_safety.sh
+++ b/tests/queries/0_stateless/00133_long_shard_memory_tracker_and_exception_safety.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, shard, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00154_shard_distributed_with_distinct.sql b/tests/queries/0_stateless/00154_shard_distributed_with_distinct.sql
index 8f98cd6d62a..a9493418e8e 100644
--- a/tests/queries/0_stateless/00154_shard_distributed_with_distinct.sql
+++ b/tests/queries/0_stateless/00154_shard_distributed_with_distinct.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT DISTINCT number FROM remote('127.0.0.{2,3}', system.numbers) LIMIT 10
diff --git a/tests/queries/0_stateless/00155_long_merges.sh b/tests/queries/0_stateless/00155_long_merges.sh
index c2aafaf0c95..f2d9cd1dade 100755
--- a/tests/queries/0_stateless/00155_long_merges.sh
+++ b/tests/queries/0_stateless/00155_long_merges.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00158_buffer_and_nonexistent_table.sql b/tests/queries/0_stateless/00158_buffer_and_nonexistent_table.sql
index 8d5d297b629..23c157db875 100644
--- a/tests/queries/0_stateless/00158_buffer_and_nonexistent_table.sql
+++ b/tests/queries/0_stateless/00158_buffer_and_nonexistent_table.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE IF NOT EXISTS test2_00158;
 DROP TABLE IF EXISTS test2_00158.mt_buffer_00158;
 DROP TABLE IF EXISTS test2_00158.mt_00158;
diff --git a/tests/queries/0_stateless/00162_shard_global_join.sql b/tests/queries/0_stateless/00162_shard_global_join.sql
index af56407e3d5..040eb0e7c03 100644
--- a/tests/queries/0_stateless/00162_shard_global_join.sql
+++ b/tests/queries/0_stateless/00162_shard_global_join.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT toFloat64(dummy + 2) AS n, j1, j2 FROM remote('127.0.0.{2,3}', system.one) jr1 GLOBAL ANY LEFT JOIN (SELECT number / 3 AS n, number AS j1, 'Hello' AS j2 FROM system.numbers LIMIT 10) jr2 USING n LIMIT 10;
diff --git a/tests/queries/0_stateless/00163_shard_join_with_empty_table.sql b/tests/queries/0_stateless/00163_shard_join_with_empty_table.sql
index ab7f347656d..71c570cf762 100644
--- a/tests/queries/0_stateless/00163_shard_join_with_empty_table.sql
+++ b/tests/queries/0_stateless/00163_shard_join_with_empty_table.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SET any_join_distinct_right_table_keys = 1;
 SET joined_subquery_requires_alias = 0;
 
diff --git a/tests/queries/0_stateless/00171_shard_array_of_tuple_remote.sql b/tests/queries/0_stateless/00171_shard_array_of_tuple_remote.sql
index 2bd4156a4cb..b28f4e65487 100644
--- a/tests/queries/0_stateless/00171_shard_array_of_tuple_remote.sql
+++ b/tests/queries/0_stateless/00171_shard_array_of_tuple_remote.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT arrayMap((x, y) -> (x, y), [1, 2, 3], [4, 5, 6]) FROM remote('127.0.0.{2,3}', system.one) ORDER BY rand();
diff --git a/tests/queries/0_stateless/00178_function_replicate.sql b/tests/queries/0_stateless/00178_function_replicate.sql
index 13ce1c24364..832334774ee 100644
--- a/tests/queries/0_stateless/00178_function_replicate.sql
+++ b/tests/queries/0_stateless/00178_function_replicate.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 SELECT
     number,
     range(number) AS arr,
diff --git a/tests/queries/0_stateless/00180_attach_materialized_view.sql b/tests/queries/0_stateless/00180_attach_materialized_view.sql
index d674c0bd277..9bebd46da84 100644
--- a/tests/queries/0_stateless/00180_attach_materialized_view.sql
+++ b/tests/queries/0_stateless/00180_attach_materialized_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS t_00180;
 DROP TABLE IF EXISTS mv_00180;
 DROP TABLE IF EXISTS `.inner.mv_00180`;
diff --git a/tests/queries/0_stateless/00183_skip_unavailable_shards.sql b/tests/queries/0_stateless/00183_skip_unavailable_shards.sql
index 4aa7cc72605..0f05618e746 100644
--- a/tests/queries/0_stateless/00183_skip_unavailable_shards.sql
+++ b/tests/queries/0_stateless/00183_skip_unavailable_shards.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SET send_logs_level = 'fatal';
 SELECT count() FROM remote('{127,1}.0.0.{2,3}', system.one) SETTINGS skip_unavailable_shards = 1;
 SELECT count() FROM remote('{1,127}.0.0.{2,3}', system.one) SETTINGS skip_unavailable_shards = 1;
diff --git a/tests/queries/0_stateless/00184_shard_distributed_group_by_no_merge.sql b/tests/queries/0_stateless/00184_shard_distributed_group_by_no_merge.sql
index cce10312e8f..965ce45fb90 100644
--- a/tests/queries/0_stateless/00184_shard_distributed_group_by_no_merge.sql
+++ b/tests/queries/0_stateless/00184_shard_distributed_group_by_no_merge.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SELECT 'distributed_group_by_no_merge=1';
 SELECT count(), uniq(dummy) FROM remote('127.0.0.{2,3}', system.one) SETTINGS distributed_group_by_no_merge=1;
 SELECT count(), uniq(dummy) FROM remote('127.0.0.{2,3,4,5}', system.one) SETTINGS distributed_group_by_no_merge=1;
diff --git a/tests/queries/0_stateless/00186_very_long_arrays.sh b/tests/queries/0_stateless/00186_very_long_arrays.sh
index 26a4496a85b..739b17ccc99 100755
--- a/tests/queries/0_stateless/00186_very_long_arrays.sh
+++ b/tests/queries/0_stateless/00186_very_long_arrays.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00189_time_zones_long.sql b/tests/queries/0_stateless/00189_time_zones_long.sql
index 36c7dfb402a..ecc5f62ed1d 100644
--- a/tests/queries/0_stateless/00189_time_zones_long.sql
+++ b/tests/queries/0_stateless/00189_time_zones_long.sql
@@ -1,3 +1,4 @@
+-- Tags: long
 
 /* timestamp 1419800400 == 2014-12-29 00:00:00 (Europe/Moscow) */
 /* timestamp 1412106600 == 2014-09-30 23:50:00 (Europe/Moscow) */
diff --git a/tests/queries/0_stateless/00193_parallel_replicas.sql b/tests/queries/0_stateless/00193_parallel_replicas.sql
index d1430d74045..6c5b50972cc 100644
--- a/tests/queries/0_stateless/00193_parallel_replicas.sql
+++ b/tests/queries/0_stateless/00193_parallel_replicas.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 DROP TABLE IF EXISTS parallel_replicas;
 DROP TABLE IF EXISTS parallel_replicas_backup;
 
diff --git a/tests/queries/0_stateless/00195_shard_union_all_and_global_in.sql b/tests/queries/0_stateless/00195_shard_union_all_and_global_in.sql
index fa4a9b97c4d..da21c56056c 100644
--- a/tests/queries/0_stateless/00195_shard_union_all_and_global_in.sql
+++ b/tests/queries/0_stateless/00195_shard_union_all_and_global_in.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT * FROM (SELECT * WHERE dummy GLOBAL IN (SELECT 0));
 SELECT * FROM (SELECT * WHERE dummy GLOBAL IN (SELECT toUInt8(number) FROM system.numbers LIMIT 10));
 SELECT * FROM (SELECT * FROM (SELECT * FROM system.numbers LIMIT 20) WHERE number GLOBAL IN (SELECT number FROM system.numbers LIMIT 10));
diff --git a/tests/queries/0_stateless/00200_shard_distinct_order_by_limit_distributed.sql b/tests/queries/0_stateless/00200_shard_distinct_order_by_limit_distributed.sql
index 6452e6b4254..6c3b8b5169b 100644
--- a/tests/queries/0_stateless/00200_shard_distinct_order_by_limit_distributed.sql
+++ b/tests/queries/0_stateless/00200_shard_distinct_order_by_limit_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS numbers_memory;
 CREATE TABLE numbers_memory AS system.numbers ENGINE = Memory;
 INSERT INTO numbers_memory SELECT number FROM system.numbers LIMIT 100;
diff --git a/tests/queries/0_stateless/00211_shard_query_formatting_aliases.sql b/tests/queries/0_stateless/00211_shard_query_formatting_aliases.sql
index 390aac0571b..7c44ac30929 100644
--- a/tests/queries/0_stateless/00211_shard_query_formatting_aliases.sql
+++ b/tests/queries/0_stateless/00211_shard_query_formatting_aliases.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT toUInt64(1) IN (1234567890, 2345678901, 3456789012, 4567890123, 5678901234, 6789012345, 7890123456, 8901234567, 9012345678, 123456789) AS x,
     x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x,
     x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x,
diff --git a/tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.sql b/tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.sql
index f1b3c82fec3..2e273cd8056 100644
--- a/tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.sql
+++ b/tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.sql
@@ -1,3 +1,5 @@
+-- Tags: long, shard
+
 -- uniqHLL12
 
 SELECT 'uniqHLL12';
diff --git a/tests/queries/0_stateless/00213_multiple_global_in.sql b/tests/queries/0_stateless/00213_multiple_global_in.sql
index c79c4ef5e10..0992f666a44 100644
--- a/tests/queries/0_stateless/00213_multiple_global_in.sql
+++ b/tests/queries/0_stateless/00213_multiple_global_in.sql
@@ -1 +1,3 @@
+-- Tags: global
+
 SELECT 1 GLOBAL IN (SELECT 1), 2 GLOBAL IN (SELECT 2) FROM remote('localhost', system.one);
diff --git a/tests/queries/0_stateless/00215_primary_key_order_zookeeper_long.sql b/tests/queries/0_stateless/00215_primary_key_order_zookeeper_long.sql
index 86b84f3f63c..d50f0daeb14 100644
--- a/tests/queries/0_stateless/00215_primary_key_order_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00215_primary_key_order_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS primary_key;
 CREATE TABLE primary_key (d Date DEFAULT today(), x Int8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00215/primary_key', 'r1', d, -x, 1);
 
diff --git a/tests/queries/0_stateless/00217_shard_global_subquery_columns_with_same_name.sql b/tests/queries/0_stateless/00217_shard_global_subquery_columns_with_same_name.sql
index 0dd434f0dbf..0ebd60a7f5f 100644
--- a/tests/queries/0_stateless/00217_shard_global_subquery_columns_with_same_name.sql
+++ b/tests/queries/0_stateless/00217_shard_global_subquery_columns_with_same_name.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SET joined_subquery_requires_alias = 0;
 
 SELECT k, a FROM (SELECT 42 AS k FROM remote('127.0.0.2', system.one)) GLOBAL ALL FULL OUTER JOIN (SELECT 42 AS k, 1 AS a, a) USING k;
diff --git a/tests/queries/0_stateless/00220_shard_with_totals_in_subquery_remote_and_limit.sql b/tests/queries/0_stateless/00220_shard_with_totals_in_subquery_remote_and_limit.sql
index 69fd37f1c2e..80a35a4855a 100644
--- a/tests/queries/0_stateless/00220_shard_with_totals_in_subquery_remote_and_limit.sql
+++ b/tests/queries/0_stateless/00220_shard_with_totals_in_subquery_remote_and_limit.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT x FROM (SELECT count() AS x FROM remote('127.0.0.2', system.one) WITH TOTALS) LIMIT 1;
diff --git a/tests/queries/0_stateless/00223_shard_distributed_aggregation_memory_efficient.sql b/tests/queries/0_stateless/00223_shard_distributed_aggregation_memory_efficient.sql
index 7a25139cdc4..94a70ec1fb1 100644
--- a/tests/queries/0_stateless/00223_shard_distributed_aggregation_memory_efficient.sql
+++ b/tests/queries/0_stateless/00223_shard_distributed_aggregation_memory_efficient.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SET max_block_size = 1000;
 
 DROP TABLE IF EXISTS numbers_10_00223;
diff --git a/tests/queries/0_stateless/00224_shard_distributed_aggregation_memory_efficient_and_overflows.sql b/tests/queries/0_stateless/00224_shard_distributed_aggregation_memory_efficient_and_overflows.sql
index caf5f7aa7f1..f99f712b388 100644
--- a/tests/queries/0_stateless/00224_shard_distributed_aggregation_memory_efficient_and_overflows.sql
+++ b/tests/queries/0_stateless/00224_shard_distributed_aggregation_memory_efficient_and_overflows.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS numbers_100k_log;
 CREATE TABLE numbers_100k_log ENGINE = Log AS SELECT * FROM system.numbers LIMIT 100000;
 
diff --git a/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.sql b/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.sql
index d70f337213e..0dec3ca05bc 100644
--- a/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.sql
+++ b/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS deduplication;
 CREATE TABLE deduplication (d Date DEFAULT '2015-01-01', x Int8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00226/deduplication', 'r1', d, x, 1);
 
diff --git a/tests/queries/0_stateless/00228_shard_quantiles_deterministic_merge_overflow.sql b/tests/queries/0_stateless/00228_shard_quantiles_deterministic_merge_overflow.sql
index d1cb28bc97d..dc73655743e 100644
--- a/tests/queries/0_stateless/00228_shard_quantiles_deterministic_merge_overflow.sql
+++ b/tests/queries/0_stateless/00228_shard_quantiles_deterministic_merge_overflow.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 select quantilesDeterministic(0.5, 0.9)(number, number) from (select number from system.numbers limit 101);
 -- test merge does not cause overflow
 select ignore(quantilesDeterministic(0.5, 0.9)(number, number)) from (select number from remote('127.0.0.{2,3}', system, numbers) limit 1000000);
diff --git a/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.sql b/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.sql
index 96a131514f8..f6eb4b2f8c1 100644
--- a/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, replica, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 SET replication_alter_partitions_sync = 2;
 
 DROP TABLE IF EXISTS attach_r1;
diff --git a/tests/queries/0_stateless/00252_shard_global_in_aggregate_function.sql b/tests/queries/0_stateless/00252_shard_global_in_aggregate_function.sql
index 282d5dad627..19105b5b935 100644
--- a/tests/queries/0_stateless/00252_shard_global_in_aggregate_function.sql
+++ b/tests/queries/0_stateless/00252_shard_global_in_aggregate_function.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS storage;
 CREATE TABLE storage(UserID UInt64) ENGINE=Memory;
 INSERT INTO storage(UserID) values (6460432721393873721)(6460432721393873721)(6460432721393873721)(6460432721393873721)(6460432721393873721)(6460432721393873721)(6460432721393873721)(402895971392036118)(402895971392036118)(402895971392036118);
diff --git a/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql b/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql
index 2293b1de490..48336faf382 100644
--- a/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql
+++ b/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 select 40 as z from (select * from system.numbers limit 3) group by z;
 select 41 as z from remote('127.0.0.{2,3}', system.one) group by z;
 select count(), 42 AS z from remote('127.0.0.{2,3}', system.one) group by z;
diff --git a/tests/queries/0_stateless/00259_hashing_tuples.sql b/tests/queries/0_stateless/00259_hashing_tuples.sql
index eb90ac78e5a..3702dc133b4 100644
--- a/tests/queries/0_stateless/00259_hashing_tuples.sql
+++ b/tests/queries/0_stateless/00259_hashing_tuples.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT cityHash64(1, 2, '') AS x1, cityHash64((1, 2), '') AS x2, cityHash64(1, (2, '')) AS x3, cityHash64((1, 2, '')) AS x4;
 SELECT cityHash64(materialize(1), 2, '') AS x1, cityHash64((materialize(1), 2), '') AS x2, cityHash64(materialize(1), (2, '')) AS x3, cityHash64((materialize(1), 2, '')) AS x4;
 SELECT cityHash64(1, materialize(2), '') AS x1, cityHash64((1, materialize(2)), '') AS x2, cityHash64(1, (materialize(2), '')) AS x3, cityHash64((1, materialize(2), '')) AS x4;
diff --git a/tests/queries/0_stateless/00260_like_and_curly_braces.sql b/tests/queries/0_stateless/00260_like_and_curly_braces.sql
index 2d796b22d03..0064deb22db 100644
--- a/tests/queries/0_stateless/00260_like_and_curly_braces.sql
+++ b/tests/queries/0_stateless/00260_like_and_curly_braces.sql
@@ -1,3 +1,5 @@
+-- Tags: race
+
 SELECT 'a}a' AS x, x LIKE (concat('%', x, '%') AS pat), materialize(x) LIKE pat;
 SELECT 'a}a' AS x, x LIKE (concat('%', x) AS pat), materialize(x) LIKE pat;
 SELECT 'a}a' AS x, x LIKE (concat(x, '%') AS pat), materialize(x) LIKE pat;
diff --git a/tests/queries/0_stateless/00266_shard_global_subquery_and_aliases.sql b/tests/queries/0_stateless/00266_shard_global_subquery_and_aliases.sql
index f15e1e5090e..37abdc90c87 100644
--- a/tests/queries/0_stateless/00266_shard_global_subquery_and_aliases.sql
+++ b/tests/queries/0_stateless/00266_shard_global_subquery_and_aliases.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT 1 GLOBAL IN (SELECT 1) AS s, s FROM remote('127.0.0.{2,3}', system.one);
diff --git a/tests/queries/0_stateless/00274_shard_group_array.sql b/tests/queries/0_stateless/00274_shard_group_array.sql
index 5257836ae5c..c9618962deb 100644
--- a/tests/queries/0_stateless/00274_shard_group_array.sql
+++ b/tests/queries/0_stateless/00274_shard_group_array.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT length(groupArray(number)), count() FROM (SELECT number FROM system.numbers_mt LIMIT 1000000);
 SELECT groupArray(dummy), count() FROM remote('127.0.0.{2,3}', system.one);
 
diff --git a/tests/queries/0_stateless/00275_shard_quantiles_weighted.sql b/tests/queries/0_stateless/00275_shard_quantiles_weighted.sql
index 16d6307ca4c..607b16b48b1 100644
--- a/tests/queries/0_stateless/00275_shard_quantiles_weighted.sql
+++ b/tests/queries/0_stateless/00275_shard_quantiles_weighted.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT quantileExactWeighted(0.5)(number, 1) FROM (SELECT number FROM system.numbers LIMIT 1001);
 SELECT quantilesExactWeighted(0, 0.001, 0.01, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.95, 0.99, 0.999, 1)(number, 1) FROM (SELECT number FROM system.numbers LIMIT 1001);
 SELECT quantilesExactWeighted(0, 0.001, 0.01, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.95, 0.99, 0.999, 1)(number, number) FROM (SELECT number FROM system.numbers LIMIT 1001);
diff --git a/tests/queries/0_stateless/00286_format_long_negative_float.sql b/tests/queries/0_stateless/00286_format_long_negative_float.sql
index e4d7a7085d2..0a93bab1395 100644
--- a/tests/queries/0_stateless/00286_format_long_negative_float.sql
+++ b/tests/queries/0_stateless/00286_format_long_negative_float.sql
@@ -1 +1,3 @@
+-- Tags: long
+
 select reinterpretAsFloat64(unhex('875635ffffffbfbe'))
diff --git a/tests/queries/0_stateless/00290_shard_aggregation_memory_efficient.sql b/tests/queries/0_stateless/00290_shard_aggregation_memory_efficient.sql
index f7fd5fb1458..3b65f46533b 100644
--- a/tests/queries/0_stateless/00290_shard_aggregation_memory_efficient.sql
+++ b/tests/queries/0_stateless/00290_shard_aggregation_memory_efficient.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS numbers_10_00290;
 SET max_block_size = 1000;
 CREATE TABLE numbers_10_00290 ENGINE = Log AS SELECT * FROM system.numbers LIMIT 10000;
diff --git a/tests/queries/0_stateless/00293_shard_max_subquery_depth.sql b/tests/queries/0_stateless/00293_shard_max_subquery_depth.sql
index a8f51a61c12..150e087e0e4 100644
--- a/tests/queries/0_stateless/00293_shard_max_subquery_depth.sql
+++ b/tests/queries/0_stateless/00293_shard_max_subquery_depth.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SET max_subquery_depth = 3;
 
 SELECT 1 FROM remote('127.0.0.{1,2}', system.one) WHERE 1 GLOBAL IN (SELECT 1 FROM remote('127.0.0.{2,3}', system.one) WHERE 1 GLOBAL IN (SELECT 1 FROM remote('127.0.0.{2,3}', system.one) WHERE 1 GLOBAL IN (SELECT 1 FROM remote('127.0.0.{2,3}', system.one))));
diff --git a/tests/queries/0_stateless/00294_shard_enums.sql b/tests/queries/0_stateless/00294_shard_enums.sql
index 9dc12aaadf1..414b9cfad03 100644
--- a/tests/queries/0_stateless/00294_shard_enums.sql
+++ b/tests/queries/0_stateless/00294_shard_enums.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 set max_threads = 1;
 drop table if exists enums;
 
diff --git a/tests/queries/0_stateless/00295_global_in_one_shard_rows_before_limit.sql b/tests/queries/0_stateless/00295_global_in_one_shard_rows_before_limit.sql
index 3fb96dae7c0..06cdb0bd86e 100644
--- a/tests/queries/0_stateless/00295_global_in_one_shard_rows_before_limit.sql
+++ b/tests/queries/0_stateless/00295_global_in_one_shard_rows_before_limit.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SET output_format_write_statistics = 0;
 SELECT arrayJoin(range(100)) AS x FROM remote('127.0.0.2', system.one) WHERE x GLOBAL IN (SELECT toUInt8(arrayJoin(range(100)) + 50)) GROUP BY x ORDER BY x LIMIT 10 FORMAT JSONCompact;
 SELECT arrayJoin(range(100)) AS x FROM remote('127.0.0.{2,3}', system.one) WHERE x GLOBAL IN (SELECT toUInt8(arrayJoin(range(100)) + 50)) GROUP BY x ORDER BY x LIMIT 10 FORMAT JSONCompact;
diff --git a/tests/queries/0_stateless/00297_attach_negative_numbers_zookeeper.sql.disabled b/tests/queries/0_stateless/00297_attach_negative_numbers_zookeeper.sql.disabled
index 000e768e943..22043c287d2 100644
--- a/tests/queries/0_stateless/00297_attach_negative_numbers_zookeeper.sql.disabled
+++ b/tests/queries/0_stateless/00297_attach_negative_numbers_zookeeper.sql.disabled
@@ -1,3 +1,5 @@
+-- Tags: disabled, zookeeper, no-parallel
+
 DROP TABLE IF EXISTS r1;
 DROP TABLE IF EXISTS r2;
 
diff --git a/tests/queries/0_stateless/00302_http_compression.sh b/tests/queries/0_stateless/00302_http_compression.sh
index cfa9a930f09..69800d6e0bf 100755
--- a/tests/queries/0_stateless/00302_http_compression.sh
+++ b/tests/queries/0_stateless/00302_http_compression.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00305_http_and_readonly.sh b/tests/queries/0_stateless/00305_http_and_readonly.sh
index dd9f116be7a..c630f8c87ee 100755
--- a/tests/queries/0_stateless/00305_http_and_readonly.sh
+++ b/tests/queries/0_stateless/00305_http_and_readonly.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00311_array_primary_key.sql b/tests/queries/0_stateless/00311_array_primary_key.sql
index 0e066c64f89..f6e21beab9b 100644
--- a/tests/queries/0_stateless/00311_array_primary_key.sql
+++ b/tests/queries/0_stateless/00311_array_primary_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS array_pk;
 CREATE TABLE array_pk (key Array(UInt8), s String, n UInt64, d Date MATERIALIZED '2000-01-01') ENGINE = MergeTree(d, (key, s, n), 1);
 
diff --git a/tests/queries/0_stateless/00324_hashing_enums.sql b/tests/queries/0_stateless/00324_hashing_enums.sql
index 6cb834f29bf..9952f94248e 100644
--- a/tests/queries/0_stateless/00324_hashing_enums.sql
+++ b/tests/queries/0_stateless/00324_hashing_enums.sql
@@ -1,2 +1,4 @@
+-- Tags: no-fasttest
+
 SELECT cityHash64(*) FROM (SELECT 1 AS x, CAST(x AS Enum8('Hello' = 0, 'World' = 1)) AS y);
 SELECT cityHash64(*) FROM (SELECT 1 AS x, x AS y);
diff --git a/tests/queries/0_stateless/00325_replacing_merge_tree.sql.disabled b/tests/queries/0_stateless/00325_replacing_merge_tree.sql.disabled
index 6014cb3bb67..124c9d2e496 100644
--- a/tests/queries/0_stateless/00325_replacing_merge_tree.sql.disabled
+++ b/tests/queries/0_stateless/00325_replacing_merge_tree.sql.disabled
@@ -1,3 +1,5 @@
+-- Tags: disabled
+
 DROP TABLE IF EXISTS replacing;
 CREATE TABLE replacing (d Date, k UInt64, s String, v UInt16) ENGINE = ReplacingMergeTree(d, k, 8192, v);
 
diff --git a/tests/queries/0_stateless/00326_long_function_multi_if.sql b/tests/queries/0_stateless/00326_long_function_multi_if.sql
index 3e460511487..0b941f8176c 100644
--- a/tests/queries/0_stateless/00326_long_function_multi_if.sql
+++ b/tests/queries/0_stateless/00326_long_function_multi_if.sql
@@ -1,3 +1,4 @@
+-- Tags: long
 
 SELECT 'Trivial case';
 
diff --git a/tests/queries/0_stateless/00328_long_case_construction.sql b/tests/queries/0_stateless/00328_long_case_construction.sql
index aa653d667f7..b05e388937a 100644
--- a/tests/queries/0_stateless/00328_long_case_construction.sql
+++ b/tests/queries/0_stateless/00328_long_case_construction.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 /* Trivial case */
 
 SELECT CASE WHEN 1 THEN 2 WHEN 3 THEN  4 ELSE 5 END;
diff --git a/tests/queries/0_stateless/00332_quantile_timing_memory_leak.sql b/tests/queries/0_stateless/00332_quantile_timing_memory_leak.sql
index 17400eb6b7a..1cc0938b1be 100644
--- a/tests/queries/0_stateless/00332_quantile_timing_memory_leak.sql
+++ b/tests/queries/0_stateless/00332_quantile_timing_memory_leak.sql
@@ -1,2 +1,4 @@
+-- Tags: no-parallel, no-fasttest
+
 SELECT quantileTiming(number) FROM (SELECT * FROM system.numbers LIMIT 10000);
 SELECT floor(log2(1 + number) / log2(1.5)) AS k, count() AS c, quantileTiming(number % 10000) AS q FROM (SELECT * FROM system.numbers LIMIT 1000000) GROUP BY k ORDER BY k;
diff --git a/tests/queries/0_stateless/00336_shard_stack_trace.sh b/tests/queries/0_stateless/00336_shard_stack_trace.sh
index 19389ec11c1..732a9a210c4 100755
--- a/tests/queries/0_stateless/00336_shard_stack_trace.sh
+++ b/tests/queries/0_stateless/00336_shard_stack_trace.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, shard
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00337_shard_any_heavy.sql b/tests/queries/0_stateless/00337_shard_any_heavy.sql
index 508db866f86..ff955ab0dee 100644
--- a/tests/queries/0_stateless/00337_shard_any_heavy.sql
+++ b/tests/queries/0_stateless/00337_shard_any_heavy.sql
@@ -1,2 +1,4 @@
+-- Tags: shard
+
 SELECT anyHeavy(x) FROM (SELECT intHash64(number) % 100 < 60 ? 999 : number AS x FROM system.numbers LIMIT 100000);
 SELECT anyHeavy(1) FROM remote('127.0.0.{2,3}', system.one);
diff --git a/tests/queries/0_stateless/00338_replicate_array_of_strings.sql b/tests/queries/0_stateless/00338_replicate_array_of_strings.sql
index 9ec8981a573..b49dddcdda0 100644
--- a/tests/queries/0_stateless/00338_replicate_array_of_strings.sql
+++ b/tests/queries/0_stateless/00338_replicate_array_of_strings.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 DROP TABLE IF EXISTS bad_arrays;
 CREATE TABLE bad_arrays (a Array(String), b Array(UInt8)) ENGINE = Memory;
 
diff --git a/tests/queries/0_stateless/00374_json_each_row_input_with_noisy_fields.sh b/tests/queries/0_stateless/00374_json_each_row_input_with_noisy_fields.sh
index c9c53dedd69..91ca0d7d869 100755
--- a/tests/queries/0_stateless/00374_json_each_row_input_with_noisy_fields.sh
+++ b/tests/queries/0_stateless/00374_json_each_row_input_with_noisy_fields.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql b/tests/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql
index d5a66c11d2d..8a310cb8fc9 100644
--- a/tests/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql
+++ b/tests/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS group_uniq_str;
 CREATE TABLE group_uniq_str ENGINE = Memory AS SELECT number % 10 as id, toString(intDiv((number%10000), 10)) as v FROM system.numbers LIMIT 10000000;
 
diff --git a/tests/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql b/tests/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql
index fba4ace65ce..abd0e6e6a45 100644
--- a/tests/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql
+++ b/tests/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS group_uniq_arr_int;
 CREATE TABLE group_uniq_arr_int ENGINE = Memory AS
 	SELECT g as id, if(c == 0, [v], if(c == 1, emptyArrayInt64(), [v, v])) as v FROM
diff --git a/tests/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql b/tests/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql
index 41ae2507d20..e9cfff211f8 100644
--- a/tests/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql
+++ b/tests/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS group_uniq_arr_str;
 CREATE TABLE group_uniq_arr_str ENGINE = Memory AS
     SELECT hex(intHash32(g)) as id, if(c == 0, [hex(v)], if(c == 1, emptyArrayString(), [hex(v), hex(v)])) as v FROM
diff --git a/tests/queries/0_stateless/00378_json_quote_64bit_integers.sql b/tests/queries/0_stateless/00378_json_quote_64bit_integers.sql
index 2d99202a8ac..3a70b64bc86 100644
--- a/tests/queries/0_stateless/00378_json_quote_64bit_integers.sql
+++ b/tests/queries/0_stateless/00378_json_quote_64bit_integers.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SET output_format_write_statistics = 0;
 SET extremes = 1;
 
diff --git a/tests/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh b/tests/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh
index d24d029c4e7..62f891db33c 100755
--- a/tests/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh
+++ b/tests/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.sh b/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.sh
index a09e9a4adb2..82c80325931 100755
--- a/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.sh
+++ b/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00386_long_in_pk.sh b/tests/queries/0_stateless/00386_long_in_pk.sh
index 66cc4ccc227..f619b0b8f2c 100755
--- a/tests/queries/0_stateless/00386_long_in_pk.sh
+++ b/tests/queries/0_stateless/00386_long_in_pk.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00387_use_client_time_zone.sh b/tests/queries/0_stateless/00387_use_client_time_zone.sh
index 201277b76d6..2a6d81eebfe 100755
--- a/tests/queries/0_stateless/00387_use_client_time_zone.sh
+++ b/tests/queries/0_stateless/00387_use_client_time_zone.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00400_client_external_options.sh b/tests/queries/0_stateless/00400_client_external_options.sh
index c2c6f44d62e..0adf622587a 100755
--- a/tests/queries/0_stateless/00400_client_external_options.sh
+++ b/tests/queries/0_stateless/00400_client_external_options.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/00409_shard_limit_by.sql b/tests/queries/0_stateless/00409_shard_limit_by.sql
index 97748d3e077..0db29982dd1 100644
--- a/tests/queries/0_stateless/00409_shard_limit_by.sql
+++ b/tests/queries/0_stateless/00409_shard_limit_by.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS limit_by;
 CREATE TABLE limit_by (Num UInt32, Name String) ENGINE = Memory;
 
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sql b/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sql
index 16245c42a7a..f309f6bab1c 100644
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sql
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 -- The results are different than in Python. That's why this file is genearated and the reference is edited instead of using the Python script.
 -- Example: in ClickHouse, 9223372036854775808.0 != 9223372036854775808.
 
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int1.sh b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int1.sh
index c2c5491ed90..03a181d17d7 100755
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int1.sh
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int1.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int2.sh b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int2.sh
index 539bdd297bd..19addc7e4c7 100755
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int2.sh
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int2.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int3.sh b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int3.sh
index a0e25e8cb0a..e078572438e 100755
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int3.sh
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int3.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int4.sh b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int4.sh
index b09a05baf69..7e755b80328 100755
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int4.sh
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int4.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00416_pocopatch_progress_in_http_headers.sh b/tests/queries/0_stateless/00416_pocopatch_progress_in_http_headers.sh
index 6e9814cbca8..6240450fd63 100755
--- a/tests/queries/0_stateless/00416_pocopatch_progress_in_http_headers.sh
+++ b/tests/queries/0_stateless/00416_pocopatch_progress_in_http_headers.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00417_kill_query.sh b/tests/queries/0_stateless/00417_kill_query.sh
index ce4c5851762..28f03fc9c37 100755
--- a/tests/queries/0_stateless/00417_kill_query.sh
+++ b/tests/queries/0_stateless/00417_kill_query.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/00423_storage_log_single_thread.sql b/tests/queries/0_stateless/00423_storage_log_single_thread.sql
index 8eff9323564..5d359c7f94d 100644
--- a/tests/queries/0_stateless/00423_storage_log_single_thread.sql
+++ b/tests/queries/0_stateless/00423_storage_log_single_thread.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS log;
 CREATE TABLE log (s String) ENGINE = Log;
 
diff --git a/tests/queries/0_stateless/00424_shard_aggregate_functions_of_nullable.sql b/tests/queries/0_stateless/00424_shard_aggregate_functions_of_nullable.sql
index e1b3cd70842..0211c21a5cd 100644
--- a/tests/queries/0_stateless/00424_shard_aggregate_functions_of_nullable.sql
+++ b/tests/queries/0_stateless/00424_shard_aggregate_functions_of_nullable.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT avg(arrayJoin([NULL]));
 SELECT avg(arrayJoin([NULL, 1]));
 SELECT avg(arrayJoin([NULL, 1, 2]));
diff --git a/tests/queries/0_stateless/00429_long_http_bufferization.sh b/tests/queries/0_stateless/00429_long_http_bufferization.sh
index 394e8e99052..802bdf40768 100755
--- a/tests/queries/0_stateless/00429_long_http_bufferization.sh
+++ b/tests/queries/0_stateless/00429_long_http_bufferization.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-unbundled, no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/00429_point_in_ellipses.sql b/tests/queries/0_stateless/00429_point_in_ellipses.sql
index 9ded2e0d440..57c7250590a 100644
--- a/tests/queries/0_stateless/00429_point_in_ellipses.sql
+++ b/tests/queries/0_stateless/00429_point_in_ellipses.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled
+
 SELECT pointInEllipses(33.3, 55.3, 33.4, 55.1, 1.0, 1.0) AS distance;
 SELECT pointInEllipses(33.3 + v, 55.3 + v, 33.4, 55.1, 1.0, 1.0) AS distance from
 (
diff --git a/tests/queries/0_stateless/00436_convert_charset.sql b/tests/queries/0_stateless/00436_convert_charset.sql
index 1b7baf22450..8ac9193c458 100644
--- a/tests/queries/0_stateless/00436_convert_charset.sql
+++ b/tests/queries/0_stateless/00436_convert_charset.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT
     'абвгдеёжзийклмнопрстуфхцчшщъыьэюяАБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ' AS orig,
     hex(convertCharset(orig, 'utf-8', 'cp1251') AS cp1251) AS cp1251_hex,
diff --git a/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh b/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh
index 5c5ecd4564b..a441c9a6761 100755
--- a/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh
+++ b/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-replicated-database, no-parallel
+# Tag no-replicated-database: Old syntax is not allowed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.sql b/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.sql
index e4d60f1b960..c820cce11af 100644
--- a/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 SELECT '===Ordinary case===';
 
 SET replication_alter_partitions_sync = 2;
diff --git a/tests/queries/0_stateless/00448_replicate_nullable_tuple_generic.sql b/tests/queries/0_stateless/00448_replicate_nullable_tuple_generic.sql
index 04bddd71972..082ba1bf178 100644
--- a/tests/queries/0_stateless/00448_replicate_nullable_tuple_generic.sql
+++ b/tests/queries/0_stateless/00448_replicate_nullable_tuple_generic.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 SELECT x, arrayJoin(x) FROM (SELECT materialize([1, NULL, 2]) AS x);
 SELECT x, arrayJoin(x) FROM (SELECT materialize([(1, 2), (3, 4), (5, 6)]) AS x);
 SELECT x, arrayJoin(x) FROM (SELECT materialize(arrayMap(x -> toFixedString(x, 5), ['Hello', 'world'])) AS x);
diff --git a/tests/queries/0_stateless/00462_json_true_false_literals.sql b/tests/queries/0_stateless/00462_json_true_false_literals.sql
index 740683ad3ce..2c45229fce6 100644
--- a/tests/queries/0_stateless/00462_json_true_false_literals.sql
+++ b/tests/queries/0_stateless/00462_json_true_false_literals.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS json;
 CREATE TABLE json (x UInt8, title String) ENGINE = Memory;
 INSERT INTO json FORMAT JSONEachRow {"x": true, "title": "true"}, {"x": false, "title": "false"}, {"x": 0, "title": "0"}, {"x": 1, "title": "1"};
diff --git a/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh b/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh
index d3bdf32db74..e9f486fbb73 100755
--- a/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh
+++ b/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00473_output_format_json_quote_denormals.sh b/tests/queries/0_stateless/00473_output_format_json_quote_denormals.sh
index 47f5c698d17..c2980810ac5 100755
--- a/tests/queries/0_stateless/00473_output_format_json_quote_denormals.sh
+++ b/tests/queries/0_stateless/00473_output_format_json_quote_denormals.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00490_special_line_separators_and_characters_outside_of_bmp.sql b/tests/queries/0_stateless/00490_special_line_separators_and_characters_outside_of_bmp.sql
index 4227190edf4..aac30d45d41 100644
--- a/tests/queries/0_stateless/00490_special_line_separators_and_characters_outside_of_bmp.sql
+++ b/tests/queries/0_stateless/00490_special_line_separators_and_characters_outside_of_bmp.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT visitParamExtractString('{"x":"\\uD800\\udf38"}', 'x') AS x, visitParamExtractString('{"x":"Hello \\u2028 World \\u2029 !"}', 'x') AS y FORMAT JSONEachRow;
 SELECT 'Hello' || convertCharset(unhex('2028'), 'utf16be', 'utf8') || 'World' || convertCharset(unhex('2029'), 'utf16be', 'utf8') || '!' AS x, hex(x) AS h FORMAT JSONEachRow;
 SELECT 'Hello' || convertCharset(unhex('2028'), 'utf16be', 'utf8') || 'World' || convertCharset(unhex('2029'), 'utf16be', 'utf8') || '!' AS x, hex(x) AS h FORMAT TSV;
diff --git a/tests/queries/0_stateless/00491_shard_distributed_and_aliases_in_where_having.sql b/tests/queries/0_stateless/00491_shard_distributed_and_aliases_in_where_having.sql
index 0b1c19996bf..117ca802596 100644
--- a/tests/queries/0_stateless/00491_shard_distributed_and_aliases_in_where_having.sql
+++ b/tests/queries/0_stateless/00491_shard_distributed_and_aliases_in_where_having.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT dummy FROM (SELECT dummy, NOT dummy AS x FROM remote('127.0.0.{2,3}', system.one) GROUP BY dummy HAVING x);
diff --git a/tests/queries/0_stateless/00494_shard_alias_substitution_bug.sql b/tests/queries/0_stateless/00494_shard_alias_substitution_bug.sql
index 089be0a3715..4a1ee2d79a2 100644
--- a/tests/queries/0_stateless/00494_shard_alias_substitution_bug.sql
+++ b/tests/queries/0_stateless/00494_shard_alias_substitution_bug.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS nested;
 CREATE TABLE nested (n Nested(x UInt8)) ENGINE = Memory;
 INSERT INTO nested VALUES ([1, 2]);
diff --git a/tests/queries/0_stateless/00499_json_enum_insert.sql b/tests/queries/0_stateless/00499_json_enum_insert.sql
index d085177a8e3..c4988d08243 100644
--- a/tests/queries/0_stateless/00499_json_enum_insert.sql
+++ b/tests/queries/0_stateless/00499_json_enum_insert.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS json;
 CREATE TABLE json (x Enum8('browser' = 1, 'mobile' = 2), y String) ENGINE = Memory;
 
diff --git a/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper_long.sql b/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper_long.sql
index bd92fcefcff..8267a451728 100644
--- a/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 SET replication_alter_partitions_sync = 2;
 
 SELECT '*** Not partitioned ***';
diff --git a/tests/queries/0_stateless/00505_secure.sh b/tests/queries/0_stateless/00505_secure.sh
index c1113af761b..4b425f1bc71 100755
--- a/tests/queries/0_stateless/00505_secure.sh
+++ b/tests/queries/0_stateless/00505_secure.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 # set -x
 
diff --git a/tests/queries/0_stateless/00505_shard_secure.sh b/tests/queries/0_stateless/00505_shard_secure.sh
index 526176f8c39..4676f99c02c 100755
--- a/tests/queries/0_stateless/00505_shard_secure.sh
+++ b/tests/queries/0_stateless/00505_shard_secure.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: shard, no-unbundled, no-parallel, no-fasttest
 
 # set -x
 
diff --git a/tests/queries/0_stateless/00506_shard_global_in_union.sql b/tests/queries/0_stateless/00506_shard_global_in_union.sql
index 4cbeb074bb5..b3009add7e5 100644
--- a/tests/queries/0_stateless/00506_shard_global_in_union.sql
+++ b/tests/queries/0_stateless/00506_shard_global_in_union.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT X FROM (SELECT * FROM (SELECT 1 AS X, 2 AS Y) UNION ALL SELECT 3, 4) ORDER BY X;
 
 DROP TABLE IF EXISTS globalin;
diff --git a/tests/queries/0_stateless/00506_union_distributed.sql b/tests/queries/0_stateless/00506_union_distributed.sql
index 4c5fd9a1743..08282d94d8b 100644
--- a/tests/queries/0_stateless/00506_union_distributed.sql
+++ b/tests/queries/0_stateless/00506_union_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- https://github.com/ClickHouse/ClickHouse/issues/1059
 
 SET insert_distributed_sync = 1;
diff --git a/tests/queries/0_stateless/00508_materialized_view_to.sql b/tests/queries/0_stateless/00508_materialized_view_to.sql
index d330faf4fb7..522ceb40404 100644
--- a/tests/queries/0_stateless/00508_materialized_view_to.sql
+++ b/tests/queries/0_stateless/00508_materialized_view_to.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_00508;
 CREATE DATABASE test_00508;
 
diff --git a/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql b/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql
index 48678329404..b24fb090688 100644
--- a/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql
+++ b/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql
@@ -1,3 +1,6 @@
+-- Tags: zookeeper, no-parallel
+-- Tag no-parallel: leftovers
+
 SET optimize_on_insert = 0;
 
 SELECT '*** Replicated with sampling ***';
diff --git a/tests/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql b/tests/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql
index 24f64a577f1..a702da66eaf 100644
--- a/tests/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql
+++ b/tests/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql
@@ -1,3 +1,6 @@
+-- Tags: zookeeper, no-ordinary-database, no-parallel
+-- Tag no-parallel: static UUID
+
 DROP TABLE IF EXISTS with_deduplication;
 DROP TABLE IF EXISTS without_deduplication;
 DROP TABLE IF EXISTS with_deduplication_mv;
diff --git a/tests/queries/0_stateless/00515_shard_desc_table_functions_and_subqueries.sql b/tests/queries/0_stateless/00515_shard_desc_table_functions_and_subqueries.sql
index 534b13e14d0..64ceb394b17 100644
--- a/tests/queries/0_stateless/00515_shard_desc_table_functions_and_subqueries.sql
+++ b/tests/queries/0_stateless/00515_shard_desc_table_functions_and_subqueries.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 drop table if exists tab;
 create table tab (date Date, val UInt64, val2 UInt8 default 42, val3 UInt8 default val2 + 1, val4 UInt64 alias val) engine = MergeTree(date, (date, val), 8192);
 desc tab;
diff --git a/tests/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql b/tests/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql
index 71ed99f78fa..6c76adb86d0 100644
--- a/tests/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql
+++ b/tests/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql
@@ -1,3 +1,6 @@
+-- Tags: zookeeper, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS deduplication_by_partition;
 CREATE TABLE deduplication_by_partition(d Date, x UInt32) ENGINE =
     ReplicatedMergeTree('/clickhouse/tables/{database}/test_00516/deduplication_by_partition', 'r1', d, x, 8192);
diff --git a/tests/queries/0_stateless/00531_client_ignore_error.sh b/tests/queries/0_stateless/00531_client_ignore_error.sh
index daf636b0765..d3215e1beac 100755
--- a/tests/queries/0_stateless/00531_client_ignore_error.sh
+++ b/tests/queries/0_stateless/00531_client_ignore_error.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00534_client_ignore_error.sh b/tests/queries/0_stateless/00534_client_ignore_error.sh
index daf636b0765..d3215e1beac 100755
--- a/tests/queries/0_stateless/00534_client_ignore_error.sh
+++ b/tests/queries/0_stateless/00534_client_ignore_error.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments1.sh b/tests/queries/0_stateless/00534_functions_bad_arguments1.sh
index 2979e18e2a5..d908f1eae7d 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments1.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments1.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments10.sh b/tests/queries/0_stateless/00534_functions_bad_arguments10.sh
index 178c9dd8d94..68cdfd6ce24 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments10.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments10.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan, no-parallel
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments11.sh b/tests/queries/0_stateless/00534_functions_bad_arguments11.sh
index 3004c6c84ff..da5ac2768f1 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments11.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments11.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments12.sh b/tests/queries/0_stateless/00534_functions_bad_arguments12.sh
index 8e5bd15dc80..ee0acd22dc9 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments12.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments12.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments13.sh b/tests/queries/0_stateless/00534_functions_bad_arguments13.sh
index 37f4282ae79..4e0b5bd3012 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments13.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments13.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments2.sh b/tests/queries/0_stateless/00534_functions_bad_arguments2.sh
index 9c8eda6fbcb..c60595622cc 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments2.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments2.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments3.sh b/tests/queries/0_stateless/00534_functions_bad_arguments3.sh
index 640467e9d00..6a6cb87ab66 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments3.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments3.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments4_long.sh b/tests/queries/0_stateless/00534_functions_bad_arguments4_long.sh
index b0381295b39..f484221e151 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments4_long.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments4_long.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: long, no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments5.sh b/tests/queries/0_stateless/00534_functions_bad_arguments5.sh
index 3e1d4be7af5..5073a6236a3 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments5.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments5.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments6.sh b/tests/queries/0_stateless/00534_functions_bad_arguments6.sh
index 53dff77a390..c3fa56a2ee0 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments6.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments6.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments7.sh b/tests/queries/0_stateless/00534_functions_bad_arguments7.sh
index 3625b65c381..6b28630bde1 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments7.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments7.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments8.sh b/tests/queries/0_stateless/00534_functions_bad_arguments8.sh
index 35cb25e6f8e..8a192a57635 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments8.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments8.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments9.sh b/tests/queries/0_stateless/00534_functions_bad_arguments9.sh
index 1756e968271..62360c53a7d 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments9.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments9.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00539_functions_for_working_with_json.sql b/tests/queries/0_stateless/00539_functions_for_working_with_json.sql
index 31853e92262..38b217308d4 100644
--- a/tests/queries/0_stateless/00539_functions_for_working_with_json.sql
+++ b/tests/queries/0_stateless/00539_functions_for_working_with_json.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 -- VisitParam with basic type
 SELECT visitParamExtractInt('{"myparam":-1}', 'myparam');
 SELECT visitParamExtractUInt('{"myparam":-1}', 'myparam');
diff --git a/tests/queries/0_stateless/00546_shard_tuple_element_formatting.sql b/tests/queries/0_stateless/00546_shard_tuple_element_formatting.sql
index 5157eb7e813..f3dbdf8edcc 100644
--- a/tests/queries/0_stateless/00546_shard_tuple_element_formatting.sql
+++ b/tests/queries/0_stateless/00546_shard_tuple_element_formatting.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT tupleElement((1, 2), toUInt8(1 + 0)) FROM remote('127.0.0.{2,3}', system.one);
diff --git a/tests/queries/0_stateless/00552_or_nullable.sql b/tests/queries/0_stateless/00552_or_nullable.sql
index ebec2db842d..5639a7f65cc 100644
--- a/tests/queries/0_stateless/00552_or_nullable.sql
+++ b/tests/queries/0_stateless/00552_or_nullable.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SELECT
     0 OR NULL,
     1 OR NULL,
diff --git a/tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper_long.sql b/tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper_long.sql
index 4cfbc1d0fb0..fd8a37a15f9 100644
--- a/tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 -- Check that settings are correctly passed through Distributed table
 DROP TABLE IF EXISTS simple;
 CREATE TABLE simple (d Int8) ENGINE = ReplicatedMergeTree('/clickhouse/{database}/test_00563/tables/simple', '1') ORDER BY d;
diff --git a/tests/queries/0_stateless/00563_shard_insert_into_remote.sql b/tests/queries/0_stateless/00563_shard_insert_into_remote.sql
index 274dfffa8d6..abc9658fc94 100644
--- a/tests/queries/0_stateless/00563_shard_insert_into_remote.sql
+++ b/tests/queries/0_stateless/00563_shard_insert_into_remote.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 drop table if exists tab;
 create table tab (val UInt8) engine = MergeTree order by val;
 insert into function remote('127.0.0.2', currentDatabase(), tab) values (1);
diff --git a/tests/queries/0_stateless/00564_versioned_collapsing_merge_tree.sql b/tests/queries/0_stateless/00564_versioned_collapsing_merge_tree.sql
index 634b9781c7a..66bbb02183c 100644
--- a/tests/queries/0_stateless/00564_versioned_collapsing_merge_tree.sql
+++ b/tests/queries/0_stateless/00564_versioned_collapsing_merge_tree.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 set optimize_on_insert = 0;
 
 drop table if exists mult_tab;
diff --git a/tests/queries/0_stateless/00571_non_exist_database_when_create_materializ_view.sql b/tests/queries/0_stateless/00571_non_exist_database_when_create_materializ_view.sql
index 1ad261de35c..c384ef37fc7 100644
--- a/tests/queries/0_stateless/00571_non_exist_database_when_create_materializ_view.sql
+++ b/tests/queries/0_stateless/00571_non_exist_database_when_create_materializ_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE test_00571;
 
 USE test_00571;
diff --git a/tests/queries/0_stateless/00573_shard_aggregation_by_empty_set.sql b/tests/queries/0_stateless/00573_shard_aggregation_by_empty_set.sql
index b7a56676a33..adb569897dc 100644
--- a/tests/queries/0_stateless/00573_shard_aggregation_by_empty_set.sql
+++ b/tests/queries/0_stateless/00573_shard_aggregation_by_empty_set.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 CREATE TEMPORARY TABLE t_00573 (x UInt8);
 
 SET empty_result_for_aggregation_by_empty_set = 0;
diff --git a/tests/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.sh b/tests/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.sh
index 94a9d331b6a..42bf37cbda5 100755
--- a/tests/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.sh
+++ b/tests/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00580_consistent_hashing_functions.sql b/tests/queries/0_stateless/00580_consistent_hashing_functions.sql
index 20d1892f192..08e785929c7 100644
--- a/tests/queries/0_stateless/00580_consistent_hashing_functions.sql
+++ b/tests/queries/0_stateless/00580_consistent_hashing_functions.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT jumpConsistentHash(1, 1), jumpConsistentHash(42, 57), jumpConsistentHash(256, 1024), jumpConsistentHash(3735883980, 1), jumpConsistentHash(3735883980, 666), jumpConsistentHash(16045690984833335023, 255);
 SELECT yandexConsistentHash(16045690984833335023, 1), yandexConsistentHash(16045690984833335023, 2), yandexConsistentHash(16045690984833335023, 3), yandexConsistentHash(16045690984833335023, 4), yandexConsistentHash(16045690984833335023, 173), yandexConsistentHash(16045690984833335023, 255);
 SELECT jumpConsistentHash(intHash64(number), 787) FROM system.numbers LIMIT 1000000, 2;
diff --git a/tests/queries/0_stateless/00588_shard_distributed_prewhere.sql b/tests/queries/0_stateless/00588_shard_distributed_prewhere.sql
index fdb84ccf00e..b3738fd5a9a 100644
--- a/tests/queries/0_stateless/00588_shard_distributed_prewhere.sql
+++ b/tests/queries/0_stateless/00588_shard_distributed_prewhere.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS mergetree_00588;
 DROP TABLE IF EXISTS distributed_00588;
 
diff --git a/tests/queries/0_stateless/00594_alias_in_distributed.sql b/tests/queries/0_stateless/00594_alias_in_distributed.sql
index 27815f2569b..b75dfdf7967 100644
--- a/tests/queries/0_stateless/00594_alias_in_distributed.sql
+++ b/tests/queries/0_stateless/00594_alias_in_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS alias_local10;
 DROP TABLE IF EXISTS alias10;
 
diff --git a/tests/queries/0_stateless/00597_push_down_predicate_long.sql b/tests/queries/0_stateless/00597_push_down_predicate_long.sql
index 2e3357241ad..40ea8b48caa 100644
--- a/tests/queries/0_stateless/00597_push_down_predicate_long.sql
+++ b/tests/queries/0_stateless/00597_push_down_predicate_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET send_logs_level = 'fatal';
 SET any_join_distinct_right_table_keys = 1;
 SET joined_subquery_requires_alias = 0;
diff --git a/tests/queries/0_stateless/00599_create_view_with_subquery.sql b/tests/queries/0_stateless/00599_create_view_with_subquery.sql
index 9fcc993886b..6d086ed07f5 100644
--- a/tests/queries/0_stateless/00599_create_view_with_subquery.sql
+++ b/tests/queries/0_stateless/00599_create_view_with_subquery.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS test_00599;
 DROP TABLE IF EXISTS test_view_00599;
 
diff --git a/tests/queries/0_stateless/00600_replace_running_query.sh b/tests/queries/0_stateless/00600_replace_running_query.sh
index 78ea4daf6bb..89c9d1c4279 100755
--- a/tests/queries/0_stateless/00600_replace_running_query.sh
+++ b/tests/queries/0_stateless/00600_replace_running_query.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=none
 
diff --git a/tests/queries/0_stateless/00604_shard_remote_and_columns_with_defaults.sql b/tests/queries/0_stateless/00604_shard_remote_and_columns_with_defaults.sql
index afc5b68bd94..304131d4069 100644
--- a/tests/queries/0_stateless/00604_shard_remote_and_columns_with_defaults.sql
+++ b/tests/queries/0_stateless/00604_shard_remote_and_columns_with_defaults.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 DROP TABLE IF EXISTS t3;
diff --git a/tests/queries/0_stateless/00604_show_create_database.sql b/tests/queries/0_stateless/00604_show_create_database.sql
index 4f0e8c9f49d..c990e7abed3 100644
--- a/tests/queries/0_stateless/00604_show_create_database.sql
+++ b/tests/queries/0_stateless/00604_show_create_database.sql
@@ -1,3 +1,5 @@
+-- Tags: no-ordinary-database, no-parallel
+
 create database if not exists test_00604;
 show create database test_00604;
 drop database test_00604;
diff --git a/tests/queries/0_stateless/00609_distributed_with_case_when_then.sql b/tests/queries/0_stateless/00609_distributed_with_case_when_then.sql
index ebcfeaaaf8a..26098201081 100644
--- a/tests/queries/0_stateless/00609_distributed_with_case_when_then.sql
+++ b/tests/queries/0_stateless/00609_distributed_with_case_when_then.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS mergetree_00609;
 DROP TABLE IF EXISTS distributed_00609;
 
diff --git a/tests/queries/0_stateless/00609_mv_index_in_in.sql b/tests/queries/0_stateless/00609_mv_index_in_in.sql
index 28085194327..002c94dd576 100644
--- a/tests/queries/0_stateless/00609_mv_index_in_in.sql
+++ b/tests/queries/0_stateless/00609_mv_index_in_in.sql
@@ -1,3 +1,5 @@
+-- Tags: no-ordinary-database
+
 DROP TABLE IF EXISTS test_00609;
 DROP TABLE IF EXISTS test_mv_00609;
 
diff --git a/tests/queries/0_stateless/00612_http_max_query_size.sh b/tests/queries/0_stateless/00612_http_max_query_size.sh
index 0a37d7ec766..cfcae330b85 100755
--- a/tests/queries/0_stateless/00612_http_max_query_size.sh
+++ b/tests/queries/0_stateless/00612_http_max_query_size.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
+
 # shellcheck disable=SC2028
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00612_shard_count.sql b/tests/queries/0_stateless/00612_shard_count.sql
index 2a69e9ed9c8..ee73caf7fc1 100644
--- a/tests/queries/0_stateless/00612_shard_count.sql
+++ b/tests/queries/0_stateless/00612_shard_count.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS count;
 
 CREATE TABLE count (x UInt64) ENGINE = MergeTree ORDER BY tuple();
diff --git a/tests/queries/0_stateless/00613_shard_distributed_max_execution_time.sql b/tests/queries/0_stateless/00613_shard_distributed_max_execution_time.sql
index dcd227bd2cf..de3000533a1 100644
--- a/tests/queries/0_stateless/00613_shard_distributed_max_execution_time.sql
+++ b/tests/queries/0_stateless/00613_shard_distributed_max_execution_time.sql
@@ -1,2 +1,4 @@
+-- Tags: distributed
+
 SET max_execution_time = 1, timeout_overflow_mode = 'break';
 SELECT DISTINCT * FROM remote('127.0.0.{2,3}', system.numbers) WHERE number < 10;
diff --git a/tests/queries/0_stateless/00614_shard_same_header_for_local_and_remote_node_in_distributed_query.sql b/tests/queries/0_stateless/00614_shard_same_header_for_local_and_remote_node_in_distributed_query.sql
index 6bcb15dfbe0..5d373927714 100644
--- a/tests/queries/0_stateless/00614_shard_same_header_for_local_and_remote_node_in_distributed_query.sql
+++ b/tests/queries/0_stateless/00614_shard_same_header_for_local_and_remote_node_in_distributed_query.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 drop table if exists tab;
 create table tab (date Date,  time DateTime, data String) ENGINE = MergeTree(date, (time, data), 8192);
 insert into tab values ('2018-01-21','2018-01-21 15:12:13','test');
diff --git a/tests/queries/0_stateless/00619_union_highlite.sql b/tests/queries/0_stateless/00619_union_highlite.sql
index 9a41a132661..4f9ed7c60c9 100644
--- a/tests/queries/0_stateless/00619_union_highlite.sql
+++ b/tests/queries/0_stateless/00619_union_highlite.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS union;
 
 create view union as select 1 as test union all select 2;
diff --git a/tests/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.sql b/tests/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.sql
index 715129cc699..c8c181fac62 100644
--- a/tests/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.sql
+++ b/tests/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.sql
@@ -1,3 +1,6 @@
+-- Tags: replica, no-replicated-database, no-parallel
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 -- The test is mostly outdated as now every replica is leader and can do OPTIMIZE locally.
 
 DROP TABLE IF EXISTS rename1;
diff --git a/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper_long.sql b/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper_long.sql
index 06e88754888..fab8691556b 100644
--- a/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, replica, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS replicated_truncate1;
 DROP TABLE IF EXISTS replicated_truncate2;
 
diff --git a/tests/queries/0_stateless/00623_truncate_table.sql b/tests/queries/0_stateless/00623_truncate_table.sql
index 97f85f920af..80369ff2bbc 100644
--- a/tests/queries/0_stateless/00623_truncate_table.sql
+++ b/tests/queries/0_stateless/00623_truncate_table.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS truncate_test;
 DROP TABLE IF EXISTS truncate_test_log;
 DROP TABLE IF EXISTS truncate_test_memory;
diff --git a/tests/queries/0_stateless/00623_truncate_table_throw_exception.sh b/tests/queries/0_stateless/00623_truncate_table_throw_exception.sh
index 59092ff28f2..7a5886795f9 100755
--- a/tests/queries/0_stateless/00623_truncate_table_throw_exception.sh
+++ b/tests/queries/0_stateless/00623_truncate_table_throw_exception.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00625_arrays_in_nested.sql b/tests/queries/0_stateless/00625_arrays_in_nested.sql
index 3b418731c8f..78819ac683f 100644
--- a/tests/queries/0_stateless/00625_arrays_in_nested.sql
+++ b/tests/queries/0_stateless/00625_arrays_in_nested.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS nested;
 CREATE TABLE nested
 (
diff --git a/tests/queries/0_stateless/00626_replace_partition_from_table.sql b/tests/queries/0_stateless/00626_replace_partition_from_table.sql
index 7224224334e..1e3e07f8274 100644
--- a/tests/queries/0_stateless/00626_replace_partition_from_table.sql
+++ b/tests/queries/0_stateless/00626_replace_partition_from_table.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database, no-parallel
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS src;
 DROP TABLE IF EXISTS dst;
 
diff --git a/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh b/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
index 443f2856c88..7b3f787eeab 100755
--- a/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
+++ b/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-replicated-database, no-parallel
+# Tag no-replicated-database: Unsupported type of ALTER query
 
 # Because REPLACE PARTITION does not forces immediate removal of replaced data parts from local filesystem
 # (it tries to do it as quick as possible, but it still performed in separate thread asynchronously)
diff --git a/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh b/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh
index def8e8f4cfe..3c6a61b958b 100755
--- a/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh
+++ b/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00634_logging_shard.sh b/tests/queries/0_stateless/00634_logging_shard.sh
index ab210e5a373..579f846fb66 100755
--- a/tests/queries/0_stateless/00634_logging_shard.sh
+++ b/tests/queries/0_stateless/00634_logging_shard.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: shard
+
 set -e
 
 # Get all server logs
diff --git a/tests/queries/0_stateless/00634_rename_view.sql b/tests/queries/0_stateless/00634_rename_view.sql
index a21b68db535..7a1c096daa1 100644
--- a/tests/queries/0_stateless/00634_rename_view.sql
+++ b/tests/queries/0_stateless/00634_rename_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: Does not support renaming of multiple tables in single query
 
 DROP TABLE IF EXISTS test1_00634;
 DROP TABLE IF EXISTS test2_00634;
diff --git a/tests/queries/0_stateless/00635_shard_distinct_order_by.sql b/tests/queries/0_stateless/00635_shard_distinct_order_by.sql
index ec0d40952a3..1782db30d4d 100644
--- a/tests/queries/0_stateless/00635_shard_distinct_order_by.sql
+++ b/tests/queries/0_stateless/00635_shard_distinct_order_by.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS data;
 CREATE TABLE data (s String, x Int8, y Int8) ENGINE = MergeTree ORDER BY tuple();
 
diff --git a/tests/queries/0_stateless/00638_remote_ssrf.sh.disabled b/tests/queries/0_stateless/00638_remote_ssrf.sh.disabled
index 6d9a87f7235..92e09928026 100755
--- a/tests/queries/0_stateless/00638_remote_ssrf.sh.disabled
+++ b/tests/queries/0_stateless/00638_remote_ssrf.sh.disabled
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: disabled
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . $CURDIR/../shell_config.sh
diff --git a/tests/queries/0_stateless/00643_cast_zookeeper_long.sql b/tests/queries/0_stateless/00643_cast_zookeeper_long.sql
index 21e7a89c603..85f87d11a2f 100644
--- a/tests/queries/0_stateless/00643_cast_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00643_cast_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 SET database_atomic_wait_for_drop_and_detach_synchronously=1;
 
 DROP TABLE IF EXISTS cast1;
diff --git a/tests/queries/0_stateless/00646_url_engine.sh b/tests/queries/0_stateless/00646_url_engine.sh
index 357e0d74fd0..9aacbfcfaf0 100755
--- a/tests/queries/0_stateless/00646_url_engine.sh
+++ b/tests/queries/0_stateless/00646_url_engine.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: Not sure why fail even in sequential mode. Disabled for now to make some progress.
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh b/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
index fdf6d717fb8..994114c9c50 100755
--- a/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
+++ b/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00652_mergetree_mutations.sh b/tests/queries/0_stateless/00652_mergetree_mutations.sh
index 989efd5ecec..0cba8b94040 100755
--- a/tests/queries/0_stateless/00652_mergetree_mutations.sh
+++ b/tests/queries/0_stateless/00652_mergetree_mutations.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh b/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh
index 58295e17790..3f5b8d570a6 100755
--- a/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh
+++ b/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: replica, no-replicated-database
+# Tag no-replicated-database: Fails due to additional replicas or shards
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh b/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh
index 3995cb3348c..d0e40e2ee62 100755
--- a/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh
+++ b/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: replica, no-replicated-database, no-parallel, no-fasttest
+# Tag no-replicated-database: Old syntax is not allowed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00661_optimize_final_replicated_without_partition_zookeeper.sql b/tests/queries/0_stateless/00661_optimize_final_replicated_without_partition_zookeeper.sql
index 033202e04aa..030d39f9050 100644
--- a/tests/queries/0_stateless/00661_optimize_final_replicated_without_partition_zookeeper.sql
+++ b/tests/queries/0_stateless/00661_optimize_final_replicated_without_partition_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 SET optimize_on_insert = 0;
 
 DROP TABLE IF EXISTS partitioned_by_tuple_replica1_00661;
diff --git a/tests/queries/0_stateless/00675_shard_remote_with_table_function.sql b/tests/queries/0_stateless/00675_shard_remote_with_table_function.sql
index 3a74ee16628..99c2e02e248 100644
--- a/tests/queries/0_stateless/00675_shard_remote_with_table_function.sql
+++ b/tests/queries/0_stateless/00675_shard_remote_with_table_function.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS remote_test;
 CREATE TABLE remote_test(a1 UInt8) ENGINE=Memory;
 INSERT INTO FUNCTION remote('127.0.0.1', currentDatabase(), remote_test) VALUES(1);
diff --git a/tests/queries/0_stateless/00677_shard_any_heavy_merge.sql b/tests/queries/0_stateless/00677_shard_any_heavy_merge.sql
index f6fac23a155..6d45ac47875 100644
--- a/tests/queries/0_stateless/00677_shard_any_heavy_merge.sql
+++ b/tests/queries/0_stateless/00677_shard_any_heavy_merge.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 WITH arrayJoin(['hello', 'world']) AS s SELECT count(), arraySort(groupUniqArray(s)), anyHeavy(s) FROM remote('127.0.0.{2,3}', system.one);
diff --git a/tests/queries/0_stateless/00678_shard_funnel_window.sql b/tests/queries/0_stateless/00678_shard_funnel_window.sql
index 29ec94be20b..8ea07a1c4ba 100644
--- a/tests/queries/0_stateless/00678_shard_funnel_window.sql
+++ b/tests/queries/0_stateless/00678_shard_funnel_window.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS remote_test;
 CREATE TABLE remote_test(uid String, its UInt32,  action_code String, day Date) ENGINE = MergeTree(day, (uid, its), 8192);
 INSERT INTO remote_test SELECT toString(number) AS uid, number % 3 AS its, toString(number % 3) AS action_code, '2000-01-01' FROM system.numbers LIMIT 10000;
diff --git a/tests/queries/0_stateless/00682_empty_parts_merge.sh b/tests/queries/0_stateless/00682_empty_parts_merge.sh
index 0213f31ea94..64aa1cc7452 100755
--- a/tests/queries/0_stateless/00682_empty_parts_merge.sh
+++ b/tests/queries/0_stateless/00682_empty_parts_merge.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00685_output_format_json_escape_forward_slashes.sql b/tests/queries/0_stateless/00685_output_format_json_escape_forward_slashes.sql
index 4ed0468b146..6d64981d228 100644
--- a/tests/queries/0_stateless/00685_output_format_json_escape_forward_slashes.sql
+++ b/tests/queries/0_stateless/00685_output_format_json_escape_forward_slashes.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SET output_format_json_escape_forward_slashes = 1;
 select '/some/cool/url' as url format JSONEachRow;
 SET output_format_json_escape_forward_slashes = 0;
diff --git a/tests/queries/0_stateless/00686_client_exit_code.sh b/tests/queries/0_stateless/00686_client_exit_code.sh
index eab534dd8d5..9586ddbd0a3 100755
--- a/tests/queries/0_stateless/00686_client_exit_code.sh
+++ b/tests/queries/0_stateless/00686_client_exit_code.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql b/tests/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql
index 5a169403872..c6f54ea389b 100644
--- a/tests/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql
+++ b/tests/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists lc_dict_reading;
 create table lc_dict_reading (val UInt64, str StringWithDictionary, pat String) engine = MergeTree order by val;
 insert into lc_dict_reading select number, if(number < 8192 * 4, number % 100, number) as s, s from system.numbers limit 1000000;
diff --git a/tests/queries/0_stateless/00688_low_cardinality_serialization.sql b/tests/queries/0_stateless/00688_low_cardinality_serialization.sql
index 74788122aee..e62d824e011 100644
--- a/tests/queries/0_stateless/00688_low_cardinality_serialization.sql
+++ b/tests/queries/0_stateless/00688_low_cardinality_serialization.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 select 'NativeBlockInputStream';
 select toTypeName(dict), dict, lowCardinalityIndices(dict), lowCardinalityKeys(dict) from (select '123_' || toLowCardinality(v) as dict from (select arrayJoin(['a', 'bb', '', 'a', 'ccc', 'a', 'bb', '', 'dddd']) as v));
 select '-';
diff --git a/tests/queries/0_stateless/00693_max_block_size_system_tables_columns.sql b/tests/queries/0_stateless/00693_max_block_size_system_tables_columns.sql
index 1d6abf7b252..0c8e4ae237d 100644
--- a/tests/queries/0_stateless/00693_max_block_size_system_tables_columns.sql
+++ b/tests/queries/0_stateless/00693_max_block_size_system_tables_columns.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- NOTE: database = currentDatabase() is not mandatory
 
 SELECT avg(blockSize()) <= 10 FROM system.tables SETTINGS max_block_size = 10;
diff --git a/tests/queries/0_stateless/00697_in_subquery_shard.sql b/tests/queries/0_stateless/00697_in_subquery_shard.sql
index 1e32a587fb3..634cfe42248 100644
--- a/tests/queries/0_stateless/00697_in_subquery_shard.sql
+++ b/tests/queries/0_stateless/00697_in_subquery_shard.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT 0 IN 0;
 SELECT 0 IN 1;
 SELECT 0 IN (SELECT 0);
diff --git a/tests/queries/0_stateless/00699_materialized_view_mutations.sh b/tests/queries/0_stateless/00699_materialized_view_mutations.sh
index f55b8ac10ed..f66d079e307 100755
--- a/tests/queries/0_stateless/00699_materialized_view_mutations.sh
+++ b/tests/queries/0_stateless/00699_materialized_view_mutations.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00701_rollup.sql b/tests/queries/0_stateless/00701_rollup.sql
index fa7f3a21657..3637a5fae2f 100644
--- a/tests/queries/0_stateless/00701_rollup.sql
+++ b/tests/queries/0_stateless/00701_rollup.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 DROP TABLE IF EXISTS rollup;
 CREATE TABLE rollup(a String, b Int32, s Int32) ENGINE = Memory;
 
diff --git a/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh b/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
index 48833d2643c..4637b210194 100755
--- a/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
+++ b/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00715_json_each_row_input_nested.sh b/tests/queries/0_stateless/00715_json_each_row_input_nested.sh
index 72e01aef742..c49f50c7bdc 100755
--- a/tests/queries/0_stateless/00715_json_each_row_input_nested.sh
+++ b/tests/queries/0_stateless/00715_json_each_row_input_nested.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/00716_allow_ddl.sql b/tests/queries/0_stateless/00716_allow_ddl.sql
index d33d8b7eec5..bc0fa20eb0a 100644
--- a/tests/queries/0_stateless/00716_allow_ddl.sql
+++ b/tests/queries/0_stateless/00716_allow_ddl.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 SET allow_ddl = 0;
 
diff --git a/tests/queries/0_stateless/00717_low_cardinaliry_distributed_group_by.sql b/tests/queries/0_stateless/00717_low_cardinaliry_distributed_group_by.sql
index d4d260ee92e..96e60c2891d 100644
--- a/tests/queries/0_stateless/00717_low_cardinaliry_distributed_group_by.sql
+++ b/tests/queries/0_stateless/00717_low_cardinaliry_distributed_group_by.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 set insert_distributed_sync = 1;
 set allow_suspicious_low_cardinality_types = 1;
 
diff --git a/tests/queries/0_stateless/00717_merge_and_distributed.sql b/tests/queries/0_stateless/00717_merge_and_distributed.sql
index 35dad18937a..f7b4a2b24d3 100644
--- a/tests/queries/0_stateless/00717_merge_and_distributed.sql
+++ b/tests/queries/0_stateless/00717_merge_and_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS test_local_1;
diff --git a/tests/queries/0_stateless/00719_parallel_ddl_db.sh b/tests/queries/0_stateless/00719_parallel_ddl_db.sh
index 5608a57eecc..31ea1dbbe58 100755
--- a/tests/queries/0_stateless/00719_parallel_ddl_db.sh
+++ b/tests/queries/0_stateless/00719_parallel_ddl_db.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper_long.sql b/tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper_long.sql
index 07fba5d39b4..3a387d0a203 100644
--- a/tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS byte_identical_r1;
 DROP TABLE IF EXISTS byte_identical_r2;
 
diff --git a/tests/queries/0_stateless/00725_comment_columns_long.sql b/tests/queries/0_stateless/00725_comment_columns_long.sql
index 3eec0ba31b7..fe4ee48909f 100644
--- a/tests/queries/0_stateless/00725_comment_columns_long.sql
+++ b/tests/queries/0_stateless/00725_comment_columns_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS check_query_comment_column;
 
 -- Check COMMENT COLUMN and MODIFY COLUMN statements with simple engine
diff --git a/tests/queries/0_stateless/00725_memory_tracking.sql b/tests/queries/0_stateless/00725_memory_tracking.sql
index 46d7948b1b3..b7356f0a6aa 100644
--- a/tests/queries/0_stateless/00725_memory_tracking.sql
+++ b/tests/queries/0_stateless/00725_memory_tracking.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database
+
 SELECT least(value, 0) FROM system.metrics WHERE metric = 'MemoryTracking';
 SELECT length(range(100000000));
 SELECT least(value, 0) FROM system.metrics WHERE metric = 'MemoryTracking';
diff --git a/tests/queries/0_stateless/00725_quantiles_shard.sql b/tests/queries/0_stateless/00725_quantiles_shard.sql
index bb8fcfcd2d9..a3742ce8729 100644
--- a/tests/queries/0_stateless/00725_quantiles_shard.sql
+++ b/tests/queries/0_stateless/00725_quantiles_shard.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT quantiles(0.5, 0.9)(number) FROM remote('127.0.0.{1,2}', numbers(10));
 SELECT quantilesExact(0.5, 0.9)(number) FROM remote('127.0.0.{1,2}', numbers(10));
 SELECT quantilesTDigest(0.5, 0.9)(number) FROM remote('127.0.0.{1,2}', numbers(10));
diff --git a/tests/queries/0_stateless/00728_json_each_row_parsing.sh b/tests/queries/0_stateless/00728_json_each_row_parsing.sh
index 6a43fc2d8da..21f6a350fdb 100755
--- a/tests/queries/0_stateless/00728_json_each_row_parsing.sh
+++ b/tests/queries/0_stateless/00728_json_each_row_parsing.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh b/tests/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh
index e54326cb59f..f9e33645527 100755
--- a/tests/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh
+++ b/tests/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00732_base64_functions.sql b/tests/queries/0_stateless/00732_base64_functions.sql
index 0d3b7e43645..3ba4180c20c 100644
--- a/tests/queries/0_stateless/00732_base64_functions.sql
+++ b/tests/queries/0_stateless/00732_base64_functions.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SET send_logs_level = 'fatal';
 SELECT base64Encode(val) FROM (select arrayJoin(['', 'f', 'fo', 'foo', 'foob', 'fooba', 'foobar']) val);
 SELECT base64Decode(val) FROM (select arrayJoin(['', 'Zg==', 'Zm8=', 'Zm9v', 'Zm9vYg==', 'Zm9vYmE=', 'Zm9vYmFy']) val);
diff --git a/tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper_long.sql b/tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper_long.sql
index a92646a41fc..bff8c7e73ee 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS quorum1;
diff --git a/tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper_long.sql b/tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper_long.sql
index 4f9afb93f3a..a1859220c6c 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS quorum1;
diff --git a/tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper_long.sql b/tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper_long.sql
index 1374fa776ca..61394447c3d 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS quorum1;
diff --git a/tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper_long.sql b/tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper_long.sql
index 0cc162b6010..e3e5aa7949f 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS quorum1;
diff --git a/tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper_long.sql b/tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper_long.sql
index 0ceca3743b2..4eb263c75c2 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS quorum1;
diff --git a/tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper_long.sql b/tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper_long.sql
index a95d992705e..7fb23936819 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS quorum1;
diff --git a/tests/queries/0_stateless/00735_long_conditional.sql b/tests/queries/0_stateless/00735_long_conditional.sql
index a247ce003b3..73febad1310 100644
--- a/tests/queries/0_stateless/00735_long_conditional.sql
+++ b/tests/queries/0_stateless/00735_long_conditional.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET send_logs_level = 'fatal';
 
 SELECT 'value vs value';
diff --git a/tests/queries/0_stateless/00738_lock_for_inner_table.sh b/tests/queries/0_stateless/00738_lock_for_inner_table.sh
index 37d5755fb0b..b28d1b4fa20 100755
--- a/tests/queries/0_stateless/00738_lock_for_inner_table.sh
+++ b/tests/queries/0_stateless/00738_lock_for_inner_table.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-ordinary-database
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00740_database_in_nested_view.sql b/tests/queries/0_stateless/00740_database_in_nested_view.sql
index 0106196279f..1890baafaa1 100644
--- a/tests/queries/0_stateless/00740_database_in_nested_view.sql
+++ b/tests/queries/0_stateless/00740_database_in_nested_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE test_00740;
 USE test_00740;
 
diff --git a/tests/queries/0_stateless/00741_client_comment_multiline.sql b/tests/queries/0_stateless/00741_client_comment_multiline.sql
index 9e481efe388..9fe4a4cb4ba 100644
--- a/tests/queries/0_stateless/00741_client_comment_multiline.sql
+++ b/tests/queries/0_stateless/00741_client_comment_multiline.sql
@@ -1,2 +1,4 @@
+-- Tags: no-parallel, no-fasttest
+
 CREATE DATABASE IF NOT EXISTS test_00741; -- foo
 DROP DATABASE test_00741;
diff --git a/tests/queries/0_stateless/00746_hashing_tuples.sql b/tests/queries/0_stateless/00746_hashing_tuples.sql
index d612d207ba3..fe6c7e373b4 100644
--- a/tests/queries/0_stateless/00746_hashing_tuples.sql
+++ b/tests/queries/0_stateless/00746_hashing_tuples.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT sipHash64(1, 2, 3);
 SELECT sipHash64(1, 3, 2);
 SELECT sipHash64(('a', [1, 2, 3], 4, (4, ['foo', 'bar'], 1, (1, 2))));
diff --git a/tests/queries/0_stateless/00751_default_databasename_for_view.sql b/tests/queries/0_stateless/00751_default_databasename_for_view.sql
index 5fa43555b2b..9292b612d87 100644
--- a/tests/queries/0_stateless/00751_default_databasename_for_view.sql
+++ b/tests/queries/0_stateless/00751_default_databasename_for_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE IF NOT EXISTS test_00751;
 USE test_00751;
 
diff --git a/tests/queries/0_stateless/00751_hashing_ints.sql b/tests/queries/0_stateless/00751_hashing_ints.sql
index be3268da29d..fc1564c0243 100644
--- a/tests/queries/0_stateless/00751_hashing_ints.sql
+++ b/tests/queries/0_stateless/00751_hashing_ints.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT halfMD5(123456);
 SELECT sipHash64(123456);
 SELECT cityHash64(123456);
diff --git a/tests/queries/0_stateless/00753_alter_attach.sql b/tests/queries/0_stateless/00753_alter_attach.sql
index 86388396410..a9661d3a304 100644
--- a/tests/queries/0_stateless/00753_alter_attach.sql
+++ b/tests/queries/0_stateless/00753_alter_attach.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database, no-parallel
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS alter_attach;
 CREATE TABLE alter_attach (x UInt64, p UInt8) ENGINE = MergeTree ORDER BY tuple() PARTITION BY p;
 INSERT INTO alter_attach VALUES (1, 1), (2, 1), (3, 1);
diff --git a/tests/queries/0_stateless/00753_comment_columns_zookeeper.sql b/tests/queries/0_stateless/00753_comment_columns_zookeeper.sql
index 93e2c9fb9d5..6b785d2f399 100644
--- a/tests/queries/0_stateless/00753_comment_columns_zookeeper.sql
+++ b/tests/queries/0_stateless/00753_comment_columns_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS check_comments;
 
 CREATE TABLE check_comments
diff --git a/tests/queries/0_stateless/00753_distributed_system_columns_and_system_tables.sql b/tests/queries/0_stateless/00753_distributed_system_columns_and_system_tables.sql
index fd9786be011..4cc330c703d 100644
--- a/tests/queries/0_stateless/00753_distributed_system_columns_and_system_tables.sql
+++ b/tests/queries/0_stateless/00753_distributed_system_columns_and_system_tables.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SELECT 'Check total_bytes/total_rows for Distributed';
 CREATE TABLE check_system_tables_null (key Int) Engine=Null();
 CREATE TABLE check_system_tables AS check_system_tables_null Engine=Distributed(test_shard_localhost, currentDatabase(), check_system_tables_null);
diff --git a/tests/queries/0_stateless/00753_system_columns_and_system_tables_long.sql b/tests/queries/0_stateless/00753_system_columns_and_system_tables_long.sql
index 1037b5a6381..dc54e4630d6 100644
--- a/tests/queries/0_stateless/00753_system_columns_and_system_tables_long.sql
+++ b/tests/queries/0_stateless/00753_system_columns_and_system_tables_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS check_system_tables;
 
 -- Check MergeTree declaration in new format
diff --git a/tests/queries/0_stateless/00754_alter_modify_column_partitions.sql b/tests/queries/0_stateless/00754_alter_modify_column_partitions.sql
index 4aa7ab8ad64..d7b154bc6ac 100644
--- a/tests/queries/0_stateless/00754_alter_modify_column_partitions.sql
+++ b/tests/queries/0_stateless/00754_alter_modify_column_partitions.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- check ALTER MODIFY COLUMN with partitions
 
 SET send_logs_level = 'fatal';
diff --git a/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper_long.sql b/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper_long.sql
index 78986338cd9..8c19e30249f 100644
--- a/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, replica, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 SET optimize_on_insert = 0;
 
 SET send_logs_level = 'fatal';
diff --git a/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards.sh b/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards.sh
index 55b74e055db..09f20284402 100755
--- a/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards.sh
+++ b/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: distributed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards_with_prewhere.sh b/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards_with_prewhere.sh
index ecf75352ca9..035907bddd7 100755
--- a/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards_with_prewhere.sh
+++ b/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards_with_prewhere.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: distributed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00760_insert_json_with_defaults.sql b/tests/queries/0_stateless/00760_insert_json_with_defaults.sql
index 6a1b367abba..1430d10cdb0 100644
--- a/tests/queries/0_stateless/00760_insert_json_with_defaults.sql
+++ b/tests/queries/0_stateless/00760_insert_json_with_defaults.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SET input_format_defaults_for_omitted_fields=1;
 
 DROP TABLE IF EXISTS defaults;
diff --git a/tests/queries/0_stateless/00763_lock_buffer_long.sh b/tests/queries/0_stateless/00763_lock_buffer_long.sh
index 363e3803983..50680724149 100755
--- a/tests/queries/0_stateless/00763_lock_buffer_long.sh
+++ b/tests/queries/0_stateless/00763_lock_buffer_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh b/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
index 65dd2474580..9ff759a034c 100755
--- a/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
+++ b/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel
+
 set -e
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=none
diff --git a/tests/queries/0_stateless/00800_function_java_hash.sql b/tests/queries/0_stateless/00800_function_java_hash.sql
index 42435ca42e8..ec26895ed60 100644
--- a/tests/queries/0_stateless/00800_function_java_hash.sql
+++ b/tests/queries/0_stateless/00800_function_java_hash.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 select javaHash('abc');
 select javaHash('874293087');
 select javaHashUTF16LE(convertCharset('a1가', 'utf-8', 'utf-16le'));
diff --git a/tests/queries/0_stateless/00800_low_cardinality_distributed_insert.sql b/tests/queries/0_stateless/00800_low_cardinality_distributed_insert.sql
index 196dfd84c7f..600793853ca 100644
--- a/tests/queries/0_stateless/00800_low_cardinality_distributed_insert.sql
+++ b/tests/queries/0_stateless/00800_low_cardinality_distributed_insert.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SET insert_distributed_sync = 1;
 
 DROP TABLE IF EXISTS low_cardinality;
diff --git a/tests/queries/0_stateless/00800_versatile_storage_join.sql b/tests/queries/0_stateless/00800_versatile_storage_join.sql
index b0ec6f69f93..3690ea6bf89 100644
--- a/tests/queries/0_stateless/00800_versatile_storage_join.sql
+++ b/tests/queries/0_stateless/00800_versatile_storage_join.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE IF NOT EXISTS test_00800;
 
 USE test_00800;
diff --git a/tests/queries/0_stateless/00803_odbc_driver_2_format.sql b/tests/queries/0_stateless/00803_odbc_driver_2_format.sql
index 58004c04e66..86c3864f359 100644
--- a/tests/queries/0_stateless/00803_odbc_driver_2_format.sql
+++ b/tests/queries/0_stateless/00803_odbc_driver_2_format.sql
@@ -1,2 +1,4 @@
+-- Tags: no-fasttest
+
 SELECT 1 AS x, [2, 3] AS y, 'Hello' AS z, NULL AS a FORMAT ODBCDriver2;
 SELECT number % 10 AS k, count() AS c FROM numbers(100) GROUP BY k WITH TOTALS FORMAT ODBCDriver2;
diff --git a/tests/queries/0_stateless/00803_xxhash.sql b/tests/queries/0_stateless/00803_xxhash.sql
index 2e6a1710e3c..f8b2b223a6e 100644
--- a/tests/queries/0_stateless/00803_xxhash.sql
+++ b/tests/queries/0_stateless/00803_xxhash.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled
+
 SELECT hex(xxHash64('')) = upper('ef46db3751d8e999');
 SELECT hex(xxHash32('')) = upper('02cc5d05');
 
diff --git a/tests/queries/0_stateless/00804_test_alter_compression_codecs.sql b/tests/queries/0_stateless/00804_test_alter_compression_codecs.sql
index 2a1b9e55b9a..9e911262ed7 100644
--- a/tests/queries/0_stateless/00804_test_alter_compression_codecs.sql
+++ b/tests/queries/0_stateless/00804_test_alter_compression_codecs.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS alter_compression_codec;
diff --git a/tests/queries/0_stateless/00804_test_custom_compression_codecs.sql b/tests/queries/0_stateless/00804_test_custom_compression_codecs.sql
index 87862f46e05..c3573588ae9 100644
--- a/tests/queries/0_stateless/00804_test_custom_compression_codecs.sql
+++ b/tests/queries/0_stateless/00804_test_custom_compression_codecs.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 SET allow_suspicious_codecs = 1;
 
diff --git a/tests/queries/0_stateless/00804_test_custom_compression_codes_log_storages.sql b/tests/queries/0_stateless/00804_test_custom_compression_codes_log_storages.sql
index fba6a216762..9331e39f8d7 100644
--- a/tests/queries/0_stateless/00804_test_custom_compression_codes_log_storages.sql
+++ b/tests/queries/0_stateless/00804_test_custom_compression_codes_log_storages.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 SET allow_suspicious_codecs = 1;
 
diff --git a/tests/queries/0_stateless/00804_test_delta_codec_compression.sql b/tests/queries/0_stateless/00804_test_delta_codec_compression.sql
index 6da43298347..044d60aeafb 100644
--- a/tests/queries/0_stateless/00804_test_delta_codec_compression.sql
+++ b/tests/queries/0_stateless/00804_test_delta_codec_compression.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 SET joined_subquery_requires_alias = 0;
 
diff --git a/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql b/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql
index 63897e225ce..5d03823dde3 100644
--- a/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql
+++ b/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 DROP TABLE IF EXISTS part_header_r1;
 DROP TABLE IF EXISTS part_header_r2;
 
diff --git a/tests/queries/0_stateless/00815_left_join_on_stepanel.sql b/tests/queries/0_stateless/00815_left_join_on_stepanel.sql
index 9d2467e3638..13172f8c18d 100644
--- a/tests/queries/0_stateless/00815_left_join_on_stepanel.sql
+++ b/tests/queries/0_stateless/00815_left_join_on_stepanel.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE IF NOT EXISTS test_00815;
 USE test_00815;
 
diff --git a/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh b/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh
index b0244991b3c..19d9b006cd7 100755
--- a/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh
+++ b/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 set -e
 
diff --git a/tests/queries/0_stateless/00821_distributed_storage_with_join_on.sql b/tests/queries/0_stateless/00821_distributed_storage_with_join_on.sql
index f84c20feaea..39242194486 100644
--- a/tests/queries/0_stateless/00821_distributed_storage_with_join_on.sql
+++ b/tests/queries/0_stateless/00821_distributed_storage_with_join_on.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- NOTE: database = currentDatabase() is not mandatory
 
 DROP TABLE IF EXISTS table1;
diff --git a/tests/queries/0_stateless/00823_capnproto_input.sh b/tests/queries/0_stateless/00823_capnproto_input.sh
index b86c8882bbd..11417852076 100755
--- a/tests/queries/0_stateless/00823_capnproto_input.sh
+++ b/tests/queries/0_stateless/00823_capnproto_input.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-ubsan, no-msan, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh b/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh
index 762f8a937e4..5c2804bdcae 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 SCHEMADIR=$CURDIR/format_schemas
diff --git a/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh b/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh
index 243446f9438..bd208195acc 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 # https://github.com/ClickHouse/ClickHouse/issues/9069
 
diff --git a/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh b/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh
index 300f82e5ca2..2731e4bcce3 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 # https://github.com/ClickHouse/ClickHouse/issues/7438
 
diff --git a/tests/queries/0_stateless/00825_protobuf_format_map.sh b/tests/queries/0_stateless/00825_protobuf_format_map.sh
index 877fe73603e..2a84772bc9f 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_map.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_map.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 SCHEMADIR=$CURDIR/format_schemas
diff --git a/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh b/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh
index 9d382f8c589..f1567128cf4 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 # https://github.com/ClickHouse/ClickHouse/issues/11117
 
diff --git a/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh b/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh
index b33db75b5c9..1b94ebd79f2 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 # https://github.com/ClickHouse/ClickHouse/issues/6497
 
diff --git a/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh b/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh
index 1e8ef28a48e..a16345c4bb1 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 SCHEMADIR=$CURDIR/format_schemas
diff --git a/tests/queries/0_stateless/00825_protobuf_format_persons.sh b/tests/queries/0_stateless/00825_protobuf_format_persons.sh
index fb099a6479e..bb376e6ed70 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_persons.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_persons.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 # To generate reference file for this test use the following commands:
 # ninja ProtobufDelimitedMessagesSerializer
diff --git a/tests/queries/0_stateless/00825_protobuf_format_splitted_nested.sh b/tests/queries/0_stateless/00825_protobuf_format_splitted_nested.sh
index ca915aca944..0cf33c91465 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_splitted_nested.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_splitted_nested.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 SCHEMADIR=$CURDIR/format_schemas
diff --git a/tests/queries/0_stateless/00825_protobuf_format_squares.sh b/tests/queries/0_stateless/00825_protobuf_format_squares.sh
index d3ff3ad2f4f..cc54a62e07f 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_squares.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_squares.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 SCHEMADIR=$CURDIR/format_schemas
diff --git a/tests/queries/0_stateless/00825_protobuf_format_table_default.sh b/tests/queries/0_stateless/00825_protobuf_format_table_default.sh
index 96664ca7f20..09271e81ab1 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_table_default.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_table_default.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 SCHEMADIR=$CURDIR/format_schemas
diff --git a/tests/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.sh b/tests/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.sh
index 3da40f16786..340df58e473 100755
--- a/tests/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.sh
+++ b/tests/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00834_dont_allow_to_set_two_configuration_files_in_client.sh b/tests/queries/0_stateless/00834_dont_allow_to_set_two_configuration_files_in_client.sh
index be57757af06..abdc95475c7 100755
--- a/tests/queries/0_stateless/00834_dont_allow_to_set_two_configuration_files_in_client.sh
+++ b/tests/queries/0_stateless/00834_dont_allow_to_set_two_configuration_files_in_client.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00834_kill_mutation.sh b/tests/queries/0_stateless/00834_kill_mutation.sh
index a17d85cf9a5..623016dfcfb 100755
--- a/tests/queries/0_stateless/00834_kill_mutation.sh
+++ b/tests/queries/0_stateless/00834_kill_mutation.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-debug, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh b/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
index 92ab6814235..caad08dcb9d 100755
--- a/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
+++ b/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: replica, no-debug, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper_long.sql b/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper_long.sql
index 6274a70a381..7ea6c2660ed 100644
--- a/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 DROP TABLE IF EXISTS minmax_idx;
 DROP TABLE IF EXISTS minmax_idx_r;
 DROP TABLE IF EXISTS minmax_idx2;
diff --git a/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper_long.sql b/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper_long.sql
index 0dd8dd41f97..a2fe1ebd63a 100644
--- a/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 DROP TABLE IF EXISTS minmax_idx1;
 DROP TABLE IF EXISTS minmax_idx2;
 
diff --git a/tests/queries/0_stateless/00838_system_tables_drop_table_race.sh b/tests/queries/0_stateless/00838_system_tables_drop_table_race.sh
index 2e070d685a4..da4d3b05987 100755
--- a/tests/queries/0_stateless/00838_system_tables_drop_table_race.sh
+++ b/tests/queries/0_stateless/00838_system_tables_drop_table_race.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 set -e
 
diff --git a/tests/queries/0_stateless/00840_long_concurrent_select_and_drop_deadlock.sh b/tests/queries/0_stateless/00840_long_concurrent_select_and_drop_deadlock.sh
index 448e7ad076c..8807926d9b6 100755
--- a/tests/queries/0_stateless/00840_long_concurrent_select_and_drop_deadlock.sh
+++ b/tests/queries/0_stateless/00840_long_concurrent_select_and_drop_deadlock.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock, no-parallel
 
 # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
 
diff --git a/tests/queries/0_stateless/00850_global_join_dups.sql b/tests/queries/0_stateless/00850_global_join_dups.sql
index 5843bf9c227..5a3ab0f1adc 100644
--- a/tests/queries/0_stateless/00850_global_join_dups.sql
+++ b/tests/queries/0_stateless/00850_global_join_dups.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 DROP TABLE IF EXISTS t_local;
 DROP TABLE IF EXISTS t1_00850;
 DROP TABLE IF EXISTS t2_00850;
diff --git a/tests/queries/0_stateless/00851_http_insert_json_defaults.sh b/tests/queries/0_stateless/00851_http_insert_json_defaults.sh
index 08458822cc0..8838200271f 100755
--- a/tests/queries/0_stateless/00851_http_insert_json_defaults.sh
+++ b/tests/queries/0_stateless/00851_http_insert_json_defaults.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00857_global_joinsavel_table_alias.sql b/tests/queries/0_stateless/00857_global_joinsavel_table_alias.sql
index df964d3a90c..e7f034131a2 100644
--- a/tests/queries/0_stateless/00857_global_joinsavel_table_alias.sql
+++ b/tests/queries/0_stateless/00857_global_joinsavel_table_alias.sql
@@ -1,3 +1,5 @@
+-- Tags: global, no-parallel
+
 CREATE DATABASE IF NOT EXISTS test_00857;
 USE test_00857;
 DROP TABLE IF EXISTS local_table;
diff --git a/tests/queries/0_stateless/00877_memory_limit_for_new_delete.sql b/tests/queries/0_stateless/00877_memory_limit_for_new_delete.sql
index 111104bb06e..f2dff662d9c 100644
--- a/tests/queries/0_stateless/00877_memory_limit_for_new_delete.sql
+++ b/tests/queries/0_stateless/00877_memory_limit_for_new_delete.sql
@@ -1,3 +1,6 @@
+-- Tags: no-tsan, no-asan, no-msan, no-unbundled, no-parallel, no-fasttest
+-- Tag no-msan: memory limits don't work correctly under msan because it replaces malloc/free
+
 SET max_memory_usage = 1000000000;
 
 SELECT sum(ignore(*)) FROM (
diff --git a/tests/queries/0_stateless/00899_long_attach_memory_limit.sql b/tests/queries/0_stateless/00899_long_attach_memory_limit.sql
index 0c8b8874293..aa507cda2ac 100644
--- a/tests/queries/0_stateless/00899_long_attach_memory_limit.sql
+++ b/tests/queries/0_stateless/00899_long_attach_memory_limit.sql
@@ -1,3 +1,5 @@
+-- Tags: long, no-debug, no-parallel, no-fasttest
+
 DROP TABLE IF EXISTS index_memory;
 CREATE TABLE index_memory (x UInt64) ENGINE = MergeTree ORDER BY x SETTINGS index_granularity = 1;
 INSERT INTO index_memory SELECT * FROM system.numbers LIMIT 5000000;
diff --git a/tests/queries/0_stateless/00900_entropy_shard.sql b/tests/queries/0_stateless/00900_entropy_shard.sql
index 6e343614bd2..10cc5481d47 100644
--- a/tests/queries/0_stateless/00900_entropy_shard.sql
+++ b/tests/queries/0_stateless/00900_entropy_shard.sql
@@ -1,2 +1,4 @@
+-- Tags: shard
+
 SELECT round(entropy(number), 6) FROM remote('127.0.0.{1,2}', numbers(256));
 SELECT entropy(rand64()) > 8 FROM remote('127.0.0.{1,2}', numbers(256));
diff --git a/tests/queries/0_stateless/00900_long_parquet.sh b/tests/queries/0_stateless/00900_long_parquet.sh
index e748fbcaf24..629a82f9d71 100755
--- a/tests/queries/0_stateless/00900_long_parquet.sh
+++ b/tests/queries/0_stateless/00900_long_parquet.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-unbundled, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/00900_long_parquet_decimal.sh b/tests/queries/0_stateless/00900_long_parquet_decimal.sh
index 67561f484bd..013899832d3 100755
--- a/tests/queries/0_stateless/00900_long_parquet_decimal.sh
+++ b/tests/queries/0_stateless/00900_long_parquet_decimal.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-unbundled, no-fasttest
 
 # set -x
 
diff --git a/tests/queries/0_stateless/00900_long_parquet_load.sh b/tests/queries/0_stateless/00900_long_parquet_load.sh
index 1cfba22587a..41e5359ac9b 100755
--- a/tests/queries/0_stateless/00900_long_parquet_load.sh
+++ b/tests/queries/0_stateless/00900_long_parquet_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-unbundled, no-fasttest
 
 #
 # Load all possible .parquet files found in submodules.
diff --git a/tests/queries/0_stateless/00900_null_array_orc_load.sh b/tests/queries/0_stateless/00900_null_array_orc_load.sh
index a303e50a04a..b651f419b1e 100755
--- a/tests/queries/0_stateless/00900_null_array_orc_load.sh
+++ b/tests/queries/0_stateless/00900_null_array_orc_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00900_orc_arrays_load.sh b/tests/queries/0_stateless/00900_orc_arrays_load.sh
index 410945b31eb..ad014423246 100755
--- a/tests/queries/0_stateless/00900_orc_arrays_load.sh
+++ b/tests/queries/0_stateless/00900_orc_arrays_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00900_orc_arrow_parquet_maps.sh b/tests/queries/0_stateless/00900_orc_arrow_parquet_maps.sh
index 913789dedb0..ca32790a696 100755
--- a/tests/queries/0_stateless/00900_orc_arrow_parquet_maps.sh
+++ b/tests/queries/0_stateless/00900_orc_arrow_parquet_maps.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00900_orc_arrow_parquet_nested.sh b/tests/queries/0_stateless/00900_orc_arrow_parquet_nested.sh
index 47d7b8519be..fc97cc5ef66 100755
--- a/tests/queries/0_stateless/00900_orc_arrow_parquet_nested.sh
+++ b/tests/queries/0_stateless/00900_orc_arrow_parquet_nested.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00900_orc_arrow_parquet_tuples.sh b/tests/queries/0_stateless/00900_orc_arrow_parquet_tuples.sh
index ff16d3205ad..927e48a9c91 100755
--- a/tests/queries/0_stateless/00900_orc_arrow_parquet_tuples.sh
+++ b/tests/queries/0_stateless/00900_orc_arrow_parquet_tuples.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00900_orc_load.sh b/tests/queries/0_stateless/00900_orc_load.sh
index aae752be3e9..185af8be608 100755
--- a/tests/queries/0_stateless/00900_orc_load.sh
+++ b/tests/queries/0_stateless/00900_orc_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-ubsan, no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00900_orc_nested_arrays_load.sh b/tests/queries/0_stateless/00900_orc_nested_arrays_load.sh
index 81d2aeed4bd..e91edd1d956 100755
--- a/tests/queries/0_stateless/00900_orc_nested_arrays_load.sh
+++ b/tests/queries/0_stateless/00900_orc_nested_arrays_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00900_orc_nullable_arrays_load.sh b/tests/queries/0_stateless/00900_orc_nullable_arrays_load.sh
index 61829d0709b..3431a606de9 100755
--- a/tests/queries/0_stateless/00900_orc_nullable_arrays_load.sh
+++ b/tests/queries/0_stateless/00900_orc_nullable_arrays_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00908_bloom_filter_index.sh b/tests/queries/0_stateless/00908_bloom_filter_index.sh
index a7631db759c..474a2b739e2 100755
--- a/tests/queries/0_stateless/00908_bloom_filter_index.sh
+++ b/tests/queries/0_stateless/00908_bloom_filter_index.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database
+# Tag no-replicated-database: grep -c
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00908_long_http_insert.sh b/tests/queries/0_stateless/00908_long_http_insert.sh
index 5e793410412..ecd1bf37f66 100755
--- a/tests/queries/0_stateless/00908_long_http_insert.sh
+++ b/tests/queries/0_stateless/00908_long_http_insert.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00910_buffer_prewhere.sql b/tests/queries/0_stateless/00910_buffer_prewhere.sql
index d7d9813c5f5..deda0db85fb 100644
--- a/tests/queries/0_stateless/00910_buffer_prewhere.sql
+++ b/tests/queries/0_stateless/00910_buffer_prewhere.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_buffer;
 CREATE DATABASE test_buffer;
 CREATE TABLE test_buffer.mt (uid UInt64, ts DateTime, val Float64) ENGINE = MergeTree PARTITION BY toDate(ts) ORDER BY (uid, ts);
diff --git a/tests/queries/0_stateless/00910_client_window_size_detection.sh b/tests/queries/0_stateless/00910_client_window_size_detection.sh
index 47d913de152..7bb70bb378b 100755
--- a/tests/queries/0_stateless/00910_client_window_size_detection.sh
+++ b/tests/queries/0_stateless/00910_client_window_size_detection.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00910_crash_when_distributed_modify_order_by.sql b/tests/queries/0_stateless/00910_crash_when_distributed_modify_order_by.sql
index 9a0c5d2f5ee..6dea97d1f27 100644
--- a/tests/queries/0_stateless/00910_crash_when_distributed_modify_order_by.sql
+++ b/tests/queries/0_stateless/00910_crash_when_distributed_modify_order_by.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS union1;
 DROP TABLE IF EXISTS union2;
 CREATE TABLE union1 ( date Date, a Int32, b Int32, c Int32, d Int32) ENGINE = MergeTree(date, (a, date), 8192);
diff --git a/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated_long.sql b/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated_long.sql
index 3fe121edc94..369d897fafd 100644
--- a/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated_long.sql
+++ b/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 SET send_logs_level = 'fatal';
 SET allow_suspicious_codecs = 1;
 
diff --git a/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs_long.sql b/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs_long.sql
index e4994ff8d75..ffc1e0906ce 100644
--- a/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs_long.sql
+++ b/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 SET send_logs_level = 'fatal';
 SET replication_alter_partitions_sync = 2;
 
diff --git a/tests/queries/0_stateless/00911_tautological_compare.sql b/tests/queries/0_stateless/00911_tautological_compare.sql
index bcbbbeb514b..93fd930d4bb 100644
--- a/tests/queries/0_stateless/00911_tautological_compare.sql
+++ b/tests/queries/0_stateless/00911_tautological_compare.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 -- TODO: Tautological optimization breaks JIT expression compilation, because it can return constant result
 -- for non constant columns. And then sample blocks from same ActionsDAGs can be mismatched.
 -- This optimization cannot be performed on AST rewrite level, because we does not have information about types
diff --git a/tests/queries/0_stateless/00914_replicate.sql b/tests/queries/0_stateless/00914_replicate.sql
index 4147df0ad45..0e6ac2bd331 100644
--- a/tests/queries/0_stateless/00914_replicate.sql
+++ b/tests/queries/0_stateless/00914_replicate.sql
@@ -1 +1,3 @@
+-- Tags: replica
+
 SELECT CAST(replicate(['a'], [1]) AS String);
diff --git a/tests/queries/0_stateless/00918_json_functions.sql b/tests/queries/0_stateless/00918_json_functions.sql
index f548b9e5e66..6504b735371 100644
--- a/tests/queries/0_stateless/00918_json_functions.sql
+++ b/tests/queries/0_stateless/00918_json_functions.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT '--allow_simdjson=1--';
 SET allow_simdjson=1;
 
diff --git a/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh b/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh
index df2ac2cece8..6d2cd0a176b 100755
--- a/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh
+++ b/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL="none"
 # We should have correct env vars from shell_config.sh to run this test
diff --git a/tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final_long.sql b/tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final_long.sql
index 2b119836ebf..dcfeb85da33 100644
--- a/tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final_long.sql
+++ b/tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, replica, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS replicated_optimize1;
 DROP TABLE IF EXISTS replicated_optimize2;
 CREATE TABLE replicated_optimize1 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/{database}/test_00925/optimize', 'r1', d, k, 8192);
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql b/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql
index 249c6eebfcf..a29a1bf9d1c 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 ----- Group of very similar simple tests ------
 select '----HORIZONTAL MERGE TESTS----';
 DROP TABLE IF EXISTS zero_rows_per_granule;
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql b/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql
index 3f151abc8fc..ba34cfad299 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 SELECT '----00489----';
 DROP TABLE IF EXISTS pk;
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.sql b/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.sql
index 3542a6acd0a..075548df6c3 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.sql
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 ----- Group of very similar simple tests ------
 DROP TABLE IF EXISTS zero_rows_per_granule;
 
diff --git a/tests/queries/0_stateless/00926_geo_to_h3.sql b/tests/queries/0_stateless/00926_geo_to_h3.sql
index a8315eb7ea6..8992f6ce348 100644
--- a/tests/queries/0_stateless/00926_geo_to_h3.sql
+++ b/tests/queries/0_stateless/00926_geo_to_h3.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 DROP TABLE IF EXISTS table1;
 
 CREATE TABLE table1 (lat Float64, lon Float64, resolution UInt8) ENGINE = Memory;
diff --git a/tests/queries/0_stateless/00926_multimatch.sql b/tests/queries/0_stateless/00926_multimatch.sql
index bf67533bb6c..6a90bfec914 100644
--- a/tests/queries/0_stateless/00926_multimatch.sql
+++ b/tests/queries/0_stateless/00926_multimatch.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Hyperscan
+
 select 0 = multiMatchAny(materialize('mpnsguhwsitzvuleiwebwjfitmsg'), ['wbirxqoabpblrnvvmjizj', 'cfcxhuvrexyzyjsh', 'oldhtubemyuqlqbwvwwkwin', 'bumoozxdkjglzu', 'intxlfohlxmajjomw', 'dxkeghohv', 'arsvmwwkjeopnlwnan', 'ouugllgowpqtaxslcopkytbfhifaxbgt', 'hkedmjlbcrzvryaopjqdjjc', 'tbqkljywstuahzh', 'o', 'wowoclosyfcuwotmvjygzuzhrery', 'vpefjiffkhlggntcu', 'ytdixvasrorhripzfhjdmlhqksmctyycwp']) from system.numbers limit 10;
 select 0 = multiMatchAny(materialize('qjjzqexjpgkglgxpzrbqbnskq'), ['vaiatcjacmlffdzsejpdareqzy', 'xspcfzdufkmecud', 'bcvtbuqtctq', 'nkcopwbfytgemkqcfnnno', 'dylxnzuyhq', 'tno', 'scukuhufly', 'cdyquzuqlptv', 'ohluyfeksyxepezdhqmtfmgkvzsyph', 'ualzwtahvqvtijwp', 'jg', 'gwbawqlngzcknzgtmlj', 'qimvjcgbkkp', 'eaedbcgyrdvv', 'qcwrncjoewwedyyewcdkh', 'uqcvhngoqngmitjfxpznqomertqnqcveoqk', 'ydrgjiankgygpm', 'axepgap']) from system.numbers limit 10;
 select 0 = multiMatchAny(materialize('fdkmtqmxnegwvnjhghjq'), ['vynkybvdmhgeezybbdqfrukibisj', 'knazzamgjjpavwhvdkwigykh', 'peumnifrmdhhmrqqnemw', 'lmsnyvqoisinlaqobxojlwfbi', 'oqwfzs', 'dymudxxeodwjpgbibnkvr', 'vomtfsnizkplgzktqyoiw', 'yoyfuhlpgrzds', 'cefao', 'gi', 'srpgxfjwl', 'etsjusdeiwbfe', 'ikvtzdopxo', 'ljfkavrau', 'soqdhxtenfrkmeic', 'ktprjwfcelzbup', 'pcvuoddqwsaurcqdtjfnczekwni', 'agkqkqxkfbkfgyqliahsljim']) from system.numbers limit 10;
diff --git a/tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree_long.sql b/tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree_long.sql
index 1e04679e1f3..e6ca25a3dd6 100644
--- a/tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree_long.sql
+++ b/tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 ----- Group of very similar simple tests ------
 select '----HORIZONTAL MERGE TESTS----';
 DROP TABLE IF EXISTS zero_rows_per_granule1;
diff --git a/tests/queries/0_stateless/00927_asof_join_long.sql b/tests/queries/0_stateless/00927_asof_join_long.sql
index eb6eabfa4b9..c03a06d48d4 100644
--- a/tests/queries/0_stateless/00927_asof_join_long.sql
+++ b/tests/queries/0_stateless/00927_asof_join_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS tvs;
 
 CREATE TABLE tvs(k UInt32, t UInt32, tv UInt64) ENGINE = Memory;
diff --git a/tests/queries/0_stateless/00927_disable_hyperscan.sql b/tests/queries/0_stateless/00927_disable_hyperscan.sql
index 009ed2629a8..9f0f6ca1538 100644
--- a/tests/queries/0_stateless/00927_disable_hyperscan.sql
+++ b/tests/queries/0_stateless/00927_disable_hyperscan.sql
@@ -1,3 +1,5 @@
+-- Tags: no-debug
+
 SET allow_hyperscan = 1;
 SELECT multiMatchAny(arrayJoin(['hello', 'world', 'hellllllllo', 'wororld', 'abc']), ['hel+o', 'w(or)*ld']);
 SET allow_hyperscan = 0;
diff --git a/tests/queries/0_stateless/00929_multi_match_edit_distance.sql b/tests/queries/0_stateless/00929_multi_match_edit_distance.sql
index 50f2359a685..176e2a24b28 100644
--- a/tests/queries/0_stateless/00929_multi_match_edit_distance.sql
+++ b/tests/queries/0_stateless/00929_multi_match_edit_distance.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Hyperscan
+
 SET send_logs_level = 'fatal';
 
 select 0 = multiFuzzyMatchAny('abc', 0, ['a1c']) from system.numbers limit 5;
diff --git a/tests/queries/0_stateless/00933_alter_ttl.sql b/tests/queries/0_stateless/00933_alter_ttl.sql
index f3f6858cbb4..4f586bb20fa 100644
--- a/tests/queries/0_stateless/00933_alter_ttl.sql
+++ b/tests/queries/0_stateless/00933_alter_ttl.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 set send_logs_level = 'fatal';
 
 drop table if exists ttl;
diff --git a/tests/queries/0_stateless/00933_reserved_word.sql b/tests/queries/0_stateless/00933_reserved_word.sql
index 447a618bfc9..3a26bc6ac98 100644
--- a/tests/queries/0_stateless/00933_reserved_word.sql
+++ b/tests/queries/0_stateless/00933_reserved_word.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS reserved_word_table;
 CREATE TABLE reserved_word_table (`index` UInt8) ENGINE = MergeTree ORDER BY `index`;
 
diff --git a/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh b/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh
index 36ac490c80f..df4c5e233e4 100755
--- a/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh
+++ b/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00933_ttl_replicated_zookeeper_long.sql b/tests/queries/0_stateless/00933_ttl_replicated_zookeeper_long.sql
index 6085545dc02..1728cc7458e 100644
--- a/tests/queries/0_stateless/00933_ttl_replicated_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00933_ttl_replicated_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 DROP TABLE IF EXISTS ttl_repl1;
 DROP TABLE IF EXISTS ttl_repl2;
 
diff --git a/tests/queries/0_stateless/00933_ttl_with_default.sql b/tests/queries/0_stateless/00933_ttl_with_default.sql
index e6c0a6e700c..5504e33235c 100644
--- a/tests/queries/0_stateless/00933_ttl_with_default.sql
+++ b/tests/queries/0_stateless/00933_ttl_with_default.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists ttl_00933_2;
 
 create table ttl_00933_2 (d DateTime, a Int default 111 ttl d + interval 1 DAY) engine = MergeTree order by tuple() partition by toDayOfMonth(d);
diff --git a/tests/queries/0_stateless/00938_fix_rwlock_segfault_long.sh b/tests/queries/0_stateless/00938_fix_rwlock_segfault_long.sh
index 01519f7a598..795f41528b2 100755
--- a/tests/queries/0_stateless/00938_fix_rwlock_segfault_long.sh
+++ b/tests/queries/0_stateless/00938_fix_rwlock_segfault_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 # Test fix for issue #5066
 
diff --git a/tests/queries/0_stateless/00941_system_columns_race_condition.sh b/tests/queries/0_stateless/00941_system_columns_race_condition.sh
index 1b34abc50d7..69dfb30cd2c 100755
--- a/tests/queries/0_stateless/00941_system_columns_race_condition.sh
+++ b/tests/queries/0_stateless/00941_system_columns_race_condition.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 # Test fix for issue #5066
 
diff --git a/tests/queries/0_stateless/00950_dict_get.sql b/tests/queries/0_stateless/00950_dict_get.sql
index e49e05fbd27..28f517a73cb 100644
--- a/tests/queries/0_stateless/00950_dict_get.sql
+++ b/tests/queries/0_stateless/00950_dict_get.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- Must use `system` database and these tables - they're configured in tests/*_dictionary.xml
 use system;
 drop table if exists ints;
diff --git a/tests/queries/0_stateless/00952_insert_into_distributed_with_materialized_column.sql b/tests/queries/0_stateless/00952_insert_into_distributed_with_materialized_column.sql
index 641e942bb8f..3a9a9154abe 100644
--- a/tests/queries/0_stateless/00952_insert_into_distributed_with_materialized_column.sql
+++ b/tests/queries/0_stateless/00952_insert_into_distributed_with_materialized_column.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS local_00952;
 DROP TABLE IF EXISTS distributed_00952;
 
diff --git a/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh b/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh
index ca3f4efe743..0705c955d60 100755
--- a/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh
+++ b/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-replicated-database
+# Tag no-replicated-database: Requires investigation
 
 set -e
 
diff --git a/tests/queries/0_stateless/00954_client_prepared_statements.sh b/tests/queries/0_stateless/00954_client_prepared_statements.sh
index 460b0d44943..7b74d792586 100755
--- a/tests/queries/0_stateless/00954_client_prepared_statements.sh
+++ b/tests/queries/0_stateless/00954_client_prepared_statements.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00955_test_final_mark.sql b/tests/queries/0_stateless/00955_test_final_mark.sql
index e020f10b71a..3c92d96e9a9 100644
--- a/tests/queries/0_stateless/00955_test_final_mark.sql
+++ b/tests/queries/0_stateless/00955_test_final_mark.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database, no-parallel
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS mt_with_pk;
diff --git a/tests/queries/0_stateless/00955_test_final_mark_use.sh b/tests/queries/0_stateless/00955_test_final_mark_use.sh
index 3c7db3249b3..8642011b670 100755
--- a/tests/queries/0_stateless/00955_test_final_mark_use.sh
+++ b/tests/queries/0_stateless/00955_test_final_mark_use.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database, no-parallel
+# Tag no-replicated-database: Unsupported type of ALTER query
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00960_live_view_watch_events_live.py b/tests/queries/0_stateless/00960_live_view_watch_events_live.py
index 780c31f20ca..9327bc59f80 100755
--- a/tests/queries/0_stateless/00960_live_view_watch_events_live.py
+++ b/tests/queries/0_stateless/00960_live_view_watch_events_live.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00961_temporary_live_view_watch.sql b/tests/queries/0_stateless/00961_temporary_live_view_watch.sql
index c33fa699321..8bf6fa5e07b 100644
--- a/tests/queries/0_stateless/00961_temporary_live_view_watch.sql
+++ b/tests/queries/0_stateless/00961_temporary_live_view_watch.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00962_live_view_periodic_refresh.py b/tests/queries/0_stateless/00962_live_view_periodic_refresh.py
index 27308548452..5dd357a314a 100755
--- a/tests/queries/0_stateless/00962_live_view_periodic_refresh.py
+++ b/tests/queries/0_stateless/00962_live_view_periodic_refresh.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.py b/tests/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.py
index 76b9980d1f5..95b5530436d 100755
--- a/tests/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.py
+++ b/tests/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import time
diff --git a/tests/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.py b/tests/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.py
index 34d5db676f4..57cb57d03c5 100755
--- a/tests/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.py
+++ b/tests/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00962_temporary_live_view_watch_live.py b/tests/queries/0_stateless/00962_temporary_live_view_watch_live.py
index 073c8c88e2b..98d65b47d39 100755
--- a/tests/queries/0_stateless/00962_temporary_live_view_watch_live.py
+++ b/tests/queries/0_stateless/00962_temporary_live_view_watch_live.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00963_temporary_live_view_watch_live_timeout.py.disabled b/tests/queries/0_stateless/00963_temporary_live_view_watch_live_timeout.py.disabled
index cfd218d5983..0b6ac65e77c 100755
--- a/tests/queries/0_stateless/00963_temporary_live_view_watch_live_timeout.py.disabled
+++ b/tests/queries/0_stateless/00963_temporary_live_view_watch_live_timeout.py.disabled
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00964_live_view_watch_events_heartbeat.py b/tests/queries/0_stateless/00964_live_view_watch_events_heartbeat.py
index 03b598fe46f..c352004078b 100755
--- a/tests/queries/0_stateless/00964_live_view_watch_events_heartbeat.py
+++ b/tests/queries/0_stateless/00964_live_view_watch_events_heartbeat.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00965_live_view_watch_heartbeat.py b/tests/queries/0_stateless/00965_live_view_watch_heartbeat.py
index 15c4e763634..c1c14e8615b 100755
--- a/tests/queries/0_stateless/00965_live_view_watch_heartbeat.py
+++ b/tests/queries/0_stateless/00965_live_view_watch_heartbeat.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00965_shard_unresolvable_addresses.sql b/tests/queries/0_stateless/00965_shard_unresolvable_addresses.sql
index 7026466fbab..0d82519e4d3 100644
--- a/tests/queries/0_stateless/00965_shard_unresolvable_addresses.sql
+++ b/tests/queries/0_stateless/00965_shard_unresolvable_addresses.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT count() FROM remote('127.0.0.1,localhos', system.one); -- { serverError 198 }
 SELECT count() FROM remote('127.0.0.1|localhos', system.one);
 
diff --git a/tests/queries/0_stateless/00966_invalid_json_must_not_parse.sql b/tests/queries/0_stateless/00966_invalid_json_must_not_parse.sql
index 0e7fa55dbae..ca8d6ace69a 100644
--- a/tests/queries/0_stateless/00966_invalid_json_must_not_parse.sql
+++ b/tests/queries/0_stateless/00966_invalid_json_must_not_parse.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SET allow_simdjson=1;
 
 SELECT JSONLength('"HX-=');
diff --git a/tests/queries/0_stateless/00966_live_view_watch_events_http.py b/tests/queries/0_stateless/00966_live_view_watch_events_http.py
index 1c00a5d1236..dcbae5498bf 100755
--- a/tests/queries/0_stateless/00966_live_view_watch_events_http.py
+++ b/tests/queries/0_stateless/00966_live_view_watch_events_http.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 
diff --git a/tests/queries/0_stateless/00967_insert_into_distributed_different_types.sql b/tests/queries/0_stateless/00967_insert_into_distributed_different_types.sql
index 3b562801f92..b59b0b144f0 100644
--- a/tests/queries/0_stateless/00967_insert_into_distributed_different_types.sql
+++ b/tests/queries/0_stateless/00967_insert_into_distributed_different_types.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 set insert_distributed_sync=1;
 
 DROP TABLE IF EXISTS dist_00967;
diff --git a/tests/queries/0_stateless/00967_live_view_watch_http.py b/tests/queries/0_stateless/00967_live_view_watch_http.py
index c41b9f0c861..05d7905e8ed 100755
--- a/tests/queries/0_stateless/00967_live_view_watch_http.py
+++ b/tests/queries/0_stateless/00967_live_view_watch_http.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 
diff --git a/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.sql b/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.sql
index eef27ba4999..77b0f37e10f 100644
--- a/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.sql
+++ b/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.sql b/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.sql
index c890cc28dc6..2d5d5f48b34 100644
--- a/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.sql
+++ b/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py b/tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py
index 76e5cdbe88d..fbd7660bafe 100755
--- a/tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py
+++ b/tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 
diff --git a/tests/queries/0_stateless/00971_live_view_watch_http_heartbeat.py b/tests/queries/0_stateless/00971_live_view_watch_http_heartbeat.py
index 5da36ab2d5f..db5e1698a10 100755
--- a/tests/queries/0_stateless/00971_live_view_watch_http_heartbeat.py
+++ b/tests/queries/0_stateless/00971_live_view_watch_http_heartbeat.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 
diff --git a/tests/queries/0_stateless/00972_live_view_select_1.sql b/tests/queries/0_stateless/00972_live_view_select_1.sql
index 2034d699065..20344466856 100644
--- a/tests/queries/0_stateless/00972_live_view_select_1.sql
+++ b/tests/queries/0_stateless/00972_live_view_select_1.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_select.sql b/tests/queries/0_stateless/00973_live_view_select.sql
index f51c2071fc7..0844c730b26 100644
--- a/tests/queries/0_stateless/00973_live_view_select.sql
+++ b/tests/queries/0_stateless/00973_live_view_select.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_select_prewhere.sql b/tests/queries/0_stateless/00973_live_view_select_prewhere.sql
index df3b7cb505a..d0d27464618 100644
--- a/tests/queries/0_stateless/00973_live_view_select_prewhere.sql
+++ b/tests/queries/0_stateless/00973_live_view_select_prewhere.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select.sql
index 7ec992e63e7..9d644f245f6 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_join.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_join.sql
index 4045f6c8434..562e6df1bfd 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_join.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_join.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.sql
index 1c0e779123d..60078ccff30 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested.sql
index 75e42f76ac4..700de5955f9 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.sql
index ea70d8f27b7..3a9408a62fa 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.sql
index 10a33a18b61..c0f218edbd8 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.sql
index 9094f923350..2d7da9d6df5 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.sql
index 069889f210e..bdf74949f57 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.sql
index 286d0db6102..a80af3e3337 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00974_distributed_join_on.sql b/tests/queries/0_stateless/00974_distributed_join_on.sql
index 355d9f81e82..2138fb0900f 100644
--- a/tests/queries/0_stateless/00974_distributed_join_on.sql
+++ b/tests/queries/0_stateless/00974_distributed_join_on.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS source_table1;
 DROP TABLE IF EXISTS source_table2;
 DROP TABLE IF EXISTS distributed_table1;
diff --git a/tests/queries/0_stateless/00974_live_view_select_with_aggregation.sql b/tests/queries/0_stateless/00974_live_view_select_with_aggregation.sql
index c4e7829b7dd..09eea37de60 100644
--- a/tests/queries/0_stateless/00974_live_view_select_with_aggregation.sql
+++ b/tests/queries/0_stateless/00974_live_view_select_with_aggregation.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00974_query_profiler.sql b/tests/queries/0_stateless/00974_query_profiler.sql
index 9bfd44628c9..343a8a4dbf3 100644
--- a/tests/queries/0_stateless/00974_query_profiler.sql
+++ b/tests/queries/0_stateless/00974_query_profiler.sql
@@ -1,3 +1,6 @@
+-- Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-unbundled, no-fasttest
+-- Tag no-fasttest: Not sure why fail even in sequential mode. Disabled for now to make some progress.
+
 SET allow_introspection_functions = 1;
 
 SET query_profiler_real_time_period_ns = 100000000;
diff --git a/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.sh b/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.sh
index 22c404c7712..5ad4007b873 100755
--- a/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.sh
+++ b/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, replica
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00975_json_hang.sql b/tests/queries/0_stateless/00975_json_hang.sql
index d60411cb796..71d921f0475 100644
--- a/tests/queries/0_stateless/00975_json_hang.sql
+++ b/tests/queries/0_stateless/00975_json_hang.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT DISTINCT JSONExtractRaw(concat('{"x":', rand() % 2 ? 'true' : 'false', '}'), 'x') AS res FROM numbers(1000000) ORDER BY res;
diff --git a/tests/queries/0_stateless/00975_live_view_create.sql b/tests/queries/0_stateless/00975_live_view_create.sql
index aa567f6a07f..1e7eb674bcc 100644
--- a/tests/queries/0_stateless/00975_live_view_create.sql
+++ b/tests/queries/0_stateless/00975_live_view_create.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS mt;
diff --git a/tests/queries/0_stateless/00975_sample_prewhere_distributed.sql b/tests/queries/0_stateless/00975_sample_prewhere_distributed.sql
index a35260615c1..15e12c4ce81 100644
--- a/tests/queries/0_stateless/00975_sample_prewhere_distributed.sql
+++ b/tests/queries/0_stateless/00975_sample_prewhere_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 create table if not exists sample_prewhere (date Date, id Int32, time Int64) engine = MergeTree partition by date order by (id, time, intHash64(time)) sample by intHash64(time);
 
 insert into sample_prewhere values ('2019-01-01', 2, toDateTime('2019-07-20 00:00:01'));
diff --git a/tests/queries/0_stateless/00976_live_view_select_version.sql b/tests/queries/0_stateless/00976_live_view_select_version.sql
index e9538b2e592..39ca587a49f 100644
--- a/tests/queries/0_stateless/00976_live_view_select_version.sql
+++ b/tests/queries/0_stateless/00976_live_view_select_version.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00976_shard_low_cardinality_achimbab.sql b/tests/queries/0_stateless/00976_shard_low_cardinality_achimbab.sql
index 3736be891cd..945292c5432 100644
--- a/tests/queries/0_stateless/00976_shard_low_cardinality_achimbab.sql
+++ b/tests/queries/0_stateless/00976_shard_low_cardinality_achimbab.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS han_1;
 CREATE TABLE han_1 (k Int32, date_dt LowCardinality(Nullable(String))) 
 ENGINE = MergeTree() PARTITION BY k ORDER BY k;
diff --git a/tests/queries/0_stateless/00976_ttl_with_old_parts.sql b/tests/queries/0_stateless/00976_ttl_with_old_parts.sql
index 60151595983..8473a69aedd 100644
--- a/tests/queries/0_stateless/00976_ttl_with_old_parts.sql
+++ b/tests/queries/0_stateless/00976_ttl_with_old_parts.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists ttl;
 
 create table ttl (d Date, a Int) engine = MergeTree order by a partition by toDayOfMonth(d) settings remove_empty_parts = 0;
diff --git a/tests/queries/0_stateless/00977_live_view_watch_events.sql b/tests/queries/0_stateless/00977_live_view_watch_events.sql
index 926f6637ec5..3fe395b45fa 100644
--- a/tests/queries/0_stateless/00977_live_view_watch_events.sql
+++ b/tests/queries/0_stateless/00977_live_view_watch_events.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00978_live_view_watch.sql b/tests/queries/0_stateless/00978_live_view_watch.sql
index e2367fc8900..a76b8aef0d0 100644
--- a/tests/queries/0_stateless/00978_live_view_watch.sql
+++ b/tests/queries/0_stateless/00978_live_view_watch.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py b/tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py
index 5f5f4d7a960..81e2764d64f 100755
--- a/tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py
+++ b/tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00979_live_view_watch_live.py b/tests/queries/0_stateless/00979_live_view_watch_live.py
index 2fc70352dbf..7bbae932da7 100755
--- a/tests/queries/0_stateless/00979_live_view_watch_live.py
+++ b/tests/queries/0_stateless/00979_live_view_watch_live.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00979_live_view_watch_live_moving_avg.py.disabled b/tests/queries/0_stateless/00979_live_view_watch_live_moving_avg.py.disabled
index 54f9ef694d6..f545186d262 100755
--- a/tests/queries/0_stateless/00979_live_view_watch_live_moving_avg.py.disabled
+++ b/tests/queries/0_stateless/00979_live_view_watch_live_moving_avg.py.disabled
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00979_live_view_watch_live_with_subquery.py b/tests/queries/0_stateless/00979_live_view_watch_live_with_subquery.py
index 2918bed82e8..ed2fe61f4b7 100755
--- a/tests/queries/0_stateless/00979_live_view_watch_live_with_subquery.py
+++ b/tests/queries/0_stateless/00979_live_view_watch_live_with_subquery.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00980_alter_settings_race.sh b/tests/queries/0_stateless/00980_alter_settings_race.sh
index 004504b1227..6eb1df8964c 100755
--- a/tests/queries/0_stateless/00980_alter_settings_race.sh
+++ b/tests/queries/0_stateless/00980_alter_settings_race.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, no-debug
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00980_create_temporary_live_view.sql b/tests/queries/0_stateless/00980_create_temporary_live_view.sql
index 2dda5231e73..e01a6d9643e 100644
--- a/tests/queries/0_stateless/00980_create_temporary_live_view.sql
+++ b/tests/queries/0_stateless/00980_create_temporary_live_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00980_merge_alter_settings.sql b/tests/queries/0_stateless/00980_merge_alter_settings.sql
index 755983ac62b..c0d18f6d453 100644
--- a/tests/queries/0_stateless/00980_merge_alter_settings.sql
+++ b/tests/queries/0_stateless/00980_merge_alter_settings.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database, no-parallel
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS log_for_alter;
 
 CREATE TABLE log_for_alter (
diff --git a/tests/queries/0_stateless/00980_shard_aggregation_state_deserialization.sql b/tests/queries/0_stateless/00980_shard_aggregation_state_deserialization.sql
index 06f0dcab55b..786e8c5d7e0 100644
--- a/tests/queries/0_stateless/00980_shard_aggregation_state_deserialization.sql
+++ b/tests/queries/0_stateless/00980_shard_aggregation_state_deserialization.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS numbers500k;
 CREATE VIEW numbers500k AS SELECT number FROM system.numbers LIMIT 500000;
 
diff --git a/tests/queries/0_stateless/00980_skip_unused_shards_without_sharding_key.sql b/tests/queries/0_stateless/00980_skip_unused_shards_without_sharding_key.sql
index cccc4a81038..bdabfc7b5f0 100644
--- a/tests/queries/0_stateless/00980_skip_unused_shards_without_sharding_key.sql
+++ b/tests/queries/0_stateless/00980_skip_unused_shards_without_sharding_key.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS t_local;
 DROP TABLE IF EXISTS t_distr;
 
diff --git a/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql b/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql
index 25516f577ec..dfb91eb3b0a 100644
--- a/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql
+++ b/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql
@@ -1,3 +1,6 @@
+-- Tags: zookeeper, no-replicated-database, no-parallel
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS replicated_table_for_alter1;
 DROP TABLE IF EXISTS replicated_table_for_alter2;
 
diff --git a/tests/queries/0_stateless/00981_topK_topKWeighted_long.sql b/tests/queries/0_stateless/00981_topK_topKWeighted_long.sql
index 5758f8ab8e5..48d9dedc61c 100644
--- a/tests/queries/0_stateless/00981_topK_topKWeighted_long.sql
+++ b/tests/queries/0_stateless/00981_topK_topKWeighted_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS topk;
 
 CREATE TABLE topk (val1 String, val2 UInt32) ENGINE = MergeTree ORDER BY val1;
diff --git a/tests/queries/0_stateless/00987_distributed_stack_overflow.sql b/tests/queries/0_stateless/00987_distributed_stack_overflow.sql
index 1ef7c543252..2749827c880 100644
--- a/tests/queries/0_stateless/00987_distributed_stack_overflow.sql
+++ b/tests/queries/0_stateless/00987_distributed_stack_overflow.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS distr0;
 DROP TABLE IF EXISTS distr1;
 DROP TABLE IF EXISTS distr2;
diff --git a/tests/queries/0_stateless/00988_constraints_replication_zookeeper_long.sql b/tests/queries/0_stateless/00988_constraints_replication_zookeeper_long.sql
index c36bee7fe4f..0bcde52d3d6 100644
--- a/tests/queries/0_stateless/00988_constraints_replication_zookeeper_long.sql
+++ b/tests/queries/0_stateless/00988_constraints_replication_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 DROP TABLE IF EXISTS replicated_constraints1;
 DROP TABLE IF EXISTS replicated_constraints2;
 
diff --git a/tests/queries/0_stateless/00989_parallel_parts_loading.sql b/tests/queries/0_stateless/00989_parallel_parts_loading.sql
index 0b4c0501669..13cd56e1924 100644
--- a/tests/queries/0_stateless/00989_parallel_parts_loading.sql
+++ b/tests/queries/0_stateless/00989_parallel_parts_loading.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS mt;
 
 CREATE TABLE mt (x UInt64) ENGINE = MergeTree ORDER BY x SETTINGS max_part_loading_threads = 16, parts_to_delay_insert = 100000, parts_to_throw_insert = 100000;
diff --git a/tests/queries/0_stateless/00991_live_view_watch_event_live.sh.disabled b/tests/queries/0_stateless/00991_live_view_watch_event_live.sh.disabled
index 0548d24a80b..92cc5b10e6b 100755
--- a/tests/queries/0_stateless/00991_live_view_watch_event_live.sh.disabled
+++ b/tests/queries/0_stateless/00991_live_view_watch_event_live.sh.disabled
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . $CURDIR/../shell_config.sh
diff --git a/tests/queries/0_stateless/00991_live_view_watch_http.sh.disabled b/tests/queries/0_stateless/00991_live_view_watch_http.sh.disabled
index d441ab94473..abb1a94371d 100755
--- a/tests/queries/0_stateless/00991_live_view_watch_http.sh.disabled
+++ b/tests/queries/0_stateless/00991_live_view_watch_http.sh.disabled
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . $CURDIR/../shell_config.sh
diff --git a/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh b/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh
index f1b12a319c0..8243c6bde62 100755
--- a/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh
+++ b/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 # This test is disabled because it triggers internal assert in Thread Sanitizer.
 # Thread Sanitizer does not support for more than 64 mutexes to be locked in a single thread.
diff --git a/tests/queries/0_stateless/00991_temporary_live_view_watch_events_heartbeat.sh.disabled b/tests/queries/0_stateless/00991_temporary_live_view_watch_events_heartbeat.sh.disabled
index ebe492fafce..97c6c92b999 100755
--- a/tests/queries/0_stateless/00991_temporary_live_view_watch_events_heartbeat.sh.disabled
+++ b/tests/queries/0_stateless/00991_temporary_live_view_watch_events_heartbeat.sh.disabled
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . $CURDIR/../shell_config.sh
diff --git a/tests/queries/0_stateless/00991_temporary_live_view_watch_live.sh.disabled b/tests/queries/0_stateless/00991_temporary_live_view_watch_live.sh.disabled
index 91efff53abe..2e784223186 100755
--- a/tests/queries/0_stateless/00991_temporary_live_view_watch_live.sh.disabled
+++ b/tests/queries/0_stateless/00991_temporary_live_view_watch_live.sh.disabled
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . $CURDIR/../shell_config.sh
diff --git a/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh b/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
index 19f72120912..273b39961af 100755
--- a/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
+++ b/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh b/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
index bdad08fb0e1..72d3cbaa2f1 100755
--- a/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
+++ b/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01000_unneeded_substitutions_client.sh b/tests/queries/0_stateless/01000_unneeded_substitutions_client.sh
index f20a0d8d3bd..93e0b0bc0cc 100755
--- a/tests/queries/0_stateless/01000_unneeded_substitutions_client.sh
+++ b/tests/queries/0_stateless/01000_unneeded_substitutions_client.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01001_rename_merge_race_condition.sh b/tests/queries/0_stateless/01001_rename_merge_race_condition.sh
index 5aeea34e7c1..253d06c038c 100755
--- a/tests/queries/0_stateless/01001_rename_merge_race_condition.sh
+++ b/tests/queries/0_stateless/01001_rename_merge_race_condition.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.sh b/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.sh
index d2766a14c24..b29a42a7356 100755
--- a/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.sh
+++ b/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01003_kill_query_race_condition.sh b/tests/queries/0_stateless/01003_kill_query_race_condition.sh
index 2d21aabf91a..934d18d2670 100755
--- a/tests/queries/0_stateless/01003_kill_query_race_condition.sh
+++ b/tests/queries/0_stateless/01003_kill_query_race_condition.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01004_rename_deadlock.sh b/tests/queries/0_stateless/01004_rename_deadlock.sh
index 2bde9256bba..f0adf136e94 100755
--- a/tests/queries/0_stateless/01004_rename_deadlock.sh
+++ b/tests/queries/0_stateless/01004_rename_deadlock.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01005_rwr_shard_deadlock.sh b/tests/queries/0_stateless/01005_rwr_shard_deadlock.sh
index 5c2ca22715d..ef352606b69 100755
--- a/tests/queries/0_stateless/01005_rwr_shard_deadlock.sh
+++ b/tests/queries/0_stateless/01005_rwr_shard_deadlock.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock, shard
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.sh b/tests/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.sh
index 8936d8da775..9f4b2241732 100755
--- a/tests/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.sh
+++ b/tests/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01009_global_array_join_names.sql b/tests/queries/0_stateless/01009_global_array_join_names.sql
index f3cbd0cf44d..26e7c68ed1b 100644
--- a/tests/queries/0_stateless/01009_global_array_join_names.sql
+++ b/tests/queries/0_stateless/01009_global_array_join_names.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 DROP TABLE IF EXISTS test1;
 DROP TABLE IF EXISTS test2;
 
diff --git a/tests/queries/0_stateless/01010_pmj_right_table_memory_limits.sql b/tests/queries/0_stateless/01010_pmj_right_table_memory_limits.sql
index 2c5f0ef6d99..af747c93678 100644
--- a/tests/queries/0_stateless/01010_pmj_right_table_memory_limits.sql
+++ b/tests/queries/0_stateless/01010_pmj_right_table_memory_limits.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 SET max_memory_usage = 32000000;
 SET join_on_disk_max_files_to_merge = 4;
 
diff --git a/tests/queries/0_stateless/01012_serialize_array_memory_usage.sql b/tests/queries/0_stateless/01012_serialize_array_memory_usage.sql
index b20f86ea7e0..eaee502f0a0 100644
--- a/tests/queries/0_stateless/01012_serialize_array_memory_usage.sql
+++ b/tests/queries/0_stateless/01012_serialize_array_memory_usage.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database
+
 -- serialization of big arrays shouldn't use too much memory
 set max_memory_usage = 300000000;
 select ignore(x) from (select groupArray(number) x from numbers(3355443)) group by x format Null;
diff --git a/tests/queries/0_stateless/01012_show_tables_limit.sql b/tests/queries/0_stateless/01012_show_tables_limit.sql
index f75ba88cf2b..82cde6917d0 100644
--- a/tests/queries/0_stateless/01012_show_tables_limit.sql
+++ b/tests/queries/0_stateless/01012_show_tables_limit.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_show_limit;
 
 CREATE DATABASE test_show_limit;
diff --git a/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh b/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh
index 89b178a38ea..55bbfb3ff11 100755
--- a/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh
+++ b/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: replica, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01014_lazy_database_basic.sh b/tests/queries/0_stateless/01014_lazy_database_basic.sh
index 11d698e764e..496e9754089 100755
--- a/tests/queries/0_stateless/01014_lazy_database_basic.sh
+++ b/tests/queries/0_stateless/01014_lazy_database_basic.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh b/tests/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh
index 1970dfe490c..44a27ea08f4 100755
--- a/tests/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh
+++ b/tests/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01015_attach_part.sql b/tests/queries/0_stateless/01015_attach_part.sql
index 290b5eb967f..3d2058f757e 100644
--- a/tests/queries/0_stateless/01015_attach_part.sql
+++ b/tests/queries/0_stateless/01015_attach_part.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database, no-parallel
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS table_01;
 
 CREATE TABLE table_01 (
diff --git a/tests/queries/0_stateless/01015_database_bad_tables.sql b/tests/queries/0_stateless/01015_database_bad_tables.sql
index 458cc597a67..5931b3b6fa5 100644
--- a/tests/queries/0_stateless/01015_database_bad_tables.sql
+++ b/tests/queries/0_stateless/01015_database_bad_tables.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS testlazy;
 
 CREATE TABLE `таблица_со_странным_названием` (a UInt64, b UInt64) ENGINE = Log;
diff --git a/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh b/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh
index a10e5fb2788..e09a8493bb8 100755
--- a/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh
+++ b/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01017_uniqCombined_memory_usage.sql b/tests/queries/0_stateless/01017_uniqCombined_memory_usage.sql
index 2ad1edae733..d47dc6b8d5f 100644
--- a/tests/queries/0_stateless/01017_uniqCombined_memory_usage.sql
+++ b/tests/queries/0_stateless/01017_uniqCombined_memory_usage.sql
@@ -1,3 +1,8 @@
+-- Tags: no-tsan, no-asan, no-msan, no-replicated-database
+-- Tag no-tsan: Fine thresholds on memory usage
+-- Tag no-asan: Fine thresholds on memory usage
+-- Tag no-msan: Fine thresholds on memory usage
+
 -- each uniqCombined state should not use > sizeof(HLL) in memory,
 -- sizeof(HLL) is (2^K * 6 / 8)
 -- hence max_memory_usage for 100 rows = (96<<10)*100 = 9830400
diff --git a/tests/queries/0_stateless/01018_Distributed__shard_num.sql b/tests/queries/0_stateless/01018_Distributed__shard_num.sql
index 7d4aaf42473..be2df8b664f 100644
--- a/tests/queries/0_stateless/01018_Distributed__shard_num.sql
+++ b/tests/queries/0_stateless/01018_Distributed__shard_num.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- make the order static
 SET max_threads = 1;
 
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_bad_queries.sh b/tests/queries/0_stateless/01018_ddl_dictionaries_bad_queries.sh
index 37e9fd774d7..6826ed677db 100755
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_bad_queries.sh
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_bad_queries.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database, no-parallel, no-fasttest
+# Tag no-replicated-database: grep -c
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh b/tests/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh
index 025fe51e2a9..100e79a4546 100755
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_create.sql b/tests/queries/0_stateless/01018_ddl_dictionaries_create.sql
index dd62f1451a8..0c5e0c69ffe 100644
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_create.sql
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_create.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 SET send_logs_level = 'fatal';
 
 DROP DATABASE IF EXISTS database_for_dict_01018;
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_select.sql b/tests/queries/0_stateless/01018_ddl_dictionaries_select.sql
index 229d5d55774..69c8ad2faee 100644
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_select.sql
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_select.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 SET send_logs_level = 'fatal';
 
 DROP DATABASE IF EXISTS database_for_dict;
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_special.sql b/tests/queries/0_stateless/01018_ddl_dictionaries_special.sql
index db3b7f29492..1877c289d3f 100644
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_special.sql
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_special.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 SET send_logs_level = 'fatal';
 
 DROP DATABASE IF EXISTS database_for_dict;
diff --git a/tests/queries/0_stateless/01018_dictionaries_from_dictionaries.sql b/tests/queries/0_stateless/01018_dictionaries_from_dictionaries.sql
index fb34beaca2a..a4a06d44e01 100644
--- a/tests/queries/0_stateless/01018_dictionaries_from_dictionaries.sql
+++ b/tests/queries/0_stateless/01018_dictionaries_from_dictionaries.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 
 DROP DATABASE IF EXISTS database_for_dict;
diff --git a/tests/queries/0_stateless/01018_ip_dictionary_long.sql b/tests/queries/0_stateless/01018_ip_dictionary_long.sql
index 2abd51cc9fe..6e0c9c8d416 100644
--- a/tests/queries/0_stateless/01018_ip_dictionary_long.sql
+++ b/tests/queries/0_stateless/01018_ip_dictionary_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, no-parallel
+
 SET send_logs_level = 'fatal';
 
 DROP DATABASE IF EXISTS database_for_dict;
diff --git a/tests/queries/0_stateless/01019_Buffer_and_max_memory_usage.sql b/tests/queries/0_stateless/01019_Buffer_and_max_memory_usage.sql
index 5833f2592a2..9fbc3f951fe 100644
--- a/tests/queries/0_stateless/01019_Buffer_and_max_memory_usage.sql
+++ b/tests/queries/0_stateless/01019_Buffer_and_max_memory_usage.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database
+
 DROP TABLE IF EXISTS null_;
 DROP TABLE IF EXISTS buffer_;
 DROP TABLE IF EXISTS aggregation_;
diff --git a/tests/queries/0_stateless/01021_only_tuple_columns.sql b/tests/queries/0_stateless/01021_only_tuple_columns.sql
index 27019a67b98..a0be59c3120 100644
--- a/tests/queries/0_stateless/01021_only_tuple_columns.sql
+++ b/tests/queries/0_stateless/01021_only_tuple_columns.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database, no-parallel
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 CREATE TABLE test
 (
     `x` Tuple(UInt64, UInt64)
diff --git a/tests/queries/0_stateless/01023_materialized_view_query_context.sql b/tests/queries/0_stateless/01023_materialized_view_query_context.sql
index 351379d8b14..415690ae1e5 100644
--- a/tests/queries/0_stateless/01023_materialized_view_query_context.sql
+++ b/tests/queries/0_stateless/01023_materialized_view_query_context.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- Create dictionary, since dictGet*() uses DB::Context in executeImpl()
 -- (To cover scope of the Context in DB::PushingToViewsBlockOutputStream::process)
 
diff --git a/tests/queries/0_stateless/01030_storage_hdfs_syntax.sql b/tests/queries/0_stateless/01030_storage_hdfs_syntax.sql
index 807889a935a..bfedcc56496 100644
--- a/tests/queries/0_stateless/01030_storage_hdfs_syntax.sql
+++ b/tests/queries/0_stateless/01030_storage_hdfs_syntax.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 drop table if exists test_table_hdfs_syntax
 ;
 create table test_table_hdfs_syntax (id UInt32) ENGINE = HDFS('')
diff --git a/tests/queries/0_stateless/01031_mutations_interpreter_and_context.sh b/tests/queries/0_stateless/01031_mutations_interpreter_and_context.sh
index 9bc9028ad1f..8c172049745 100755
--- a/tests/queries/0_stateless/01031_mutations_interpreter_and_context.sh
+++ b/tests/queries/0_stateless/01031_mutations_interpreter_and_context.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01033_dictionaries_lifetime.sql b/tests/queries/0_stateless/01033_dictionaries_lifetime.sql
index 40482cd9f7b..299931bdeb3 100644
--- a/tests/queries/0_stateless/01033_dictionaries_lifetime.sql
+++ b/tests/queries/0_stateless/01033_dictionaries_lifetime.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 
 DROP DATABASE IF EXISTS database_for_dict;
diff --git a/tests/queries/0_stateless/01033_storage_odbc_parsing_exception_check.sql b/tests/queries/0_stateless/01033_storage_odbc_parsing_exception_check.sql
index 7a3d2914111..66c0bb51e8f 100644
--- a/tests/queries/0_stateless/01033_storage_odbc_parsing_exception_check.sql
+++ b/tests/queries/0_stateless/01033_storage_odbc_parsing_exception_check.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 DROP TABLE IF EXISTS BannerDict;
 
 CREATE TABLE BannerDict (`BannerID` UInt64, `CompaignID` UInt64) ENGINE = ODBC('DSN=pgconn;Database=postgres', bannerdict); -- {serverError 42}
diff --git a/tests/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh b/tests/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh
index af4969d77c8..b8b261aefad 100755
--- a/tests/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh
+++ b/tests/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=none
 
diff --git a/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas_distributed.sql b/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas_distributed.sql
index e708b6ec317..4eea4fd47c7 100644
--- a/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas_distributed.sql
+++ b/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: replica, distributed
+
 drop table if exists test_max_parallel_replicas_lr;
 
 -- If you wonder why the table is named with "_lr" suffix in this test.
diff --git a/tests/queries/0_stateless/01034_sample_final_distributed.sql b/tests/queries/0_stateless/01034_sample_final_distributed.sql
index ca03daebe12..b784b35cbb3 100644
--- a/tests/queries/0_stateless/01034_sample_final_distributed.sql
+++ b/tests/queries/0_stateless/01034_sample_final_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 drop table if exists sample_final;
 create table sample_final (CounterID UInt32, EventDate Date, EventTime DateTime, UserID UInt64, Sign Int8) engine = CollapsingMergeTree(Sign) order by (CounterID, EventDate, intHash32(UserID), EventTime) sample by intHash32(UserID);
 insert into sample_final select number / (8192 * 4), toDate('2019-01-01'), toDateTime('2019-01-01 00:00:01') + number, number / (8192 * 2), number % 3 = 1 ? -1 : 1 from numbers(1000000);
diff --git a/tests/queries/0_stateless/01035_avg_weighted_long.sh b/tests/queries/0_stateless/01035_avg_weighted_long.sh
index 30b403e2cc4..138aa03fbb3 100755
--- a/tests/queries/0_stateless/01035_avg_weighted_long.sh
+++ b/tests/queries/0_stateless/01035_avg_weighted_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh b/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh
index 7c15b795c36..16331a49bc4 100755
--- a/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh
+++ b/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database.sql b/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database.sql
index bd01ea704b1..9040d7b3231 100644
--- a/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database.sql
+++ b/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dict_db_01036;
 CREATE DATABASE dict_db_01036;
 
diff --git a/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database_2.sql b/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database_2.sql
index fa0502ac328..bc84bc0687b 100644
--- a/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database_2.sql
+++ b/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database_2.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS `foo 1234`;
 CREATE DATABASE `foo 1234`;
 
diff --git a/tests/queries/0_stateless/01037_polygon_dicts_correctness_all.sh b/tests/queries/0_stateless/01037_polygon_dicts_correctness_all.sh
index f12f35a6af0..fae263b076f 100755
--- a/tests/queries/0_stateless/01037_polygon_dicts_correctness_all.sh
+++ b/tests/queries/0_stateless/01037_polygon_dicts_correctness_all.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-debug, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.sh b/tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.sh
index 876f705703e..ea4389d610c 100755
--- a/tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.sh
+++ b/tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-debug, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01037_polygon_dicts_simple_functions.sh b/tests/queries/0_stateless/01037_polygon_dicts_simple_functions.sh
index 64039d8dd1f..be983ec1be4 100755
--- a/tests/queries/0_stateless/01037_polygon_dicts_simple_functions.sh
+++ b/tests/queries/0_stateless/01037_polygon_dicts_simple_functions.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-debug, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01037_zookeeper_check_table_empty_pk.sql b/tests/queries/0_stateless/01037_zookeeper_check_table_empty_pk.sql
index 262ccecc7d4..703f8824055 100644
--- a/tests/queries/0_stateless/01037_zookeeper_check_table_empty_pk.sql
+++ b/tests/queries/0_stateless/01037_zookeeper_check_table_empty_pk.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 SET check_query_single_value_result = 0;
 SET send_logs_level = 'fatal';
 
diff --git a/tests/queries/0_stateless/01038_dictionary_lifetime_min_zero_sec.sh b/tests/queries/0_stateless/01038_dictionary_lifetime_min_zero_sec.sh
index 036eb3db3f3..1e754dce786 100755
--- a/tests/queries/0_stateless/01038_dictionary_lifetime_min_zero_sec.sh
+++ b/tests/queries/0_stateless/01038_dictionary_lifetime_min_zero_sec.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh b/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh
index 66571f456d9..7d6cc5f1bff 100755
--- a/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh
+++ b/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01040_distributed_directory_monitor_batch_inserts.sql b/tests/queries/0_stateless/01040_distributed_directory_monitor_batch_inserts.sql
index 5e30b6b1a9d..03f6f51daca 100644
--- a/tests/queries/0_stateless/01040_distributed_directory_monitor_batch_inserts.sql
+++ b/tests/queries/0_stateless/01040_distributed_directory_monitor_batch_inserts.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS test_01040;
 DROP TABLE IF EXISTS dist_test_01040;
 
diff --git a/tests/queries/0_stateless/01040_h3_get_resolution.sql b/tests/queries/0_stateless/01040_h3_get_resolution.sql
index 3dc27216333..58c4af184dc 100644
--- a/tests/queries/0_stateless/01040_h3_get_resolution.sql
+++ b/tests/queries/0_stateless/01040_h3_get_resolution.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3GetResolution(581276613233082367);
 SELECT h3GetResolution(621807531097128959);
 SELECT h3GetResolution(644325529233966508);
diff --git a/tests/queries/0_stateless/01041_create_dictionary_if_not_exists.sql b/tests/queries/0_stateless/01041_create_dictionary_if_not_exists.sql
index 3d6586063e9..6b4335d4464 100644
--- a/tests/queries/0_stateless/01041_create_dictionary_if_not_exists.sql
+++ b/tests/queries/0_stateless/01041_create_dictionary_if_not_exists.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS dictdb.table_for_dict;
 DROP DICTIONARY IF EXISTS dictdb.dict_exists;
 DROP DATABASE IF EXISTS dictdb;
diff --git a/tests/queries/0_stateless/01041_h3_is_valid.sql b/tests/queries/0_stateless/01041_h3_is_valid.sql
index 05885561844..f889a294bcc 100644
--- a/tests/queries/0_stateless/01041_h3_is_valid.sql
+++ b/tests/queries/0_stateless/01041_h3_is_valid.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3IsValid(581276613233082367);
 SELECT h3IsValid(621807531097128959);
 SELECT h3IsValid(Cast(0, 'UInt64'));
diff --git a/tests/queries/0_stateless/01042_h3_k_ring.sql b/tests/queries/0_stateless/01042_h3_k_ring.sql
index 35335df7ff2..9e9afae5024 100644
--- a/tests/queries/0_stateless/01042_h3_k_ring.sql
+++ b/tests/queries/0_stateless/01042_h3_k_ring.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT arraySort(h3kRing(581276613233082367, 1));
 SELECT h3kRing(581276613233082367, 0);
 SELECT h3kRing(581276613233082367, -1); -- { serverError 12 }
diff --git a/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh b/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh
index 512d12866c4..f2b30e05040 100755
--- a/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh
+++ b/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01043_dictionary_attribute_properties_values.sql b/tests/queries/0_stateless/01043_dictionary_attribute_properties_values.sql
index 5e150cfed9c..5d629d4e8db 100644
--- a/tests/queries/0_stateless/01043_dictionary_attribute_properties_values.sql
+++ b/tests/queries/0_stateless/01043_dictionary_attribute_properties_values.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dictdb_01043;
 CREATE DATABASE dictdb_01043;
 
diff --git a/tests/queries/0_stateless/01043_h3_edge_length_m.sql b/tests/queries/0_stateless/01043_h3_edge_length_m.sql
index dbc517baa8b..03a5dbb4424 100644
--- a/tests/queries/0_stateless/01043_h3_edge_length_m.sql
+++ b/tests/queries/0_stateless/01043_h3_edge_length_m.sql
@@ -1,2 +1,4 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3EdgeLengthM(1);
 SELECT h3EdgeLengthM(4);
diff --git a/tests/queries/0_stateless/01044_h3_edge_angle.sql b/tests/queries/0_stateless/01044_h3_edge_angle.sql
index a22121971f4..bb87ef20fe3 100644
--- a/tests/queries/0_stateless/01044_h3_edge_angle.sql
+++ b/tests/queries/0_stateless/01044_h3_edge_angle.sql
@@ -1,2 +1,4 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3EdgeAngle(10);
 SELECT h3EdgeLengthM(2) * 180 / pi() / 6371007.180918475 - h3EdgeAngle(2);
diff --git a/tests/queries/0_stateless/01045_dictionaries_restrictions.sql b/tests/queries/0_stateless/01045_dictionaries_restrictions.sql
index 0bc2f6f9f13..d41be7482f8 100644
--- a/tests/queries/0_stateless/01045_dictionaries_restrictions.sql
+++ b/tests/queries/0_stateless/01045_dictionaries_restrictions.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dictdb_01045;
 
 CREATE DATABASE dictdb_01045;
diff --git a/tests/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh b/tests/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh
index 6510fcf408d..a438cf7badc 100755
--- a/tests/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh
+++ b/tests/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01046_materialized_view_with_join_over_distributed.sql b/tests/queries/0_stateless/01046_materialized_view_with_join_over_distributed.sql
index 318f48dc833..8822ec37d66 100644
--- a/tests/queries/0_stateless/01046_materialized_view_with_join_over_distributed.sql
+++ b/tests/queries/0_stateless/01046_materialized_view_with_join_over_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- from https://github.com/ClickHouse/ClickHouse/issues/5142
 
 set insert_distributed_sync = 1;
diff --git a/tests/queries/0_stateless/01046_trivial_count_query_distributed.sql b/tests/queries/0_stateless/01046_trivial_count_query_distributed.sql
index 8bfafe8e963..40dde29d8e5 100644
--- a/tests/queries/0_stateless/01046_trivial_count_query_distributed.sql
+++ b/tests/queries/0_stateless/01046_trivial_count_query_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS test_count;
 
 CREATE TABLE test_count (`pt` Date) ENGINE = MergeTree PARTITION BY pt ORDER BY pt SETTINGS index_granularity = 8192;
diff --git a/tests/queries/0_stateless/01048_exists_query.sql b/tests/queries/0_stateless/01048_exists_query.sql
index 4e642084354..07d3a026c68 100644
--- a/tests/queries/0_stateless/01048_exists_query.sql
+++ b/tests/queries/0_stateless/01048_exists_query.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 EXISTS db_01048.t_01048;
 EXISTS TABLE db_01048.t_01048;
 EXISTS DICTIONARY db_01048.t_01048;
diff --git a/tests/queries/0_stateless/01049_join_low_card_bug_long.sql.j2 b/tests/queries/0_stateless/01049_join_low_card_bug_long.sql.j2
index 93019e7a0ec..b19addfb6be 100644
--- a/tests/queries/0_stateless/01049_join_low_card_bug_long.sql.j2
+++ b/tests/queries/0_stateless/01049_join_low_card_bug_long.sql.j2
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS l;
 DROP TABLE IF EXISTS r;
 DROP TABLE IF EXISTS nl;
diff --git a/tests/queries/0_stateless/01049_zookeeper_synchronous_mutations_long.sql b/tests/queries/0_stateless/01049_zookeeper_synchronous_mutations_long.sql
index 688847b5c59..c77ab50ab8b 100644
--- a/tests/queries/0_stateless/01049_zookeeper_synchronous_mutations_long.sql
+++ b/tests/queries/0_stateless/01049_zookeeper_synchronous_mutations_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS table_for_synchronous_mutations1;
 DROP TABLE IF EXISTS table_for_synchronous_mutations2;
 
diff --git a/tests/queries/0_stateless/01051_system_stack_trace.sql b/tests/queries/0_stateless/01051_system_stack_trace.sql
index 32d344fce7e..e495e2198ea 100644
--- a/tests/queries/0_stateless/01051_system_stack_trace.sql
+++ b/tests/queries/0_stateless/01051_system_stack_trace.sql
@@ -1,2 +1,4 @@
+-- Tags: race
+
 -- at least this query should be present
 SELECT count() > 0 FROM system.stack_trace WHERE query_id != '';
diff --git a/tests/queries/0_stateless/01053_drop_database_mat_view.sql b/tests/queries/0_stateless/01053_drop_database_mat_view.sql
index 9f7438d594e..67a488f7245 100644
--- a/tests/queries/0_stateless/01053_drop_database_mat_view.sql
+++ b/tests/queries/0_stateless/01053_drop_database_mat_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS some_tests;
 CREATE DATABASE some_tests ENGINE=Ordinary; -- Different inner table name with Atomic
 
diff --git a/tests/queries/0_stateless/01053_ssd_dictionary.sh b/tests/queries/0_stateless/01053_ssd_dictionary.sh
index 9cdd391ec5a..dc5002eaf17 100755
--- a/tests/queries/0_stateless/01053_ssd_dictionary.sh
+++ b/tests/queries/0_stateless/01053_ssd_dictionary.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
+# Tag no-fasttest: this test mistakenly requires acces to /var/lib/clickhouse -- can't run this locally, disabled
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01054_cache_dictionary_bunch_update.sh b/tests/queries/0_stateless/01054_cache_dictionary_bunch_update.sh
index 235ed7db362..04b1f8b65ce 100755
--- a/tests/queries/0_stateless/01054_cache_dictionary_bunch_update.sh
+++ b/tests/queries/0_stateless/01054_cache_dictionary_bunch_update.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01054_cache_dictionary_overflow_cell.sql b/tests/queries/0_stateless/01054_cache_dictionary_overflow_cell.sql
index 1b317e2165e..88c59014166 100644
--- a/tests/queries/0_stateless/01054_cache_dictionary_overflow_cell.sql
+++ b/tests/queries/0_stateless/01054_cache_dictionary_overflow_cell.sql
@@ -1,3 +1,4 @@
+-- Tags: no-parallel
 
 create database if not exists test_01054_overflow;
 drop table if exists test_01054_overflow.ints;
diff --git a/tests/queries/0_stateless/01055_compact_parts_1.sql b/tests/queries/0_stateless/01055_compact_parts_1.sql
index c2c2ab041e7..9acd2578025 100644
--- a/tests/queries/0_stateless/01055_compact_parts_1.sql
+++ b/tests/queries/0_stateless/01055_compact_parts_1.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists mt_compact;
 drop table if exists mt_compact_2;
 
diff --git a/tests/queries/0_stateless/01056_create_table_as.sql b/tests/queries/0_stateless/01056_create_table_as.sql
index c27f30b61d5..62db8282ac0 100644
--- a/tests/queries/0_stateless/01056_create_table_as.sql
+++ b/tests/queries/0_stateless/01056_create_table_as.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 DROP TABLE IF EXISTS t3;
diff --git a/tests/queries/0_stateless/01057_http_compression_prefer_brotli.sh b/tests/queries/0_stateless/01057_http_compression_prefer_brotli.sh
index 22ab745d7c0..78ee0ace479 100755
--- a/tests/queries/0_stateless/01057_http_compression_prefer_brotli.sh
+++ b/tests/queries/0_stateless/01057_http_compression_prefer_brotli.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01059_storage_file_compression.sh b/tests/queries/0_stateless/01059_storage_file_compression.sh
index cab7bc2a38c..fbee5070d8d 100755
--- a/tests/queries/0_stateless/01059_storage_file_compression.sh
+++ b/tests/queries/0_stateless/01059_storage_file_compression.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: depends on brotli and bzip2
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01060_avro.sh b/tests/queries/0_stateless/01060_avro.sh
index e735fadf2be..4fca8c196a2 100755
--- a/tests/queries/0_stateless/01060_avro.sh
+++ b/tests/queries/0_stateless/01060_avro.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-parallel, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/01060_shutdown_table_after_detach.sql b/tests/queries/0_stateless/01060_shutdown_table_after_detach.sql
index 1987fffaa58..5e0ed8b298d 100644
--- a/tests/queries/0_stateless/01060_shutdown_table_after_detach.sql
+++ b/tests/queries/0_stateless/01060_shutdown_table_after_detach.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database, no-parallel
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS test;
 CREATE TABLE test Engine = MergeTree ORDER BY number AS SELECT number, toString(rand()) x from numbers(10000000);
 
diff --git a/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper_long.sql b/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper_long.sql
index 53d7100a38e..aba84f43033 100644
--- a/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS test_alter_on_mutation;
 
 CREATE TABLE test_alter_on_mutation
diff --git a/tests/queries/0_stateless/01069_database_memory.sql b/tests/queries/0_stateless/01069_database_memory.sql
index ed006a5ce04..76a98bf544c 100644
--- a/tests/queries/0_stateless/01069_database_memory.sql
+++ b/tests/queries/0_stateless/01069_database_memory.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS memory_01069;
 CREATE DATABASE memory_01069 ENGINE = Memory;
 SHOW CREATE DATABASE memory_01069;
diff --git a/tests/queries/0_stateless/01070_h3_get_base_cell.sql b/tests/queries/0_stateless/01070_h3_get_base_cell.sql
index b06a12daf4a..27a0b1de152 100644
--- a/tests/queries/0_stateless/01070_h3_get_base_cell.sql
+++ b/tests/queries/0_stateless/01070_h3_get_base_cell.sql
@@ -1 +1,3 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3GetBaseCell(612916788725809151);
diff --git a/tests/queries/0_stateless/01070_h3_hex_area_m2.sql b/tests/queries/0_stateless/01070_h3_hex_area_m2.sql
index b282485da77..9ad8beec99c 100644
--- a/tests/queries/0_stateless/01070_h3_hex_area_m2.sql
+++ b/tests/queries/0_stateless/01070_h3_hex_area_m2.sql
@@ -1,2 +1,4 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3HexAreaM2(5);
 SELECT h3HexAreaM2(13);
diff --git a/tests/queries/0_stateless/01070_h3_indexes_are_neighbors.sql b/tests/queries/0_stateless/01070_h3_indexes_are_neighbors.sql
index 52449654b29..6ef2874a962 100644
--- a/tests/queries/0_stateless/01070_h3_indexes_are_neighbors.sql
+++ b/tests/queries/0_stateless/01070_h3_indexes_are_neighbors.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3IndexesAreNeighbors(617420388352917503, 617420388352655359);
 SELECT h3IndexesAreNeighbors(617420388351344639, 617420388352655359);
 SELECT h3IndexesAreNeighbors(617420388351344639, 617420388351344639);
diff --git a/tests/queries/0_stateless/01070_h3_to_children.sql b/tests/queries/0_stateless/01070_h3_to_children.sql
index 647d4cef078..75675489e0c 100644
--- a/tests/queries/0_stateless/01070_h3_to_children.sql
+++ b/tests/queries/0_stateless/01070_h3_to_children.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT arraySort(h3ToChildren(599405990164561919, 3));
 
 SELECT arraySort(h3ToChildren(599405990164561919, 6));
diff --git a/tests/queries/0_stateless/01070_h3_to_parent.sql b/tests/queries/0_stateless/01070_h3_to_parent.sql
index 5052f4b7b92..46d354d8537 100644
--- a/tests/queries/0_stateless/01070_h3_to_parent.sql
+++ b/tests/queries/0_stateless/01070_h3_to_parent.sql
@@ -1,2 +1,4 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3ToParent(599405990164561919, 3);
 SELECT h3ToParent(599405990164561919, 0);
diff --git a/tests/queries/0_stateless/01070_h3_to_string.sql b/tests/queries/0_stateless/01070_h3_to_string.sql
index 358c5ae18d2..05aa3c90d23 100644
--- a/tests/queries/0_stateless/01070_h3_to_string.sql
+++ b/tests/queries/0_stateless/01070_h3_to_string.sql
@@ -1 +1,3 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3ToString(617420388352917503);
diff --git a/tests/queries/0_stateless/01070_materialize_ttl.sql b/tests/queries/0_stateless/01070_materialize_ttl.sql
index 2521ae35edf..b6a03f2ca10 100644
--- a/tests/queries/0_stateless/01070_materialize_ttl.sql
+++ b/tests/queries/0_stateless/01070_materialize_ttl.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists ttl;
 
 create table ttl (d Date, a Int) engine = MergeTree order by a partition by toDayOfMonth(d);
diff --git a/tests/queries/0_stateless/01070_modify_ttl.sql b/tests/queries/0_stateless/01070_modify_ttl.sql
index c2746034a40..0716ccd7043 100644
--- a/tests/queries/0_stateless/01070_modify_ttl.sql
+++ b/tests/queries/0_stateless/01070_modify_ttl.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists ttl;
 
 create table ttl (d Date, a Int) engine = MergeTree order by a partition by toDayOfMonth(d);
diff --git a/tests/queries/0_stateless/01070_modify_ttl_recalc_only.sql b/tests/queries/0_stateless/01070_modify_ttl_recalc_only.sql
index aafed1a7bce..247e412484f 100644
--- a/tests/queries/0_stateless/01070_modify_ttl_recalc_only.sql
+++ b/tests/queries/0_stateless/01070_modify_ttl_recalc_only.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 set mutations_sync = 2;
 
 drop table if exists ttl;
diff --git a/tests/queries/0_stateless/01070_mutations_with_dependencies.sql b/tests/queries/0_stateless/01070_mutations_with_dependencies.sql
index 10077a94c9d..6f297e25b95 100644
--- a/tests/queries/0_stateless/01070_mutations_with_dependencies.sql
+++ b/tests/queries/0_stateless/01070_mutations_with_dependencies.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists ttl;
 set mutations_sync = 2;
 
diff --git a/tests/queries/0_stateless/01070_string_to_h3.sql b/tests/queries/0_stateless/01070_string_to_h3.sql
index 47b02d9f88b..db4a45f3d64 100644
--- a/tests/queries/0_stateless/01070_string_to_h3.sql
+++ b/tests/queries/0_stateless/01070_string_to_h3.sql
@@ -1 +1,3 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT stringToH3('89184926cc3ffff');
diff --git a/tests/queries/0_stateless/01071_force_optimize_skip_unused_shards.sql b/tests/queries/0_stateless/01071_force_optimize_skip_unused_shards.sql
index 33806cc7416..6a43a750b01 100644
--- a/tests/queries/0_stateless/01071_force_optimize_skip_unused_shards.sql
+++ b/tests/queries/0_stateless/01071_force_optimize_skip_unused_shards.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 set optimize_skip_unused_shards=1;
 
 drop table if exists data_01071;
diff --git a/tests/queries/0_stateless/01071_live_view_detach_dependency.sql b/tests/queries/0_stateless/01071_live_view_detach_dependency.sql
index e16b8d67bc7..1caab4ca240 100644
--- a/tests/queries/0_stateless/01071_live_view_detach_dependency.sql
+++ b/tests/queries/0_stateless/01071_live_view_detach_dependency.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 DROP TABLE IF EXISTS test;
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/01071_prohibition_secondary_index_with_old_format_merge_tree.sql b/tests/queries/0_stateless/01071_prohibition_secondary_index_with_old_format_merge_tree.sql
index 4c005f6ba56..bbb607fe89f 100644
--- a/tests/queries/0_stateless/01071_prohibition_secondary_index_with_old_format_merge_tree.sql
+++ b/tests/queries/0_stateless/01071_prohibition_secondary_index_with_old_format_merge_tree.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE TABLE old_syntax_01071_test (date Date, id UInt8) ENGINE = MergeTree(date, id, 8192);
 ALTER TABLE old_syntax_01071_test ADD INDEX  id_minmax id TYPE minmax GRANULARITY 1; -- { serverError 36 }
 CREATE TABLE new_syntax_01071_test (date Date, id UInt8) ENGINE = MergeTree() ORDER BY id;
diff --git a/tests/queries/0_stateless/01072_json_each_row_data_in_square_brackets.sql b/tests/queries/0_stateless/01072_json_each_row_data_in_square_brackets.sql
index 0e4e031a985..f7ccc309c5a 100644
--- a/tests/queries/0_stateless/01072_json_each_row_data_in_square_brackets.sql
+++ b/tests/queries/0_stateless/01072_json_each_row_data_in_square_brackets.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS json_square_brackets;
 CREATE TABLE json_square_brackets (id UInt32, name String) ENGINE = Memory;
 INSERT INTO json_square_brackets FORMAT JSONEachRow [{"id": 1, "name": "name1"}, {"id": 2, "name": "name2"}];
diff --git a/tests/queries/0_stateless/01072_optimize_skip_unused_shards_const_expr_eval.sql b/tests/queries/0_stateless/01072_optimize_skip_unused_shards_const_expr_eval.sql
index e0877d16ca3..ea0da0fe545 100644
--- a/tests/queries/0_stateless/01072_optimize_skip_unused_shards_const_expr_eval.sql
+++ b/tests/queries/0_stateless/01072_optimize_skip_unused_shards_const_expr_eval.sql
@@ -1,3 +1,5 @@
+-- Tags: shard, no-unbundled
+
 drop table if exists data_01072;
 drop table if exists dist_01072;
 
diff --git a/tests/queries/0_stateless/01073_attach_if_not_exists.sql b/tests/queries/0_stateless/01073_attach_if_not_exists.sql
index 8bb52556ccc..8bd356b466c 100644
--- a/tests/queries/0_stateless/01073_attach_if_not_exists.sql
+++ b/tests/queries/0_stateless/01073_attach_if_not_exists.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE TABLE aine (a Int) ENGINE = Log;
 ATTACH TABLE aine; -- { serverError 57 }
 ATTACH TABLE IF NOT EXISTS aine;
diff --git a/tests/queries/0_stateless/01073_show_tables_not_like.sql b/tests/queries/0_stateless/01073_show_tables_not_like.sql
index bdf88449ccb..405a6cb199b 100644
--- a/tests/queries/0_stateless/01073_show_tables_not_like.sql
+++ b/tests/queries/0_stateless/01073_show_tables_not_like.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SHOW TABLES NOT LIKE '%';
 
 DROP DATABASE IF EXISTS test_01073;
diff --git a/tests/queries/0_stateless/01074_h3_range_check.sql b/tests/queries/0_stateless/01074_h3_range_check.sql
index 17b5c5c5b26..42a95229f3f 100644
--- a/tests/queries/0_stateless/01074_h3_range_check.sql
+++ b/tests/queries/0_stateless/01074_h3_range_check.sql
@@ -1,2 +1,4 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3EdgeLengthM(100); -- { serverError 69 }
 SELECT h3HexAreaM2(100); -- { serverError 69 }
diff --git a/tests/queries/0_stateless/01075_allowed_client_hosts.sql b/tests/queries/0_stateless/01075_allowed_client_hosts.sql
index 2960a93f0f2..17957c8826b 100644
--- a/tests/queries/0_stateless/01075_allowed_client_hosts.sql
+++ b/tests/queries/0_stateless/01075_allowed_client_hosts.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP USER IF EXISTS test_user_01075, test_user_01075_x, test_user_01075_x@localhost, test_user_01075_x@'192.168.23.15';
 
 CREATE USER test_user_01075;
diff --git a/tests/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh b/tests/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh
index 2562e701a25..80821193d38 100755
--- a/tests/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh
+++ b/tests/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, no-parallel
 
 # This is a monkey test used to trigger sanitizers.
 
diff --git a/tests/queries/0_stateless/01076_json_each_row_array.sh b/tests/queries/0_stateless/01076_json_each_row_array.sh
index cbbaafacace..ec24741ed16 100755
--- a/tests/queries/0_stateless/01076_json_each_row_array.sh
+++ b/tests/queries/0_stateless/01076_json_each_row_array.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh b/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh
index efe518046a1..bbc16121cb6 100755
--- a/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh
+++ b/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: replica, no-parallel, no-fasttest
 
 
 # This test checks mutations concurrent execution with concurrent inserts.
diff --git a/tests/queries/0_stateless/01079_alter_default_zookeeper_long.sql b/tests/queries/0_stateless/01079_alter_default_zookeeper_long.sql
index 7257f86c4e8..9239d2e9984 100644
--- a/tests/queries/0_stateless/01079_alter_default_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01079_alter_default_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS alter_default;
 
 CREATE TABLE alter_default
diff --git a/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh b/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh
index 6e79be90046..82b8be65af5 100755
--- a/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, zookeeper
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh b/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh
index 4b67a03760b..fbeb18251a6 100755
--- a/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh
+++ b/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh b/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh
index 3166b2153e8..c95554d26bb 100755
--- a/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh
+++ b/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.sh b/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.sh
index acbb01a1c68..ba8d89aad3c 100755
--- a/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, zookeeper, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01080_check_for_error_incorrect_size_of_nested_column.sql b/tests/queries/0_stateless/01080_check_for_error_incorrect_size_of_nested_column.sql
index 7725cf1890f..1eb6e849851 100644
--- a/tests/queries/0_stateless/01080_check_for_error_incorrect_size_of_nested_column.sql
+++ b/tests/queries/0_stateless/01080_check_for_error_incorrect_size_of_nested_column.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- TODO: can't just remove default prefix, it breaks the test!
 
 drop database if exists db_01080;
diff --git a/tests/queries/0_stateless/01083_expressions_in_engine_arguments.sql b/tests/queries/0_stateless/01083_expressions_in_engine_arguments.sql
index 4a3ac513e36..bd4712cca21 100644
--- a/tests/queries/0_stateless/01083_expressions_in_engine_arguments.sql
+++ b/tests/queries/0_stateless/01083_expressions_in_engine_arguments.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 CREATE TABLE file (n Int8) ENGINE = File(upper('tsv') || 'WithNames' || 'AndTypes');
 CREATE TABLE buffer (n Int8) ENGINE = Buffer(currentDatabase(), file, 16, 10, 200, 10000, 1000000, 10000000, 1000000000);
 CREATE TABLE merge (n Int8) ENGINE = Merge('', lower('DISTRIBUTED'));
diff --git a/tests/queries/0_stateless/01084_regexp_empty.sql b/tests/queries/0_stateless/01084_regexp_empty.sql
index 9cb0eb32bc5..3ccd4af80ab 100644
--- a/tests/queries/0_stateless/01084_regexp_empty.sql
+++ b/tests/queries/0_stateless/01084_regexp_empty.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01084;
 CREATE DATABASE test_01084;
 USE test_01084;
diff --git a/tests/queries/0_stateless/01085_max_distributed_connections.sh b/tests/queries/0_stateless/01085_max_distributed_connections.sh
index 1c42cd1a7e0..d8efa792e9d 100755
--- a/tests/queries/0_stateless/01085_max_distributed_connections.sh
+++ b/tests/queries/0_stateless/01085_max_distributed_connections.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: distributed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01085_max_distributed_connections_http.sh b/tests/queries/0_stateless/01085_max_distributed_connections_http.sh
index 1aa9939407c..3edf70f31b8 100755
--- a/tests/queries/0_stateless/01085_max_distributed_connections_http.sh
+++ b/tests/queries/0_stateless/01085_max_distributed_connections_http.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: distributed, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01085_simdjson_uint64.sql b/tests/queries/0_stateless/01085_simdjson_uint64.sql
index dfa367e1238..952bc150dec 100644
--- a/tests/queries/0_stateless/01085_simdjson_uint64.sql
+++ b/tests/queries/0_stateless/01085_simdjson_uint64.sql
@@ -1,2 +1,4 @@
+-- Tags: no-fasttest
+
 WITH '{"a": "hello", "b": 12345678901234567890}' AS json
 SELECT JSONExtractRaw(json, 'a');
diff --git a/tests/queries/0_stateless/01086_odbc_roundtrip.sh b/tests/queries/0_stateless/01086_odbc_roundtrip.sh
index 3c9e5c8aba9..cc3d8c53872 100755
--- a/tests/queries/0_stateless/01086_odbc_roundtrip.sh
+++ b/tests/queries/0_stateless/01086_odbc_roundtrip.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-asan, no-msan, no-unbundled, no-fasttest
+# Tag no-msan: can't pass because odbc libraries are not instrumented
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum_long.sql b/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum_long.sql
index 555db6962a7..06fb9a7c8f7 100644
--- a/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum_long.sql
+++ b/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 DROP TABLE IF EXISTS mutations_and_quorum1;
 DROP TABLE IF EXISTS mutations_and_quorum2;
 
diff --git a/tests/queries/0_stateless/01091_insert_with_default_json.sql b/tests/queries/0_stateless/01091_insert_with_default_json.sql
index d8b998cdd5e..40de4eb0637 100644
--- a/tests/queries/0_stateless/01091_insert_with_default_json.sql
+++ b/tests/queries/0_stateless/01091_insert_with_default_json.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS table_with_complex_default;
 
 CREATE TABLE table_with_complex_default (i Int8, n UInt8 DEFAULT 42, s String DEFAULT concat('test', CAST(n, 'String'))) ENGINE=TinyLog;
diff --git a/tests/queries/0_stateless/01091_query_profiler_does_not_hang.sql b/tests/queries/0_stateless/01091_query_profiler_does_not_hang.sql
index 010cbc6265a..84e4f7c0edb 100644
--- a/tests/queries/0_stateless/01091_query_profiler_does_not_hang.sql
+++ b/tests/queries/0_stateless/01091_query_profiler_does_not_hang.sql
@@ -1,2 +1,4 @@
+-- Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-unbundled
+
 SET query_profiler_cpu_time_period_ns = 1;
 SELECT count() FROM numbers_mt(1000000000);
diff --git a/tests/queries/0_stateless/01092_base64.sql b/tests/queries/0_stateless/01092_base64.sql
index 476edfe31d7..f50cf49d270 100644
--- a/tests/queries/0_stateless/01092_base64.sql
+++ b/tests/queries/0_stateless/01092_base64.sql
@@ -1,2 +1,4 @@
+-- Tags: no-fasttest
+
 -- This query reproduces a bug in TurboBase64 library.
 select distinct base64Encode(materialize('LG Optimus')) from numbers(100);
diff --git a/tests/queries/0_stateless/01092_memory_profiler.sql b/tests/queries/0_stateless/01092_memory_profiler.sql
index b0bfca8e494..0988f56413e 100644
--- a/tests/queries/0_stateless/01092_memory_profiler.sql
+++ b/tests/queries/0_stateless/01092_memory_profiler.sql
@@ -1,3 +1,5 @@
+-- Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-unbundled, no-parallel, no-fasttest
+
 SET allow_introspection_functions = 1;
 
 SET memory_profiler_step = 1000000;
diff --git a/tests/queries/0_stateless/01098_msgpack_format.sh b/tests/queries/0_stateless/01098_msgpack_format.sh
index 3bc60b4a9cb..fe1622aca3e 100755
--- a/tests/queries/0_stateless/01098_msgpack_format.sh
+++ b/tests/queries/0_stateless/01098_msgpack_format.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01098_temporary_and_external_tables.sh b/tests/queries/0_stateless/01098_temporary_and_external_tables.sh
index 17683852f2b..860529a26e5 100755
--- a/tests/queries/0_stateless/01098_temporary_and_external_tables.sh
+++ b/tests/queries/0_stateless/01098_temporary_and_external_tables.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01099_parallel_distributed_insert_select.sql b/tests/queries/0_stateless/01099_parallel_distributed_insert_select.sql
index 222c05ae827..adfee36fe77 100644
--- a/tests/queries/0_stateless/01099_parallel_distributed_insert_select.sql
+++ b/tests/queries/0_stateless/01099_parallel_distributed_insert_select.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-unbundled
+
 -- set insert_distributed_sync = 1;  -- see https://github.com/ClickHouse/ClickHouse/issues/18971
 
 DROP TABLE IF EXISTS local_01099_a;
diff --git a/tests/queries/0_stateless/01102_distributed_local_in_bug.sql b/tests/queries/0_stateless/01102_distributed_local_in_bug.sql
index ea32f6ffc7d..580f519bac2 100644
--- a/tests/queries/0_stateless/01102_distributed_local_in_bug.sql
+++ b/tests/queries/0_stateless/01102_distributed_local_in_bug.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS hits;
 DROP TABLE IF EXISTS visits;
 DROP TABLE IF EXISTS hits_layer;
diff --git a/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.sh b/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.sh
index 79c531e1a72..48eeaf748b7 100755
--- a/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.sh
+++ b/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-unbundled, no-fasttest
+# Tag no-fasttest: avoid dependency on qemu -- invonvenient when running locally
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01103_distributed_product_mode_local_column_renames.sql b/tests/queries/0_stateless/01103_distributed_product_mode_local_column_renames.sql
index 32655420a27..db22d3e4134 100644
--- a/tests/queries/0_stateless/01103_distributed_product_mode_local_column_renames.sql
+++ b/tests/queries/0_stateless/01103_distributed_product_mode_local_column_renames.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-parallel
+
 CREATE DATABASE IF NOT EXISTS test_01103;
 USE test_01103;
 
diff --git a/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh b/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh
index 72459e21b69..95f8dfc0377 100755
--- a/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh
+++ b/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, zookeeper
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01104_distributed_numbers_test.sql b/tests/queries/0_stateless/01104_distributed_numbers_test.sql
index 101342b4c34..bb2db88f23f 100644
--- a/tests/queries/0_stateless/01104_distributed_numbers_test.sql
+++ b/tests/queries/0_stateless/01104_distributed_numbers_test.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS d_numbers;
 CREATE TABLE d_numbers (number UInt32) ENGINE = Distributed(test_cluster_two_shards, system, numbers, rand());
 
diff --git a/tests/queries/0_stateless/01104_distributed_one_test.sql b/tests/queries/0_stateless/01104_distributed_one_test.sql
index 0ae6a180570..fb2c2774c99 100644
--- a/tests/queries/0_stateless/01104_distributed_one_test.sql
+++ b/tests/queries/0_stateless/01104_distributed_one_test.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS d_one;
 CREATE TABLE d_one (dummy UInt8) ENGINE = Distributed(test_cluster_two_shards, system, one, rand());
 
diff --git a/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh b/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh
index 227c4df6785..300d32f5a0c 100755
--- a/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh
+++ b/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh b/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh
index d564594291a..14ba90d5ec0 100755
--- a/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh
+++ b/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock, replica, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01109_exchange_tables.sql b/tests/queries/0_stateless/01109_exchange_tables.sql
index f2b8e4adb1d..604f1b9f57d 100644
--- a/tests/queries/0_stateless/01109_exchange_tables.sql
+++ b/tests/queries/0_stateless/01109_exchange_tables.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01109;
 CREATE DATABASE test_01109 ENGINE=Atomic;
 
diff --git a/tests/queries/0_stateless/01110_dictionary_layout_without_arguments.sql b/tests/queries/0_stateless/01110_dictionary_layout_without_arguments.sql
index e39afcba742..ed2f61e2627 100644
--- a/tests/queries/0_stateless/01110_dictionary_layout_without_arguments.sql
+++ b/tests/queries/0_stateless/01110_dictionary_layout_without_arguments.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS db_for_dict;
 CREATE DATABASE db_for_dict;
 
diff --git a/tests/queries/0_stateless/01113_local_dictionary_type_conversion.sql b/tests/queries/0_stateless/01113_local_dictionary_type_conversion.sql
index 3b6d9310042..65a03993295 100644
--- a/tests/queries/0_stateless/01113_local_dictionary_type_conversion.sql
+++ b/tests/queries/0_stateless/01113_local_dictionary_type_conversion.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS database_for_dict;
 
 CREATE DATABASE database_for_dict;
diff --git a/tests/queries/0_stateless/01114_database_atomic.sh b/tests/queries/0_stateless/01114_database_atomic.sh
index 55288e1e3f6..4d77a53cf6a 100755
--- a/tests/queries/0_stateless/01114_database_atomic.sh
+++ b/tests/queries/0_stateless/01114_database_atomic.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01114_mysql_database_engine_segfault.sql b/tests/queries/0_stateless/01114_mysql_database_engine_segfault.sql
index 5893365e11c..896cb0ca36d 100644
--- a/tests/queries/0_stateless/01114_mysql_database_engine_segfault.sql
+++ b/tests/queries/0_stateless/01114_mysql_database_engine_segfault.sql
@@ -1,2 +1,4 @@
+-- Tags: no-unbundled, no-parallel, no-fasttest
+
 DROP DATABASE IF EXISTS conv_main;
 CREATE DATABASE conv_main ENGINE = MySQL('127.0.0.1:3456', conv_main, 'metrika', 'password'); -- { serverError 501 }
diff --git a/tests/queries/0_stateless/01115_join_with_dictionary.sql b/tests/queries/0_stateless/01115_join_with_dictionary.sql
index d2c42bb6f75..e0f281503d4 100644
--- a/tests/queries/0_stateless/01115_join_with_dictionary.sql
+++ b/tests/queries/0_stateless/01115_join_with_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 
 DROP DATABASE IF EXISTS db_01115;
diff --git a/tests/queries/0_stateless/01125_dict_ddl_cannot_add_column.sql b/tests/queries/0_stateless/01125_dict_ddl_cannot_add_column.sql
index 471fd7959a9..a324d278c12 100644
--- a/tests/queries/0_stateless/01125_dict_ddl_cannot_add_column.sql
+++ b/tests/queries/0_stateless/01125_dict_ddl_cannot_add_column.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS database_for_dict;
 
 CREATE DATABASE database_for_dict;
diff --git a/tests/queries/0_stateless/01127_month_partitioning_consistency_select.sql b/tests/queries/0_stateless/01127_month_partitioning_consistency_select.sql
index 59edd0c37b8..eb5ea091ca3 100644
--- a/tests/queries/0_stateless/01127_month_partitioning_consistency_select.sql
+++ b/tests/queries/0_stateless/01127_month_partitioning_consistency_select.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS mt;
 CREATE TABLE mt (d Date, x String) ENGINE = MergeTree(d, x, 8192);
 INSERT INTO mt VALUES ('2106-02-07', 'Hello'), ('1970-01-01', 'World');
diff --git a/tests/queries/0_stateless/01130_in_memory_parts_partitons.sql b/tests/queries/0_stateless/01130_in_memory_parts_partitons.sql
index c07d65f114c..a0e8d24eff6 100644
--- a/tests/queries/0_stateless/01130_in_memory_parts_partitons.sql
+++ b/tests/queries/0_stateless/01130_in_memory_parts_partitons.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database, no-parallel
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS t2;
 
 CREATE TABLE t2(id UInt32, a UInt64, s String)
diff --git a/tests/queries/0_stateless/01135_default_and_alter_zookeeper.sql b/tests/queries/0_stateless/01135_default_and_alter_zookeeper.sql
index ea8c943b9a4..c370726c72f 100644
--- a/tests/queries/0_stateless/01135_default_and_alter_zookeeper.sql
+++ b/tests/queries/0_stateless/01135_default_and_alter_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS default_table;
 
 CREATE TABLE default_table
diff --git a/tests/queries/0_stateless/01138_join_on_distributed_and_tmp.sql b/tests/queries/0_stateless/01138_join_on_distributed_and_tmp.sql
index 67492e7c683..b2f9092150c 100644
--- a/tests/queries/0_stateless/01138_join_on_distributed_and_tmp.sql
+++ b/tests/queries/0_stateless/01138_join_on_distributed_and_tmp.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS foo_local;
 DROP TABLE IF EXISTS foo_distributed;
 
diff --git a/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql b/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql
index e13b25d1706..2fef16c4b0a 100644
--- a/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql
+++ b/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper, no-replicated-database, no-parallel
+
 DROP TABLE IF EXISTS rmt;
 
 CREATE TABLE rmt (n UInt64, s String) ENGINE = ReplicatedMergeTree('/clickhouse/test_01148/{shard}/{database}/{table}', '{replica}') ORDER BY n;
diff --git a/tests/queries/0_stateless/01149_zookeeper_mutation_stuck_after_replace_partition.sql b/tests/queries/0_stateless/01149_zookeeper_mutation_stuck_after_replace_partition.sql
index ca8f70b3cf4..687c8051eed 100644
--- a/tests/queries/0_stateless/01149_zookeeper_mutation_stuck_after_replace_partition.sql
+++ b/tests/queries/0_stateless/01149_zookeeper_mutation_stuck_after_replace_partition.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 set send_logs_level='error';
 drop table if exists mt;
 drop table if exists rmt sync;
diff --git a/tests/queries/0_stateless/01150_ddl_guard_rwr.sh b/tests/queries/0_stateless/01150_ddl_guard_rwr.sh
index 27c9ba55858..c18c1cdced6 100755
--- a/tests/queries/0_stateless/01150_ddl_guard_rwr.sh
+++ b/tests/queries/0_stateless/01150_ddl_guard_rwr.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
 
diff --git a/tests/queries/0_stateless/01152_cross_replication.sql b/tests/queries/0_stateless/01152_cross_replication.sql
index 23507c41fd0..60b2c34be07 100644
--- a/tests/queries/0_stateless/01152_cross_replication.sql
+++ b/tests/queries/0_stateless/01152_cross_replication.sql
@@ -1,3 +1,5 @@
+-- Tags: replica, no-parallel
+
 DROP DATABASE IF EXISTS shard_0;
 DROP DATABASE IF EXISTS shard_1;
 SET distributed_ddl_output_mode='none';
diff --git a/tests/queries/0_stateless/01153_attach_mv_uuid.sql b/tests/queries/0_stateless/01153_attach_mv_uuid.sql
index 86d768d94a7..4f043e11221 100644
--- a/tests/queries/0_stateless/01153_attach_mv_uuid.sql
+++ b/tests/queries/0_stateless/01153_attach_mv_uuid.sql
@@ -1,3 +1,5 @@
+-- Tags: no-ordinary-database, no-parallel
+
 DROP TABLE IF EXISTS src;
 DROP TABLE IF EXISTS mv;
 DROP TABLE IF EXISTS ".inner_id.e15f3ab5-6cae-4df3-b879-f40deafd82c2";
diff --git a/tests/queries/0_stateless/01154_move_partition_long.sh b/tests/queries/0_stateless/01154_move_partition_long.sh
index 541550160f2..46cbaea5d44 100755
--- a/tests/queries/0_stateless/01154_move_partition_long.sh
+++ b/tests/queries/0_stateless/01154_move_partition_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01155_rename_move_materialized_view.sql b/tests/queries/0_stateless/01155_rename_move_materialized_view.sql
index 882be2702d8..3a67707bdc2 100644
--- a/tests/queries/0_stateless/01155_rename_move_materialized_view.sql
+++ b/tests/queries/0_stateless/01155_rename_move_materialized_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01155_ordinary;
 DROP DATABASE IF EXISTS test_01155_atomic;
 
diff --git a/tests/queries/0_stateless/01157_replace_table.sql b/tests/queries/0_stateless/01157_replace_table.sql
index a29b381a522..20cae67d8e7 100644
--- a/tests/queries/0_stateless/01157_replace_table.sql
+++ b/tests/queries/0_stateless/01157_replace_table.sql
@@ -1,3 +1,5 @@
+-- Tags: no-ordinary-database
+
 drop table if exists t;
 drop table if exists dist;
 drop table if exists buf;
diff --git a/tests/queries/0_stateless/01158_zookeeper_log_long.sql b/tests/queries/0_stateless/01158_zookeeper_log_long.sql
index 8f4a9f04f9b..f067ce15079 100644
--- a/tests/queries/0_stateless/01158_zookeeper_log_long.sql
+++ b/tests/queries/0_stateless/01158_zookeeper_log_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database, no-polymorphic-parts
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 drop table if exists rmt;
 -- cleanup code will perform extra Exists
 -- (so the .reference will not match)
diff --git a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
index 319b9928e75..ce848e6835b 100755
--- a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
+++ b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: long, distributed, no-msan, no-replicated-database
+# Tag no-msan: issue 21600
+# Tag no-replicated-database: ON CLUSTER is not allowed
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
 
diff --git a/tests/queries/0_stateless/01176_mysql_client_interactive.expect b/tests/queries/0_stateless/01176_mysql_client_interactive.expect
index 8f56d047e8e..37087dd85f7 100755
--- a/tests/queries/0_stateless/01176_mysql_client_interactive.expect
+++ b/tests/queries/0_stateless/01176_mysql_client_interactive.expect
@@ -1,4 +1,6 @@
 #!/usr/bin/expect -f
+# Tags: no-fasttest
+# Tag no-fasttest: requires mysql client
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01180_client_syntax_errors.expect b/tests/queries/0_stateless/01180_client_syntax_errors.expect
index c20982b2991..e4b108fc9a9 100755
--- a/tests/queries/0_stateless/01180_client_syntax_errors.expect
+++ b/tests/queries/0_stateless/01180_client_syntax_errors.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql b/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql
index 24283a0e8e3..fbb67a268ae 100644
--- a/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql
+++ b/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: ON CLUSTER is not allowed
+
 DROP TABLE IF EXISTS test_repl ON CLUSTER test_shard_localhost SYNC;
 CREATE TABLE test_repl ON CLUSTER test_shard_localhost (n UInt64) ENGINE ReplicatedMergeTree('/clickhouse/test_01181/{database}/test_repl','r1') ORDER BY tuple();
 DETACH TABLE test_repl ON CLUSTER test_shard_localhost SYNC;
diff --git a/tests/queries/0_stateless/01184_long_insert_values_huge_strings.sh b/tests/queries/0_stateless/01184_long_insert_values_huge_strings.sh
index f3b3431dffe..09a43d13a42 100755
--- a/tests/queries/0_stateless/01184_long_insert_values_huge_strings.sh
+++ b/tests/queries/0_stateless/01184_long_insert_values_huge_strings.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01185_create_or_replace_table.sql b/tests/queries/0_stateless/01185_create_or_replace_table.sql
index 45900329b2c..e8845260726 100644
--- a/tests/queries/0_stateless/01185_create_or_replace_table.sql
+++ b/tests/queries/0_stateless/01185_create_or_replace_table.sql
@@ -1,3 +1,5 @@
+-- Tags: no-ordinary-database, no-parallel
+
 drop table if exists t1;
 
 replace table t1 (n UInt64, s String) engine=MergeTree order by n; -- { serverError 60 }
diff --git a/tests/queries/0_stateless/01188_attach_table_from_path.sql b/tests/queries/0_stateless/01188_attach_table_from_path.sql
index d72daa78f67..5b99c07e986 100644
--- a/tests/queries/0_stateless/01188_attach_table_from_path.sql
+++ b/tests/queries/0_stateless/01188_attach_table_from_path.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel
+
 drop table if exists test;
 drop table if exists file;
 drop table if exists mt;
diff --git a/tests/queries/0_stateless/01190_full_attach_syntax.sql b/tests/queries/0_stateless/01190_full_attach_syntax.sql
index eb739782e5f..ed05950ff98 100644
--- a/tests/queries/0_stateless/01190_full_attach_syntax.sql
+++ b/tests/queries/0_stateless/01190_full_attach_syntax.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01190;
 CREATE DATABASE test_01190 ENGINE=Ordinary;     -- Full ATTACH requires UUID with Atomic
 USE test_01190;
diff --git a/tests/queries/0_stateless/01191_rename_dictionary.sql b/tests/queries/0_stateless/01191_rename_dictionary.sql
index 264c527ccca..7160f327336 100644
--- a/tests/queries/0_stateless/01191_rename_dictionary.sql
+++ b/tests/queries/0_stateless/01191_rename_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01191;
 CREATE DATABASE test_01191 ENGINE=Atomic;
 
diff --git a/tests/queries/0_stateless/01192_rename_database_zookeeper.sh b/tests/queries/0_stateless/01192_rename_database_zookeeper.sh
index 58bdfbf71ad..62165467675 100755
--- a/tests/queries/0_stateless/01192_rename_database_zookeeper.sh
+++ b/tests/queries/0_stateless/01192_rename_database_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01193_metadata_loading.sh b/tests/queries/0_stateless/01193_metadata_loading.sh
index a3154a0784d..d7258151897 100755
--- a/tests/queries/0_stateless/01193_metadata_loading.sh
+++ b/tests/queries/0_stateless/01193_metadata_loading.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-unbundled, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01198_client_quota_key.sh b/tests/queries/0_stateless/01198_client_quota_key.sh
index d9f062f6589..3f5f5df5071 100755
--- a/tests/queries/0_stateless/01198_client_quota_key.sh
+++ b/tests/queries/0_stateless/01198_client_quota_key.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01200_mutations_memory_consumption.sql b/tests/queries/0_stateless/01200_mutations_memory_consumption.sql
index 8632f7c29d6..6947c327adc 100644
--- a/tests/queries/0_stateless/01200_mutations_memory_consumption.sql
+++ b/tests/queries/0_stateless/01200_mutations_memory_consumption.sql
@@ -1,3 +1,5 @@
+-- Tags: no-debug, no-parallel
+
 DROP TABLE IF EXISTS table_with_single_pk;
 
 CREATE TABLE table_with_single_pk
diff --git a/tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper_long.sql b/tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper_long.sql
index 9464ac24dff..875bd1f96de 100644
--- a/tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 -- Testing basic functionality with compact parts
 set replication_alter_partitions_sync = 2;
 drop table if exists mt_compact;
diff --git a/tests/queries/0_stateless/01211_optimize_skip_unused_shards_type_mismatch.sql b/tests/queries/0_stateless/01211_optimize_skip_unused_shards_type_mismatch.sql
index d7e722fc9bc..65adaf3ad71 100644
--- a/tests/queries/0_stateless/01211_optimize_skip_unused_shards_type_mismatch.sql
+++ b/tests/queries/0_stateless/01211_optimize_skip_unused_shards_type_mismatch.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 set optimize_skip_unused_shards=1;
 
 drop table if exists data_02000;
diff --git a/tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.sh b/tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.sh
index b82b132be05..a255c1db30e 100755
--- a/tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, zookeeper
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper_long.sql b/tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper_long.sql
index 91dd6e67512..406507089c3 100644
--- a/tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS table_for_rename_pk;
 
 CREATE TABLE table_for_rename_pk
diff --git a/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.sql b/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.sql
index cb9e918e335..986947d5979 100644
--- a/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS table_rename_with_default;
 
 CREATE TABLE table_rename_with_default
diff --git a/tests/queries/0_stateless/01213_optimize_skip_unused_shards_DISTINCT.sql b/tests/queries/0_stateless/01213_optimize_skip_unused_shards_DISTINCT.sql
index 8024abc75ed..e2de2de07c7 100644
--- a/tests/queries/0_stateless/01213_optimize_skip_unused_shards_DISTINCT.sql
+++ b/tests/queries/0_stateless/01213_optimize_skip_unused_shards_DISTINCT.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 CREATE TABLE IF NOT EXISTS local_01213 (id Int) ENGINE = MergeTree ORDER BY tuple();
 CREATE TABLE IF NOT EXISTS dist_01213 AS local_01213 ENGINE = Distributed(test_cluster_two_shards_localhost, currentDatabase(), local_01213, id);
 
diff --git a/tests/queries/0_stateless/01224_no_superfluous_dict_reload.sql b/tests/queries/0_stateless/01224_no_superfluous_dict_reload.sql
index f15ea4a75f4..6f5deb91ee4 100644
--- a/tests/queries/0_stateless/01224_no_superfluous_dict_reload.sql
+++ b/tests/queries/0_stateless/01224_no_superfluous_dict_reload.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dict_db_01224;
 DROP DATABASE IF EXISTS dict_db_01224_dictionary;
 CREATE DATABASE dict_db_01224 ENGINE=Ordinary;  -- Different internal dictionary name with Atomic
diff --git a/tests/queries/0_stateless/01225_drop_dictionary_as_table.sql b/tests/queries/0_stateless/01225_drop_dictionary_as_table.sql
index 451f2adbede..513ecbd4ed4 100644
--- a/tests/queries/0_stateless/01225_drop_dictionary_as_table.sql
+++ b/tests/queries/0_stateless/01225_drop_dictionary_as_table.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dict_db_01225;
 CREATE DATABASE dict_db_01225;
 
diff --git a/tests/queries/0_stateless/01225_show_create_table_from_dictionary.sql b/tests/queries/0_stateless/01225_show_create_table_from_dictionary.sql
index a49f113ebde..006ff952ee9 100644
--- a/tests/queries/0_stateless/01225_show_create_table_from_dictionary.sql
+++ b/tests/queries/0_stateless/01225_show_create_table_from_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dict_db_01225;
 DROP DATABASE IF EXISTS dict_db_01225_dictionary;
 CREATE DATABASE dict_db_01225 ENGINE=Ordinary;    -- Different internal dictionary name with Atomic
diff --git a/tests/queries/0_stateless/01226_dist_on_dist_global_in.sql b/tests/queries/0_stateless/01226_dist_on_dist_global_in.sql
index ca9b28a14f4..f75e097430f 100644
--- a/tests/queries/0_stateless/01226_dist_on_dist_global_in.sql
+++ b/tests/queries/0_stateless/01226_dist_on_dist_global_in.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 SELECT 'GLOBAL IN';
 select * from remote('localhost', system.one) where dummy global in (0);
 select * from remote('localhost', system.one) where dummy global in system.one;
diff --git a/tests/queries/0_stateless/01227_distributed_global_in_issue_2610.sql b/tests/queries/0_stateless/01227_distributed_global_in_issue_2610.sql
index 781e9d6f8f9..d8ff9006185 100644
--- a/tests/queries/0_stateless/01227_distributed_global_in_issue_2610.sql
+++ b/tests/queries/0_stateless/01227_distributed_global_in_issue_2610.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- Test from the issue https://github.com/ClickHouse/ClickHouse/issues/2610
 drop table if exists data_01227;
 create table data_01227 (key Int) Engine=MergeTree() order by key;
diff --git a/tests/queries/0_stateless/01231_distributed_aggregation_memory_efficient_mix_levels.sql b/tests/queries/0_stateless/01231_distributed_aggregation_memory_efficient_mix_levels.sql
index 80f7625900a..e70652877e0 100644
--- a/tests/queries/0_stateless/01231_distributed_aggregation_memory_efficient_mix_levels.sql
+++ b/tests/queries/0_stateless/01231_distributed_aggregation_memory_efficient_mix_levels.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-parallel
+
 set send_logs_level = 'error';
 
 create database if not exists shard_0;
diff --git a/tests/queries/0_stateless/01232_extremes.sql b/tests/queries/0_stateless/01232_extremes.sql
index b0670f731c6..c0a9c8cb6d6 100644
--- a/tests/queries/0_stateless/01232_extremes.sql
+++ b/tests/queries/0_stateless/01232_extremes.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 set send_logs_level = 'error';
 set extremes = 1;
 
diff --git a/tests/queries/0_stateless/01232_json_as_string_format.sh b/tests/queries/0_stateless/01232_json_as_string_format.sh
index d4476476f60..667aea7ba78 100755
--- a/tests/queries/0_stateless/01232_json_as_string_format.sh
+++ b/tests/queries/0_stateless/01232_json_as_string_format.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01232_preparing_sets_race_condition_long.sh b/tests/queries/0_stateless/01232_preparing_sets_race_condition_long.sh
index e42e68a6589..4a209f12022 100755
--- a/tests/queries/0_stateless/01232_preparing_sets_race_condition_long.sh
+++ b/tests/queries/0_stateless/01232_preparing_sets_race_condition_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01235_live_view_over_distributed.sql b/tests/queries/0_stateless/01235_live_view_over_distributed.sql
index abc628475db..32ec0a6127f 100644
--- a/tests/queries/0_stateless/01235_live_view_over_distributed.sql
+++ b/tests/queries/0_stateless/01235_live_view_over_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-replicated-database, no-parallel, no-fasttest
+
 set insert_distributed_sync = 1;
 SET allow_experimental_live_view = 1;
 
diff --git a/tests/queries/0_stateless/01236_distributed_over_live_view_over_distributed.sql b/tests/queries/0_stateless/01236_distributed_over_live_view_over_distributed.sql
index 522fc5dafbe..4aacecc9734 100644
--- a/tests/queries/0_stateless/01236_distributed_over_live_view_over_distributed.sql
+++ b/tests/queries/0_stateless/01236_distributed_over_live_view_over_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.sql b/tests/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.sql
index de35b0c6c9d..b7c1c6eea76 100644
--- a/tests/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.sql
+++ b/tests/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 SET insert_distributed_sync = 1;
 
diff --git a/tests/queries/0_stateless/01238_http_memory_tracking.sh b/tests/queries/0_stateless/01238_http_memory_tracking.sh
index 8c900e4c208..9b0fe875416 100755
--- a/tests/queries/0_stateless/01238_http_memory_tracking.sh
+++ b/tests/queries/0_stateless/01238_http_memory_tracking.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database, no-parallel, no-fasttest
+# Tag no-fasttest: max_memory_usage_for_user can interfere another queries running concurrently
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql b/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql
index a8dc0d91c37..134c6763fab 100644
--- a/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql
+++ b/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- TODO: correct testing with real unique shards
 
 set optimize_distributed_group_by_sharding_key=1;
diff --git a/tests/queries/0_stateless/01245_distributed_group_by_no_merge_with-extremes_and_totals.sql b/tests/queries/0_stateless/01245_distributed_group_by_no_merge_with-extremes_and_totals.sql
index 030330e4cae..3f7632baf7e 100644
--- a/tests/queries/0_stateless/01245_distributed_group_by_no_merge_with-extremes_and_totals.sql
+++ b/tests/queries/0_stateless/01245_distributed_group_by_no_merge_with-extremes_and_totals.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SELECT sum(number) FROM (SELECT * FROM remote('127.0.0.{1,2}', system.numbers) LIMIT 5 SETTINGS distributed_group_by_no_merge = 1);
 SELECT sum(number) FROM (SELECT * FROM remote('127.0.0.{1,2}', system.numbers) LIMIT 5 SETTINGS distributed_group_by_no_merge = 1) with totals;
 
diff --git a/tests/queries/0_stateless/01246_finalize_aggregation_race.sql b/tests/queries/0_stateless/01246_finalize_aggregation_race.sql
index c4946bd9e83..e63f7fb0983 100644
--- a/tests/queries/0_stateless/01246_finalize_aggregation_race.sql
+++ b/tests/queries/0_stateless/01246_finalize_aggregation_race.sql
@@ -1,3 +1,5 @@
+-- Tags: race
+
 drop table if exists test_quantile;
 create table test_quantile (x AggregateFunction(quantileTiming(0.2), UInt64)) engine = Memory;
 insert into test_quantile select medianTimingState(.2)(number) from (select * from numbers(1000) order by number desc);
diff --git a/tests/queries/0_stateless/01246_insert_into_watch_live_view.py b/tests/queries/0_stateless/01246_insert_into_watch_live_view.py
index 193d23999be..addff72ce66 100755
--- a/tests/queries/0_stateless/01246_insert_into_watch_live_view.py
+++ b/tests/queries/0_stateless/01246_insert_into_watch_live_view.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import time
diff --git a/tests/queries/0_stateless/01247_optimize_distributed_group_by_sharding_key_dist_on_dist.sql b/tests/queries/0_stateless/01247_optimize_distributed_group_by_sharding_key_dist_on_dist.sql
index 73dc916e463..9fc01b141ea 100644
--- a/tests/queries/0_stateless/01247_optimize_distributed_group_by_sharding_key_dist_on_dist.sql
+++ b/tests/queries/0_stateless/01247_optimize_distributed_group_by_sharding_key_dist_on_dist.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- TODO: correct testing with real unique shards
 
 set optimize_distributed_group_by_sharding_key=1;
diff --git a/tests/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql b/tests/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql
index 8902b164c09..c2be4d04e5f 100644
--- a/tests/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql
+++ b/tests/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01249;
 CREATE DATABASE test_01249 ENGINE=Ordinary;     -- Full ATTACH requires UUID with Atomic
 USE test_01249;
diff --git a/tests/queries/0_stateless/01251_dict_is_in_infinite_loop.sql b/tests/queries/0_stateless/01251_dict_is_in_infinite_loop.sql
index 958165805e1..4b59ca4d7bb 100644
--- a/tests/queries/0_stateless/01251_dict_is_in_infinite_loop.sql
+++ b/tests/queries/0_stateless/01251_dict_is_in_infinite_loop.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 DROP DATABASE IF EXISTS database_for_dict;
 CREATE DATABASE database_for_dict;
 
diff --git a/tests/queries/0_stateless/01254_dict_create_without_db.sql b/tests/queries/0_stateless/01254_dict_create_without_db.sql
index 0c7f3126d98..65a2ab52d23 100644
--- a/tests/queries/0_stateless/01254_dict_create_without_db.sql
+++ b/tests/queries/0_stateless/01254_dict_create_without_db.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dict_db_01254;
 CREATE DATABASE dict_db_01254;
 USE dict_db_01254;
diff --git a/tests/queries/0_stateless/01254_dict_load_after_detach_attach.sql b/tests/queries/0_stateless/01254_dict_load_after_detach_attach.sql
index 8fd56f40afe..c11cb64735c 100644
--- a/tests/queries/0_stateless/01254_dict_load_after_detach_attach.sql
+++ b/tests/queries/0_stateless/01254_dict_load_after_detach_attach.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dict_db_01254;
 CREATE DATABASE dict_db_01254;
 
diff --git a/tests/queries/0_stateless/01257_dictionary_mismatch_types.sql b/tests/queries/0_stateless/01257_dictionary_mismatch_types.sql
index 35782f1cd02..4ff3b7913f4 100644
--- a/tests/queries/0_stateless/01257_dictionary_mismatch_types.sql
+++ b/tests/queries/0_stateless/01257_dictionary_mismatch_types.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_dict_db;
 CREATE DATABASE test_dict_db;
 
diff --git a/tests/queries/0_stateless/01259_combinator_distinct_distributed.sql b/tests/queries/0_stateless/01259_combinator_distinct_distributed.sql
index f95d2d87b8e..59cfd85ed60 100644
--- a/tests/queries/0_stateless/01259_combinator_distinct_distributed.sql
+++ b/tests/queries/0_stateless/01259_combinator_distinct_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SET distributed_aggregation_memory_efficient = 1;
 
 SELECT sum(DISTINCT number % 13) FROM remote('127.0.0.{1,2}', numbers_mt(100000));
diff --git a/tests/queries/0_stateless/01259_dictionary_custom_settings_ddl.sql b/tests/queries/0_stateless/01259_dictionary_custom_settings_ddl.sql
index 3c8b4e03507..224aac43a1f 100644
--- a/tests/queries/0_stateless/01259_dictionary_custom_settings_ddl.sql
+++ b/tests/queries/0_stateless/01259_dictionary_custom_settings_ddl.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 DROP DATABASE IF EXISTS database_for_dict;
 
 CREATE DATABASE database_for_dict;
diff --git a/tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper_long.sql b/tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper_long.sql
index 6e7f4d55a53..11d774e36d7 100644
--- a/tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS test_alter;
 CREATE TABLE test_alter (x Date, s String) ENGINE = MergeTree ORDER BY s PARTITION BY x;
 ALTER TABLE test_alter MODIFY COLUMN s DEFAULT 'Hello';
diff --git a/tests/queries/0_stateless/01268_dictionary_direct_layout.sql b/tests/queries/0_stateless/01268_dictionary_direct_layout.sql
index f4f3cbec705..914d24a740a 100644
--- a/tests/queries/0_stateless/01268_dictionary_direct_layout.sql
+++ b/tests/queries/0_stateless/01268_dictionary_direct_layout.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 DROP DATABASE IF EXISTS database_for_dict_01268;
 
 CREATE DATABASE database_for_dict_01268;
diff --git a/tests/queries/0_stateless/01268_shard_avgweighted.sql b/tests/queries/0_stateless/01268_shard_avgweighted.sql
index 3a101ec4754..3ddbf108cea 100644
--- a/tests/queries/0_stateless/01268_shard_avgweighted.sql
+++ b/tests/queries/0_stateless/01268_shard_avgweighted.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 CREATE TABLE dummy(foo Int64) ENGINE = Memory();
 INSERT INTO dummy VALUES (1);
 SELECT avgWeighted(100., .1) FROM remote('127.0.0.{2,3}', currentDatabase(), dummy);
diff --git a/tests/queries/0_stateless/01269_alias_type_differs.sql b/tests/queries/0_stateless/01269_alias_type_differs.sql
index b78e46f62c8..64abcf9e367 100644
--- a/tests/queries/0_stateless/01269_alias_type_differs.sql
+++ b/tests/queries/0_stateless/01269_alias_type_differs.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS data_01269;
 CREATE TABLE data_01269
 (
diff --git a/tests/queries/0_stateless/01269_create_with_null.sql b/tests/queries/0_stateless/01269_create_with_null.sql
index faa6b84e9e4..7548070ce4b 100644
--- a/tests/queries/0_stateless/01269_create_with_null.sql
+++ b/tests/queries/0_stateless/01269_create_with_null.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database
+
 DROP TABLE IF EXISTS data_null;
 DROP TABLE IF EXISTS set_null;
 DROP TABLE IF EXISTS cannot_be_nullable;
diff --git a/tests/queries/0_stateless/01270_optimize_skip_unused_shards_low_cardinality.sql b/tests/queries/0_stateless/01270_optimize_skip_unused_shards_low_cardinality.sql
index 1dc322f2113..12056148625 100644
--- a/tests/queries/0_stateless/01270_optimize_skip_unused_shards_low_cardinality.sql
+++ b/tests/queries/0_stateless/01270_optimize_skip_unused_shards_low_cardinality.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 set optimize_skip_unused_shards=1;
 set force_optimize_skip_unused_shards=2;
 set allow_suspicious_low_cardinality_types=1;
diff --git a/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.sql b/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.sql
index ccfa08af7bc..8a9c6fc01e4 100644
--- a/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.sql
+++ b/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET optimize_arithmetic_operations_in_aggregate_functions = 1;
 
 EXPLAIN SYNTAX SELECT sum(n + 1), sum(1 + n), sum(n - 1), sum(1 - n) FROM (SELECT number n FROM numbers(10));
diff --git a/tests/queries/0_stateless/01272_suspicious_codecs.sql b/tests/queries/0_stateless/01272_suspicious_codecs.sql
index 3ec3e480da4..5baa30e3cf4 100644
--- a/tests/queries/0_stateless/01272_suspicious_codecs.sql
+++ b/tests/queries/0_stateless/01272_suspicious_codecs.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS codecs;
 
 -- test what should work
diff --git a/tests/queries/0_stateless/01273_arrow.sh b/tests/queries/0_stateless/01273_arrow.sh
index ad8a6f0fdb9..450b677a030 100755
--- a/tests/queries/0_stateless/01273_arrow.sh
+++ b/tests/queries/0_stateless/01273_arrow.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/01273_arrow_arrays_load.sh b/tests/queries/0_stateless/01273_arrow_arrays_load.sh
index bce653376a5..30bcc17c4c1 100755
--- a/tests/queries/0_stateless/01273_arrow_arrays_load.sh
+++ b/tests/queries/0_stateless/01273_arrow_arrays_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01273_arrow_decimal.sh b/tests/queries/0_stateless/01273_arrow_decimal.sh
index 22496035ea9..c02bf484578 100755
--- a/tests/queries/0_stateless/01273_arrow_decimal.sh
+++ b/tests/queries/0_stateless/01273_arrow_decimal.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/01273_arrow_dictionaries_load.sh b/tests/queries/0_stateless/01273_arrow_dictionaries_load.sh
index 3f6fcff3dcc..2906330c21b 100755
--- a/tests/queries/0_stateless/01273_arrow_dictionaries_load.sh
+++ b/tests/queries/0_stateless/01273_arrow_dictionaries_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01273_arrow_load.sh b/tests/queries/0_stateless/01273_arrow_load.sh
index bc5588a905b..d5940ed4c8b 100755
--- a/tests/queries/0_stateless/01273_arrow_load.sh
+++ b/tests/queries/0_stateless/01273_arrow_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01273_arrow_nested_arrays_load.sh b/tests/queries/0_stateless/01273_arrow_nested_arrays_load.sh
index cd2040260e9..24fc72f3d9a 100755
--- a/tests/queries/0_stateless/01273_arrow_nested_arrays_load.sh
+++ b/tests/queries/0_stateless/01273_arrow_nested_arrays_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01273_arrow_nullable_arrays_load.sh b/tests/queries/0_stateless/01273_arrow_nullable_arrays_load.sh
index d780cc6d06a..4de976190fe 100755
--- a/tests/queries/0_stateless/01273_arrow_nullable_arrays_load.sh
+++ b/tests/queries/0_stateless/01273_arrow_nullable_arrays_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01273_arrow_stream.sh b/tests/queries/0_stateless/01273_arrow_stream.sh
index af5931a4bce..a1fa62df7b1 100755
--- a/tests/queries/0_stateless/01273_arrow_stream.sh
+++ b/tests/queries/0_stateless/01273_arrow_stream.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/01273_h3EdgeAngle_range_check.sql b/tests/queries/0_stateless/01273_h3EdgeAngle_range_check.sql
index f15d8669388..ce513802e0a 100644
--- a/tests/queries/0_stateless/01273_h3EdgeAngle_range_check.sql
+++ b/tests/queries/0_stateless/01273_h3EdgeAngle_range_check.sql
@@ -1 +1,3 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3EdgeAngle(100); -- { serverError 69 }
diff --git a/tests/queries/0_stateless/01274_alter_rename_column_distributed.sql b/tests/queries/0_stateless/01274_alter_rename_column_distributed.sql
index 8799680125f..769514f851a 100644
--- a/tests/queries/0_stateless/01274_alter_rename_column_distributed.sql
+++ b/tests/queries/0_stateless/01274_alter_rename_column_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 set insert_distributed_sync = 1;
 
 DROP TABLE IF EXISTS visits;
diff --git a/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper_long.sql b/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper_long.sql
index 10ab75e42bd..8d8f590540a 100644
--- a/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS table_for_rename1;
 
 CREATE TABLE table_for_rename1
diff --git a/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sh b/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sh
index e1e0018a1dd..d5cae099f36 100755
--- a/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sh
+++ b/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01280_ttl_where_group_by.sh b/tests/queries/0_stateless/01280_ttl_where_group_by.sh
index c9936ce7afd..aa6b33d5935 100755
--- a/tests/queries/0_stateless/01280_ttl_where_group_by.sh
+++ b/tests/queries/0_stateless/01280_ttl_where_group_by.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01280_ttl_where_group_by_negative.sql b/tests/queries/0_stateless/01280_ttl_where_group_by_negative.sql
index b273e065bcc..978b2bfcc10 100644
--- a/tests/queries/0_stateless/01280_ttl_where_group_by_negative.sql
+++ b/tests/queries/0_stateless/01280_ttl_where_group_by_negative.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 create table ttl_01280_error (a Int, b Int, x Int64, y Int64, d DateTime) engine = MergeTree order by (a, b) ttl d + interval 1 second group by x set y = max(y); -- { serverError 450}
 create table ttl_01280_error (a Int, b Int, x Int64, y Int64, d DateTime) engine = MergeTree order by (a, b) ttl d + interval 1 second group by b set y = max(y); -- { serverError 450}
 create table ttl_01280_error (a Int, b Int, x Int64, y Int64, d DateTime) engine = MergeTree order by (a, b) ttl d + interval 1 second group by a, b, x set y = max(y); -- { serverError 450}
diff --git a/tests/queries/0_stateless/01281_group_by_limit_memory_tracking.sh b/tests/queries/0_stateless/01281_group_by_limit_memory_tracking.sh
index 4667c76cb60..bf201187f45 100755
--- a/tests/queries/0_stateless/01281_group_by_limit_memory_tracking.sh
+++ b/tests/queries/0_stateless/01281_group_by_limit_memory_tracking.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database, no-parallel, no-fasttest
+# Tag no-fasttest: max_memory_usage_for_user can interfere another queries running concurrently
 
 # Regression for MemoryTracker that had been incorrectly accounted
 # (it was reset before deallocation)
diff --git a/tests/queries/0_stateless/01281_unsucceeded_insert_select_queries_counter.sql b/tests/queries/0_stateless/01281_unsucceeded_insert_select_queries_counter.sql
index f5efb2b56d5..3b122fc0228 100644
--- a/tests/queries/0_stateless/01281_unsucceeded_insert_select_queries_counter.sql
+++ b/tests/queries/0_stateless/01281_unsucceeded_insert_select_queries_counter.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 DROP TABLE IF EXISTS current_failed_query_metrics;
 DROP TABLE IF EXISTS to_insert;
 
diff --git a/tests/queries/0_stateless/01284_escape_sequences_php_mysql_style.sql b/tests/queries/0_stateless/01284_escape_sequences_php_mysql_style.sql
index 36ad7b4506c..e9f2346233f 100644
--- a/tests/queries/0_stateless/01284_escape_sequences_php_mysql_style.sql
+++ b/tests/queries/0_stateless/01284_escape_sequences_php_mysql_style.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT 'a\_\c\l\i\c\k\h\o\u\s\e', 'a\\_\\c\\l\\i\\c\\k\\h\\o\\u\\s\\e';
 select 'aXb' like 'a_b', 'aXb' like 'a\_b', 'a_b' like 'a\_b', 'a_b' like 'a\\_b';
 SELECT match('Hello', '\w+'), match('Hello', '\\w+'), match('Hello', '\\\w+'), match('Hello', '\w\+'), match('Hello', 'w+');
diff --git a/tests/queries/0_stateless/01288_shard_max_network_bandwidth.sql b/tests/queries/0_stateless/01288_shard_max_network_bandwidth.sql
index 09c043784bb..969bb0a126c 100644
--- a/tests/queries/0_stateless/01288_shard_max_network_bandwidth.sql
+++ b/tests/queries/0_stateless/01288_shard_max_network_bandwidth.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- Limit to 10 MB/sec
 SET max_network_bandwidth = 10000000;
 
diff --git a/tests/queries/0_stateless/01290_max_execution_speed_distributed.sql b/tests/queries/0_stateless/01290_max_execution_speed_distributed.sql
index d6617bec5ce..8dcac23550d 100644
--- a/tests/queries/0_stateless/01290_max_execution_speed_distributed.sql
+++ b/tests/queries/0_stateless/01290_max_execution_speed_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SET max_execution_speed = 1000000;
 SET timeout_before_checking_execution_speed = 0.001;
 SET max_block_size = 100;
diff --git a/tests/queries/0_stateless/01291_distributed_low_cardinality_memory_efficient.sql b/tests/queries/0_stateless/01291_distributed_low_cardinality_memory_efficient.sql
index f0992f2e438..267f5585705 100644
--- a/tests/queries/0_stateless/01291_distributed_low_cardinality_memory_efficient.sql
+++ b/tests/queries/0_stateless/01291_distributed_low_cardinality_memory_efficient.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS data;
 DROP TABLE IF EXISTS dist;
 
diff --git a/tests/queries/0_stateless/01292_create_user.sql b/tests/queries/0_stateless/01292_create_user.sql
index c8d408147e9..a9582376825 100644
--- a/tests/queries/0_stateless/01292_create_user.sql
+++ b/tests/queries/0_stateless/01292_create_user.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP USER IF EXISTS u1_01292, u2_01292, u3_01292, u4_01292, u5_01292, u6_01292, u7_01292, u8_01292, u9_01292;
 DROP USER IF EXISTS u10_01292, u11_01292, u12_01292, u13_01292, u14_01292, u15_01292, u16_01292;
 DROP USER IF EXISTS u2_01292_renamed;
diff --git a/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect b/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect
index 5e845754402..14ca38093bf 100755
--- a/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect
+++ b/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect b/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect
index c68b153d5d3..3abed6cae03 100755
--- a/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect
+++ b/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01293_system_distribution_queue.sql b/tests/queries/0_stateless/01293_system_distribution_queue.sql
index b16433029bf..34158fb081c 100644
--- a/tests/queries/0_stateless/01293_system_distribution_queue.sql
+++ b/tests/queries/0_stateless/01293_system_distribution_queue.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists null_01293;
 drop table if exists dist_01293;
 
diff --git a/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh b/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh
index 6b89e7a5a8a..3c11dc5f772 100755
--- a/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh
+++ b/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01294_system_distributed_on_cluster.sql b/tests/queries/0_stateless/01294_system_distributed_on_cluster.sql
index e5cd3ea362f..5c2636d7a68 100644
--- a/tests/queries/0_stateless/01294_system_distributed_on_cluster.sql
+++ b/tests/queries/0_stateless/01294_system_distributed_on_cluster.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-parallel
+
 -- just a smoke test
 
 -- quirk for ON CLUSTER does not uses currentDatabase()
diff --git a/tests/queries/0_stateless/01296_create_row_policy_in_current_database.sql b/tests/queries/0_stateless/01296_create_row_policy_in_current_database.sql
index fca570b5651..c1e8068075b 100644
--- a/tests/queries/0_stateless/01296_create_row_policy_in_current_database.sql
+++ b/tests/queries/0_stateless/01296_create_row_policy_in_current_database.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP ROW POLICY IF EXISTS p1_01296, p2_01296, p3_01296, p4_01296, p5_01296 ON db_01296.table;
 DROP ROW POLICY IF EXISTS p3_01296, p5_01296 ON db_01296.table2;
 DROP DATABASE IF EXISTS db_01296;
diff --git a/tests/queries/0_stateless/01297_alter_distributed.sql b/tests/queries/0_stateless/01297_alter_distributed.sql
index d5359cc5ea8..cec64278d47 100644
--- a/tests/queries/0_stateless/01297_alter_distributed.sql
+++ b/tests/queries/0_stateless/01297_alter_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 drop table if exists merge_distributed;
 drop table if exists merge_distributed1;
 
diff --git a/tests/queries/0_stateless/01297_create_quota.sql b/tests/queries/0_stateless/01297_create_quota.sql
index 7d55b95601f..b30d453257a 100644
--- a/tests/queries/0_stateless/01297_create_quota.sql
+++ b/tests/queries/0_stateless/01297_create_quota.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP QUOTA IF EXISTS q1_01297, q2_01297, q3_01297, q4_01297, q5_01297, q6_01297, q7_01297, q8_01297, q9_01297, q10_01297;
 DROP QUOTA IF EXISTS q11_01297, q12_01297;
 DROP QUOTA IF EXISTS q2_01297_renamed;
diff --git a/tests/queries/0_stateless/01300_client_save_history_when_terminated_long.expect b/tests/queries/0_stateless/01300_client_save_history_when_terminated_long.expect
index 0c53f5658d1..22d0c91e54d 100755
--- a/tests/queries/0_stateless/01300_client_save_history_when_terminated_long.expect
+++ b/tests/queries/0_stateless/01300_client_save_history_when_terminated_long.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: long, no-unbundled, no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh b/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh
index 65bf5de8333..010c66b9bb1 100755
--- a/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh
+++ b/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh b/tests/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh
index ed8a463cc62..7e10ab475d4 100755
--- a/tests/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh
+++ b/tests/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01304_direct_io_long.sh b/tests/queries/0_stateless/01304_direct_io_long.sh
index 7505173ddba..57638a7d0a6 100755
--- a/tests/queries/0_stateless/01304_direct_io_long.sh
+++ b/tests/queries/0_stateless/01304_direct_io_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh b/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
index b7cc7a3bc32..1d2d4516b9c 100755
--- a/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
+++ b/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: replica, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01306_benchmark_json.sh b/tests/queries/0_stateless/01306_benchmark_json.sh
index fed085abd96..ae361826250 100755
--- a/tests/queries/0_stateless/01306_benchmark_json.sh
+++ b/tests/queries/0_stateless/01306_benchmark_json.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01306_disable_duplicate_order_by_and_distinct_optimize_for_distributed_table.sql b/tests/queries/0_stateless/01306_disable_duplicate_order_by_and_distinct_optimize_for_distributed_table.sql
index 2daf199f82e..dffcf24684e 100644
--- a/tests/queries/0_stateless/01306_disable_duplicate_order_by_and_distinct_optimize_for_distributed_table.sql
+++ b/tests/queries/0_stateless/01306_disable_duplicate_order_by_and_distinct_optimize_for_distributed_table.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 set optimize_duplicate_order_by_and_distinct = 1;
 SET distributed_group_by_no_merge = 0;
 
diff --git a/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh b/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh
index 37ee5bf7ad7..2a41d90cd3a 100755
--- a/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh
+++ b/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01307_orc_output_format.sh b/tests/queries/0_stateless/01307_orc_output_format.sh
index b5000bfd3fc..de6984ca74f 100755
--- a/tests/queries/0_stateless/01307_orc_output_format.sh
+++ b/tests/queries/0_stateless/01307_orc_output_format.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01308_orc_output_format_arrays.sh b/tests/queries/0_stateless/01308_orc_output_format_arrays.sh
index f24f62673ac..9d45c0a5add 100755
--- a/tests/queries/0_stateless/01308_orc_output_format_arrays.sh
+++ b/tests/queries/0_stateless/01308_orc_output_format_arrays.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01318_decrypt.sql b/tests/queries/0_stateless/01318_decrypt.sql
index b9a20acf4ac..fb0b934d7bf 100644
--- a/tests/queries/0_stateless/01318_decrypt.sql
+++ b/tests/queries/0_stateless/01318_decrypt.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 --- aes_decrypt_mysql(string, key, block_mode[, init_vector, AAD])
 -- The MySQL-compatitable encryption, only ecb, cbc, cfb128 and ofb modes are supported,
 -- just like for MySQL
diff --git a/tests/queries/0_stateless/01318_encrypt.sql b/tests/queries/0_stateless/01318_encrypt.sql
index 0e55a9a2aee..9a5e6fd0ed1 100644
--- a/tests/queries/0_stateless/01318_encrypt.sql
+++ b/tests/queries/0_stateless/01318_encrypt.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 --- aes_encrypt_mysql(string, key, block_mode[, init_vector, AAD])
 -- The MySQL-compatitable encryption, only ecb, cbc, cfb128 and ofb modes are supported,
 -- just like for MySQL
diff --git a/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh b/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh
index 13250e82079..9a4df37d206 100755
--- a/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh
+++ b/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01319_manual_write_to_replicas_long.sql b/tests/queries/0_stateless/01319_manual_write_to_replicas_long.sql
index cec75ac1b23..e0c949b0878 100644
--- a/tests/queries/0_stateless/01319_manual_write_to_replicas_long.sql
+++ b/tests/queries/0_stateless/01319_manual_write_to_replicas_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 DROP TABLE IF EXISTS r1;
 DROP TABLE IF EXISTS r2;
 
diff --git a/tests/queries/0_stateless/01319_optimize_skip_unused_shards_nesting.sql b/tests/queries/0_stateless/01319_optimize_skip_unused_shards_nesting.sql
index 4f7d6b81002..f056b87cc8a 100644
--- a/tests/queries/0_stateless/01319_optimize_skip_unused_shards_nesting.sql
+++ b/tests/queries/0_stateless/01319_optimize_skip_unused_shards_nesting.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 drop table if exists data_01319;
 drop table if exists dist_01319;
 drop table if exists dist_layer_01319;
diff --git a/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh b/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
index 678a3aa12fe..758ec4825e0 100755
--- a/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
+++ b/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01320_optimize_skip_unused_shards_no_non_deterministic.sql b/tests/queries/0_stateless/01320_optimize_skip_unused_shards_no_non_deterministic.sql
index f827bb733b4..1cb36e1441d 100644
--- a/tests/queries/0_stateless/01320_optimize_skip_unused_shards_no_non_deterministic.sql
+++ b/tests/queries/0_stateless/01320_optimize_skip_unused_shards_no_non_deterministic.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 drop table if exists data_01320;
 drop table if exists dist_01320;
 
diff --git a/tests/queries/0_stateless/01337_mysql_global_variables.sql b/tests/queries/0_stateless/01337_mysql_global_variables.sql
index b5b982d2852..d76baa85bc5 100644
--- a/tests/queries/0_stateless/01337_mysql_global_variables.sql
+++ b/tests/queries/0_stateless/01337_mysql_global_variables.sql
@@ -1,3 +1,5 @@
+-- Tags: global, no-fasttest
+
 SELECT @@test;
 SELECT @@max_allowed_packet FORMAT CSVWithNames;
 SELECT @@MAX_ALLOWED_PACKET FORMAT CSVWithNames;
diff --git a/tests/queries/0_stateless/01338_long_select_and_alter.sh b/tests/queries/0_stateless/01338_long_select_and_alter.sh
index 499b62564bd..2e3080e9cfc 100755
--- a/tests/queries/0_stateless/01338_long_select_and_alter.sh
+++ b/tests/queries/0_stateless/01338_long_select_and_alter.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh b/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh
index 4aeecc7343d..12bc3b09472 100755
--- a/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh
+++ b/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01338_sha256_fixedstring.sql b/tests/queries/0_stateless/01338_sha256_fixedstring.sql
index 8d34e59f344..bf66b03ec55 100644
--- a/tests/queries/0_stateless/01338_sha256_fixedstring.sql
+++ b/tests/queries/0_stateless/01338_sha256_fixedstring.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT hex(SHA256(''));
 SELECT hex(SHA256('abc'));
 
diff --git a/tests/queries/0_stateless/01339_client_unrecognized_option.sh b/tests/queries/0_stateless/01339_client_unrecognized_option.sh
index f590ed3807e..f88d890f33c 100755
--- a/tests/queries/0_stateless/01339_client_unrecognized_option.sh
+++ b/tests/queries/0_stateless/01339_client_unrecognized_option.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.sql b/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.sql
index d0b6fbe3dde..8bf5d4f2cf8 100644
--- a/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 DROP TABLE IF EXISTS test;
 DROP TABLE IF EXISTS test2;
 
diff --git a/tests/queries/0_stateless/01354_order_by_tuple_collate_const.sql b/tests/queries/0_stateless/01354_order_by_tuple_collate_const.sql
index d9b596f3ec3..132bbb74a00 100644
--- a/tests/queries/0_stateless/01354_order_by_tuple_collate_const.sql
+++ b/tests/queries/0_stateless/01354_order_by_tuple_collate_const.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT number FROM numbers(11) ORDER BY arrayJoin(['а', 'я', '\0�', '', 'Я', '']) ASC, toString(number) ASC, 'y' ASC COLLATE 'el';
diff --git a/tests/queries/0_stateless/01355_alter_column_with_order.sql b/tests/queries/0_stateless/01355_alter_column_with_order.sql
index b3ae8f43042..c0c85e389ea 100644
--- a/tests/queries/0_stateless/01355_alter_column_with_order.sql
+++ b/tests/queries/0_stateless/01355_alter_column_with_order.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS alter_test;
 
 CREATE TABLE alter_test (CounterID UInt32, StartDate Date, UserID UInt32, VisitID UInt32, NestedColumn Nested(A UInt8, S String), ToDrop UInt32) ENGINE = MergeTree(StartDate, intHash32(UserID), (CounterID, StartDate, intHash32(UserID), VisitID), 8192);
diff --git a/tests/queries/0_stateless/01355_ilike.sql b/tests/queries/0_stateless/01355_ilike.sql
index 6f08be2dab2..6bde62bf47e 100644
--- a/tests/queries/0_stateless/01355_ilike.sql
+++ b/tests/queries/0_stateless/01355_ilike.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 SELECT 'Hello' ILIKE '';
 SELECT 'Hello' ILIKE '%';
 SELECT 'Hello' ILIKE '%%';
diff --git a/tests/queries/0_stateless/01357_version_collapsing_attach_detach_zookeeper.sql b/tests/queries/0_stateless/01357_version_collapsing_attach_detach_zookeeper.sql
index d8249a603ff..0b968440370 100644
--- a/tests/queries/0_stateless/01357_version_collapsing_attach_detach_zookeeper.sql
+++ b/tests/queries/0_stateless/01357_version_collapsing_attach_detach_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper, no-parallel
+
 DROP TABLE IF EXISTS versioned_collapsing_table;
 
 CREATE TABLE versioned_collapsing_table(
diff --git a/tests/queries/0_stateless/01358_lc_parquet.sh b/tests/queries/0_stateless/01358_lc_parquet.sh
index 3c49adc6185..886fe4538d1 100755
--- a/tests/queries/0_stateless/01358_lc_parquet.sh
+++ b/tests/queries/0_stateless/01358_lc_parquet.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql b/tests/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql
index 5f4855c6119..1b22082bd83 100644
--- a/tests/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql
+++ b/tests/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS slow_log;
 DROP TABLE IF EXISTS expected_times;
 
diff --git a/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect b/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect
index e0d01d905bb..472106bc4a5 100755
--- a/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect
+++ b/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-unbundled, no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01375_compact_parts_codecs.sql b/tests/queries/0_stateless/01375_compact_parts_codecs.sql
index 698f4148a15..35f125515a2 100644
--- a/tests/queries/0_stateless/01375_compact_parts_codecs.sql
+++ b/tests/queries/0_stateless/01375_compact_parts_codecs.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS codecs;
 
 CREATE TABLE codecs (id UInt32, val UInt32, s String) 
diff --git a/tests/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.sql b/tests/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.sql
index 56f81eb36ec..258d96829a5 100644
--- a/tests/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.sql
+++ b/tests/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- https://github.com/ClickHouse/ClickHouse/issues/11469
 SELECT dictGet('default.countryId', 'country', toUInt64(number)) AS country FROM numbers(2) GROUP BY country; -- { serverError 36; }
 
diff --git a/tests/queries/0_stateless/01378_alter_rename_with_ttl_zookeeper.sql b/tests/queries/0_stateless/01378_alter_rename_with_ttl_zookeeper.sql
index 79d1276ae61..b6982910ace 100644
--- a/tests/queries/0_stateless/01378_alter_rename_with_ttl_zookeeper.sql
+++ b/tests/queries/0_stateless/01378_alter_rename_with_ttl_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS table_rename_with_ttl;
 
 CREATE TABLE table_rename_with_ttl
diff --git a/tests/queries/0_stateless/01383_remote_ambiguous_column_shard.sql b/tests/queries/0_stateless/01383_remote_ambiguous_column_shard.sql
index bdfeba665d7..de552b7b27f 100644
--- a/tests/queries/0_stateless/01383_remote_ambiguous_column_shard.sql
+++ b/tests/queries/0_stateless/01383_remote_ambiguous_column_shard.sql
@@ -1,3 +1,5 @@
+-- Tags: shard, no-parallel
+
 DROP DATABASE IF EXISTS test_01383;
 CREATE DATABASE test_01383;
 
diff --git a/tests/queries/0_stateless/01388_clear_all_columns.sql b/tests/queries/0_stateless/01388_clear_all_columns.sql
index 269c6eee824..c1f59efba83 100644
--- a/tests/queries/0_stateless/01388_clear_all_columns.sql
+++ b/tests/queries/0_stateless/01388_clear_all_columns.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (x UInt8) ENGINE = MergeTree ORDER BY tuple();
 INSERT INTO test (x) VALUES (1), (2), (3);
diff --git a/tests/queries/0_stateless/01391_join_on_dict_crash.sql b/tests/queries/0_stateless/01391_join_on_dict_crash.sql
index 0f26359796d..ac3ca94ddf6 100644
--- a/tests/queries/0_stateless/01391_join_on_dict_crash.sql
+++ b/tests/queries/0_stateless/01391_join_on_dict_crash.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS db_01391;
 CREATE DATABASE db_01391;
 USE db_01391;
diff --git a/tests/queries/0_stateless/01392_column_resolve.sql b/tests/queries/0_stateless/01392_column_resolve.sql
index 728ccfd0728..72b6af4576a 100644
--- a/tests/queries/0_stateless/01392_column_resolve.sql
+++ b/tests/queries/0_stateless/01392_column_resolve.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01392;
 CREATE DATABASE test_01392;
 
diff --git a/tests/queries/0_stateless/01393_benchmark_secure_port.sh b/tests/queries/0_stateless/01393_benchmark_secure_port.sh
index 6928041da14..f75577e6ddf 100755
--- a/tests/queries/0_stateless/01393_benchmark_secure_port.sh
+++ b/tests/queries/0_stateless/01393_benchmark_secure_port.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh b/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh
index 693580bc270..411705e0469 100755
--- a/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh
+++ b/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: replica, no-debug, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01411_bayesian_ab_testing.sql b/tests/queries/0_stateless/01411_bayesian_ab_testing.sql
index e162c3a8e1a..a4b03d76c51 100644
--- a/tests/queries/0_stateless/01411_bayesian_ab_testing.sql
+++ b/tests/queries/0_stateless/01411_bayesian_ab_testing.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT count() FROM (SELECT bayesAB('beta', 1, ['Control', 'A', 'B'], [3000.0, 3000.0, 2000.0], [1000.0, 1100.0, 800.0]));
 SELECT count() FROM (SELECT bayesAB('gamma', 1, ['Control', 'A', 'B'], [3000.0, 3000.0, 2000.0], [1000.0, 1100.0, 800.0]));
 SELECT count() FROM (SELECT bayesAB('beta', 0, ['Control', 'A', 'B'], [3000.0, 3000.0, 2000.0], [1000.0, 1100.0, 800.0]));
diff --git a/tests/queries/0_stateless/01412_cache_dictionary_race.sh b/tests/queries/0_stateless/01412_cache_dictionary_race.sh
index 587cec52932..165a461193d 100755
--- a/tests/queries/0_stateless/01412_cache_dictionary_race.sh
+++ b/tests/queries/0_stateless/01412_cache_dictionary_race.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01412_group_array_moving_shard.sql b/tests/queries/0_stateless/01412_group_array_moving_shard.sql
index 0fbd10bc01a..25e29409f6d 100644
--- a/tests/queries/0_stateless/01412_group_array_moving_shard.sql
+++ b/tests/queries/0_stateless/01412_group_array_moving_shard.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT groupArrayMovingSum(10)(1) FROM remote('127.0.0.{1,2}', numbers(100));
 SELECT groupArrayMovingAvg(10)(1) FROM remote('127.0.0.{1,2}', numbers(100));
 
diff --git a/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh b/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh
index 6e1a6e01757..e47a7c4a40c 100755
--- a/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh
+++ b/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01415_inconsistent_merge_tree_settings.sql b/tests/queries/0_stateless/01415_inconsistent_merge_tree_settings.sql
index 2ce0575c4ad..6fe7a238e88 100644
--- a/tests/queries/0_stateless/01415_inconsistent_merge_tree_settings.sql
+++ b/tests/queries/0_stateless/01415_inconsistent_merge_tree_settings.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS t;
 
 SET mutations_sync = 1;
diff --git a/tests/queries/0_stateless/01415_sticking_mutations.sh b/tests/queries/0_stateless/01415_sticking_mutations.sh
index 2e86b6d972d..821c83fe728 100755
--- a/tests/queries/0_stateless/01415_sticking_mutations.sh
+++ b/tests/queries/0_stateless/01415_sticking_mutations.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database, no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/01417_freeze_partition_verbose.sh b/tests/queries/0_stateless/01417_freeze_partition_verbose.sh
index f5389e3e03d..d2032e279ae 100755
--- a/tests/queries/0_stateless/01417_freeze_partition_verbose.sh
+++ b/tests/queries/0_stateless/01417_freeze_partition_verbose.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database, no-parallel
+# Tag no-replicated-database: Unsupported type of ALTER query
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh b/tests/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh
index 16b39db6e84..5b936b3f2ba 100755
--- a/tests/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh
+++ b/tests/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-replicated-database, no-parallel
+# Tag no-replicated-database: Unsupported type of ALTER query
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01428_h3_range_check.sql b/tests/queries/0_stateless/01428_h3_range_check.sql
index 7c7376a90ae..9024108eca9 100644
--- a/tests/queries/0_stateless/01428_h3_range_check.sql
+++ b/tests/queries/0_stateless/01428_h3_range_check.sql
@@ -1,2 +1,4 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3ToChildren(599405990164561919, 100); -- { serverError 69 }
 SELECT h3ToParent(599405990164561919, 100); -- { serverError 69 }
diff --git a/tests/queries/0_stateless/01429_empty_arrow_and_parquet.sh b/tests/queries/0_stateless/01429_empty_arrow_and_parquet.sh
index 5ee8379d431..0f3396fe8cb 100755
--- a/tests/queries/0_stateless/01429_empty_arrow_and_parquet.sh
+++ b/tests/queries/0_stateless/01429_empty_arrow_and_parquet.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/01430_modify_sample_by_zookeeper_long.sql b/tests/queries/0_stateless/01430_modify_sample_by_zookeeper_long.sql
index 288fa97d218..223c27804df 100644
--- a/tests/queries/0_stateless/01430_modify_sample_by_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01430_modify_sample_by_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS modify_sample;
 
 SET min_insert_block_size_rows = 0, min_insert_block_size_bytes = 0;
diff --git a/tests/queries/0_stateless/01442_h3kring_range_check.sql b/tests/queries/0_stateless/01442_h3kring_range_check.sql
index e580beb17a3..fa79b308068 100644
--- a/tests/queries/0_stateless/01442_h3kring_range_check.sql
+++ b/tests/queries/0_stateless/01442_h3kring_range_check.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3kRing(581276613233082367, 65535); -- { serverError 12 }
 SELECT h3kRing(581276613233082367, -1); -- { serverError 12 }
 SELECT length(h3kRing(111111111111, 1000));
diff --git a/tests/queries/0_stateless/01442_merge_detach_attach_long.sh b/tests/queries/0_stateless/01442_merge_detach_attach_long.sh
index c99069b4aa2..b3f9fbb42dd 100755
--- a/tests/queries/0_stateless/01442_merge_detach_attach_long.sh
+++ b/tests/queries/0_stateless/01442_merge_detach_attach_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/01443_merge_truncate_long.sh b/tests/queries/0_stateless/01443_merge_truncate_long.sh
index ffd5f225ffe..40cfd0fc627 100755
--- a/tests/queries/0_stateless/01443_merge_truncate_long.sh
+++ b/tests/queries/0_stateless/01443_merge_truncate_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 set -e
 
diff --git a/tests/queries/0_stateless/01444_create_table_drop_database_race.sh b/tests/queries/0_stateless/01444_create_table_drop_database_race.sh
index aba83aac207..eb231e71525 100755
--- a/tests/queries/0_stateless/01444_create_table_drop_database_race.sh
+++ b/tests/queries/0_stateless/01444_create_table_drop_database_race.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/01446_json_strings_each_row.sh b/tests/queries/0_stateless/01446_json_strings_each_row.sh
index a2d98cd7f90..3d19977ec1c 100755
--- a/tests/queries/0_stateless/01446_json_strings_each_row.sh
+++ b/tests/queries/0_stateless/01446_json_strings_each_row.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01447_json_strings.sql b/tests/queries/0_stateless/01447_json_strings.sql
index 45fc4a56d7a..2930879d312 100644
--- a/tests/queries/0_stateless/01447_json_strings.sql
+++ b/tests/queries/0_stateless/01447_json_strings.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SET output_format_write_statistics = 0;
 
 SELECT
diff --git a/tests/queries/0_stateless/01448_json_compact_strings_each_row.sql b/tests/queries/0_stateless/01448_json_compact_strings_each_row.sql
index 5a09ca18c33..925faa3a17f 100644
--- a/tests/queries/0_stateless/01448_json_compact_strings_each_row.sql
+++ b/tests/queries/0_stateless/01448_json_compact_strings_each_row.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS test_table;
 DROP TABLE IF EXISTS test_table_2;
 SET input_format_null_as_default = 0;
diff --git a/tests/queries/0_stateless/01449_json_compact_strings.sql b/tests/queries/0_stateless/01449_json_compact_strings.sql
index 5b676e30347..d0a9d72af07 100644
--- a/tests/queries/0_stateless/01449_json_compact_strings.sql
+++ b/tests/queries/0_stateless/01449_json_compact_strings.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SET output_format_write_statistics = 0;
 
 SELECT
diff --git a/tests/queries/0_stateless/01451_detach_drop_part.sql b/tests/queries/0_stateless/01451_detach_drop_part.sql
index a285730e45f..0bc7e13d243 100644
--- a/tests/queries/0_stateless/01451_detach_drop_part.sql
+++ b/tests/queries/0_stateless/01451_detach_drop_part.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS mt_01451;
 
 CREATE TABLE mt_01451 (v UInt8) ENGINE = MergeTree() order by tuple();
diff --git a/tests/queries/0_stateless/01451_replicated_detach_drop_and_quorum_long.sql b/tests/queries/0_stateless/01451_replicated_detach_drop_and_quorum_long.sql
index 2c6bafe4936..0155b83db31 100644
--- a/tests/queries/0_stateless/01451_replicated_detach_drop_and_quorum_long.sql
+++ b/tests/queries/0_stateless/01451_replicated_detach_drop_and_quorum_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica, no-replicated-database
+
 SET replication_alter_partitions_sync = 2;
 
 
diff --git a/tests/queries/0_stateless/01451_replicated_detach_drop_part_long.sql b/tests/queries/0_stateless/01451_replicated_detach_drop_part_long.sql
index 5da86f45fde..eb4d5e43115 100644
--- a/tests/queries/0_stateless/01451_replicated_detach_drop_part_long.sql
+++ b/tests/queries/0_stateless/01451_replicated_detach_drop_part_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, replica, no-replicated-database
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 SET replication_alter_partitions_sync = 2;
 
 DROP TABLE IF EXISTS replica1;
diff --git a/tests/queries/0_stateless/01451_wrong_error_long_query.sh b/tests/queries/0_stateless/01451_wrong_error_long_query.sh
index 333dab193cd..948f22d3a9a 100755
--- a/tests/queries/0_stateless/01451_wrong_error_long_query.sh
+++ b/tests/queries/0_stateless/01451_wrong_error_long_query.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01454_storagememory_data_race_challenge.sh b/tests/queries/0_stateless/01454_storagememory_data_race_challenge.sh
index 49829b288ae..d83343b3cb3 100755
--- a/tests/queries/0_stateless/01454_storagememory_data_race_challenge.sh
+++ b/tests/queries/0_stateless/01454_storagememory_data_race_challenge.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/01455_opentelemetry_distributed.sh b/tests/queries/0_stateless/01455_opentelemetry_distributed.sh
index 59cd1b57d1e..fbbf74bbba2 100755
--- a/tests/queries/0_stateless/01455_opentelemetry_distributed.sh
+++ b/tests/queries/0_stateless/01455_opentelemetry_distributed.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: distributed
+
 set -ue
 
 unset CLICKHOUSE_LOG_COMMENT
diff --git a/tests/queries/0_stateless/01455_rank_correlation_spearman.sql b/tests/queries/0_stateless/01455_rank_correlation_spearman.sql
index e770b0bb4ff..b792d709bbc 100644
--- a/tests/queries/0_stateless/01455_rank_correlation_spearman.sql
+++ b/tests/queries/0_stateless/01455_rank_correlation_spearman.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE IF NOT EXISTS db_01455_rank_correlation;
 USE db_01455_rank_correlation;
 DROP TABLE IF EXISTS moons;
diff --git a/tests/queries/0_stateless/01455_shard_leaf_max_rows_bytes_to_read.sql b/tests/queries/0_stateless/01455_shard_leaf_max_rows_bytes_to_read.sql
index d21aa391890..a271295a0cd 100644
--- a/tests/queries/0_stateless/01455_shard_leaf_max_rows_bytes_to_read.sql
+++ b/tests/queries/0_stateless/01455_shard_leaf_max_rows_bytes_to_read.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- Leaf limits is unreliable w/ prefer_localhost_replica=1.
 -- Since in this case initial query and the query on the local node (to the
 -- underlying table) has the same counters, so if query on the remote node
diff --git a/tests/queries/0_stateless/01455_time_zones.sql b/tests/queries/0_stateless/01455_time_zones.sql
index 4024dbb3348..b04655fb758 100644
--- a/tests/queries/0_stateless/01455_time_zones.sql
+++ b/tests/queries/0_stateless/01455_time_zones.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled
+
 -- There are currently 594 timezones which are used from the binary embedded inside the ClickHouse binary
 -- Refer: contrib/cctz-cmake/CMakeLists.txt for the complete list. The count may change but we expect there will be at least 500 timezones.
 -- SELECT count(*)
diff --git a/tests/queries/0_stateless/01456_ast_optimizations_over_distributed.sql b/tests/queries/0_stateless/01456_ast_optimizations_over_distributed.sql
index 1470d8c8d4f..ee144264193 100644
--- a/tests/queries/0_stateless/01456_ast_optimizations_over_distributed.sql
+++ b/tests/queries/0_stateless/01456_ast_optimizations_over_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SET optimize_move_functions_out_of_any = 1;
 SET optimize_injective_functions_inside_uniq = 1;
 SET optimize_arithmetic_operations_in_aggregate_functions = 1;
diff --git a/tests/queries/0_stateless/01456_modify_column_type_via_add_drop_update.sql b/tests/queries/0_stateless/01456_modify_column_type_via_add_drop_update.sql
index a2e4804f12e..b7cbfc92c26 100644
--- a/tests/queries/0_stateless/01456_modify_column_type_via_add_drop_update.sql
+++ b/tests/queries/0_stateless/01456_modify_column_type_via_add_drop_update.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS tbl;
 CREATE TABLE tbl(a String, b UInt32, c Float64, d Int64, e UInt8) ENGINE=MergeTree ORDER BY tuple();
 INSERT INTO tbl SELECT number, number * 2, number * 3, number * 4, number * 5 FROM system.numbers LIMIT 10;
diff --git a/tests/queries/0_stateless/01457_create_as_table_function_structure.sql b/tests/queries/0_stateless/01457_create_as_table_function_structure.sql
index 9399f06220b..d7c681dc615 100644
--- a/tests/queries/0_stateless/01457_create_as_table_function_structure.sql
+++ b/tests/queries/0_stateless/01457_create_as_table_function_structure.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01457;
 
 CREATE DATABASE test_01457;
diff --git a/tests/queries/0_stateless/01457_int256_hashing.sql b/tests/queries/0_stateless/01457_int256_hashing.sql
index d6d655e80f3..861e567950a 100644
--- a/tests/queries/0_stateless/01457_int256_hashing.sql
+++ b/tests/queries/0_stateless/01457_int256_hashing.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT toUInt256(123) IN (NULL);
 SELECT toUInt256(123) AS k GROUP BY k;
 SELECT toUInt256(123) AS k FROM system.one INNER JOIN (SELECT toUInt256(123) AS k) t USING k;
diff --git a/tests/queries/0_stateless/01459_manual_write_to_replicas.sh b/tests/queries/0_stateless/01459_manual_write_to_replicas.sh
index cf239fd7032..13c772e75d2 100755
--- a/tests/queries/0_stateless/01459_manual_write_to_replicas.sh
+++ b/tests/queries/0_stateless/01459_manual_write_to_replicas.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: replica, no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh b/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh
index 8c322798173..6eabc9ae1b5 100755
--- a/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh
+++ b/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: replica, no-replicated-database, no-parallel
+# Tag no-replicated-database: Fails due to additional replicas or shards
 
 set -e
 
diff --git a/tests/queries/0_stateless/01460_DistributedFilesToInsert.sql b/tests/queries/0_stateless/01460_DistributedFilesToInsert.sql
index 02e3d3ef73f..9b7a98f30bc 100644
--- a/tests/queries/0_stateless/01460_DistributedFilesToInsert.sql
+++ b/tests/queries/0_stateless/01460_DistributedFilesToInsert.sql
@@ -1,3 +1,6 @@
+-- Tags: no-parallel, no-fasttest
+-- Tag no-fasttest: Look at DistributedFilesToInsert, so cannot run in parallel.
+
 -- otherwise SYSTEM STOP DISTRIBUTED SENDS does not makes any effect (for localhost)
 -- (i.e. no .bin files and hence no sending is required)
 set prefer_localhost_replica=0;
diff --git a/tests/queries/0_stateless/01463_test_alter_live_view_refresh.sql b/tests/queries/0_stateless/01463_test_alter_live_view_refresh.sql
index 04276087ece..3c855c984b3 100644
--- a/tests/queries/0_stateless/01463_test_alter_live_view_refresh.sql
+++ b/tests/queries/0_stateless/01463_test_alter_live_view_refresh.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 CREATE TABLE test0 (
         c0 UInt64
     ) ENGINE = MergeTree() PARTITION BY c0 ORDER BY c0;
diff --git a/tests/queries/0_stateless/01465_ttl_recompression.sql b/tests/queries/0_stateless/01465_ttl_recompression.sql
index 2388e727722..a73be94f2c9 100644
--- a/tests/queries/0_stateless/01465_ttl_recompression.sql
+++ b/tests/queries/0_stateless/01465_ttl_recompression.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS recompression_table;
 
 CREATE TABLE recompression_table
diff --git a/tests/queries/0_stateless/01470_show_databases_like.sql b/tests/queries/0_stateless/01470_show_databases_like.sql
index 46ec8878105..33fee27acdb 100644
--- a/tests/queries/0_stateless/01470_show_databases_like.sql
+++ b/tests/queries/0_stateless/01470_show_databases_like.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 create database if not exists test_01470;
 show databases like '%01470';
 drop database test_01470;
diff --git a/tests/queries/0_stateless/01471_calculate_ttl_during_merge.sql b/tests/queries/0_stateless/01471_calculate_ttl_during_merge.sql
index 901c47bc10f..ea8aa1814a3 100644
--- a/tests/queries/0_stateless/01471_calculate_ttl_during_merge.sql
+++ b/tests/queries/0_stateless/01471_calculate_ttl_during_merge.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS table_for_ttl;
 
 CREATE TABLE table_for_ttl(
diff --git a/tests/queries/0_stateless/01473_event_time_microseconds.sql b/tests/queries/0_stateless/01473_event_time_microseconds.sql
index 488ee37e6d8..9c6b392a8aa 100644
--- a/tests/queries/0_stateless/01473_event_time_microseconds.sql
+++ b/tests/queries/0_stateless/01473_event_time_microseconds.sql
@@ -1,3 +1,5 @@
+-- Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug
+
 -- This file contains tests for the event_time_microseconds field for various tables.
 -- Note: Only event_time_microseconds for asynchronous_metric_log table is tested via
 -- an integration test as those metrics take 60s by default to be updated.
diff --git a/tests/queries/0_stateless/01474_bad_global_join.sql b/tests/queries/0_stateless/01474_bad_global_join.sql
index cd98c0f60ec..b65b4e804a8 100644
--- a/tests/queries/0_stateless/01474_bad_global_join.sql
+++ b/tests/queries/0_stateless/01474_bad_global_join.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 DROP TABLE IF EXISTS local_table;
 DROP TABLE IF EXISTS dist_table;
 
diff --git a/tests/queries/0_stateless/01474_executable_dictionary.sql b/tests/queries/0_stateless/01474_executable_dictionary.sql
index 727cf47f79f..6937a09928e 100644
--- a/tests/queries/0_stateless/01474_executable_dictionary.sql
+++ b/tests/queries/0_stateless/01474_executable_dictionary.sql
@@ -1,3 +1,6 @@
+-- Tags: no-tsan, no-parallel
+-- Tag no-tsan: informational stderr from sanitizer at start
+
 SELECT number, dictGet('executable_complex', 'a', (number, number)) AS a, dictGet('executable_complex', 'b', (number, number)) AS b FROM numbers(1000000) WHERE number = 999999;
 SELECT number, dictGet('executable_complex_direct', 'a', (number, number)) AS a, dictGet('executable_complex_direct', 'b', (number, number)) AS b FROM numbers(1000000) WHERE number = 999999;
 SELECT number, dictGet('executable_simple', 'a', number) AS a, dictGet('executable_simple', 'b', number) AS b FROM numbers(1000000) WHERE number = 999999;
diff --git a/tests/queries/0_stateless/01486_json_array_output.sql b/tests/queries/0_stateless/01486_json_array_output.sql
index f8c707d4bee..a9318008874 100644
--- a/tests/queries/0_stateless/01486_json_array_output.sql
+++ b/tests/queries/0_stateless/01486_json_array_output.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 set output_format_json_array_of_rows = 1;
 select number a, number * 2 b from numbers(3) format JSONEachRow;
 select * from numbers(1) format JSONEachRow;
diff --git a/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql b/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql
index 39e04804bfb..ccd2c571290 100644
--- a/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql
+++ b/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-parallel
+
 CREATE DATABASE IF NOT EXISTS shard_0;
 CREATE DATABASE IF NOT EXISTS shard_1;
 CREATE DATABASE IF NOT EXISTS main_01487;
diff --git a/tests/queries/0_stateless/01493_alter_remove_no_property_zookeeper_long.sql b/tests/queries/0_stateless/01493_alter_remove_no_property_zookeeper_long.sql
index 8d37900aaf8..e9859d3fe96 100644
--- a/tests/queries/0_stateless/01493_alter_remove_no_property_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01493_alter_remove_no_property_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS no_prop_table;
 
 CREATE TABLE no_prop_table
diff --git a/tests/queries/0_stateless/01493_alter_remove_properties_zookeeper.sql b/tests/queries/0_stateless/01493_alter_remove_properties_zookeeper.sql
index 55f610eb7d0..92e6fce2c93 100644
--- a/tests/queries/0_stateless/01493_alter_remove_properties_zookeeper.sql
+++ b/tests/queries/0_stateless/01493_alter_remove_properties_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper, no-parallel
+
 DROP TABLE IF EXISTS r_prop_table1;
 DROP TABLE IF EXISTS r_prop_table2;
 
diff --git a/tests/queries/0_stateless/01493_storage_set_persistency.sql b/tests/queries/0_stateless/01493_storage_set_persistency.sql
index 9298a24bf73..558e92fbfe9 100644
--- a/tests/queries/0_stateless/01493_storage_set_persistency.sql
+++ b/tests/queries/0_stateless/01493_storage_set_persistency.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS set;
 DROP TABLE IF EXISTS number;
 
diff --git a/tests/queries/0_stateless/01494_storage_join_persistency.sql b/tests/queries/0_stateless/01494_storage_join_persistency.sql
index c362a78dccd..9ea7196aa24 100644
--- a/tests/queries/0_stateless/01494_storage_join_persistency.sql
+++ b/tests/queries/0_stateless/01494_storage_join_persistency.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS join;
 
 SELECT '----- Default Settings -----';
diff --git a/tests/queries/0_stateless/01499_json_named_tuples.sql b/tests/queries/0_stateless/01499_json_named_tuples.sql
index 896c3ecb2bb..947455f0320 100644
--- a/tests/queries/0_stateless/01499_json_named_tuples.sql
+++ b/tests/queries/0_stateless/01499_json_named_tuples.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 create table named_tuples engine File(JSONEachRow)
     settings output_format_json_named_tuples_as_objects = 1
     as select cast(tuple(number, number * 2), 'Tuple(a int, b int)') c
diff --git a/tests/queries/0_stateless/01499_log_deadlock.sql b/tests/queries/0_stateless/01499_log_deadlock.sql
index e98b37f2455..f361297e0b8 100644
--- a/tests/queries/0_stateless/01499_log_deadlock.sql
+++ b/tests/queries/0_stateless/01499_log_deadlock.sql
@@ -1,3 +1,5 @@
+-- Tags: deadlock
+
 DROP TABLE IF EXISTS t;
 CREATE TABLE t (x UInt8) ENGINE = TinyLog;
 
diff --git a/tests/queries/0_stateless/01501_cache_dictionary_all_fields.sql b/tests/queries/0_stateless/01501_cache_dictionary_all_fields.sql
index bb9fb0caa6c..9b383399c51 100644
--- a/tests/queries/0_stateless/01501_cache_dictionary_all_fields.sql
+++ b/tests/queries/0_stateless/01501_cache_dictionary_all_fields.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop database if exists db_01501;
 drop table if exists db_01501.table_cache_dict;
 drop dictionary if exists db_01501.cache_dict;
diff --git a/tests/queries/0_stateless/01501_clickhouse_client_INSERT_exception.sh b/tests/queries/0_stateless/01501_clickhouse_client_INSERT_exception.sh
index 2abb1818529..b84aeb48caa 100755
--- a/tests/queries/0_stateless/01501_clickhouse_client_INSERT_exception.sh
+++ b/tests/queries/0_stateless/01501_clickhouse_client_INSERT_exception.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01502_log_tinylog_deadlock_race.sh b/tests/queries/0_stateless/01502_log_tinylog_deadlock_race.sh
index 8bcb5f8a7e8..b659d550fa4 100755
--- a/tests/queries/0_stateless/01502_log_tinylog_deadlock_race.sh
+++ b/tests/queries/0_stateless/01502_log_tinylog_deadlock_race.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock
 
 set -e
 
diff --git a/tests/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh b/tests/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh
index 441399a500e..1087a7ed96b 100755
--- a/tests/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh
+++ b/tests/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock
 
 set -e
 
diff --git a/tests/queries/0_stateless/01504_rocksdb.sql b/tests/queries/0_stateless/01504_rocksdb.sql
index 9e30263c6b3..9f9e6c3b1ac 100644
--- a/tests/queries/0_stateless/01504_rocksdb.sql
+++ b/tests/queries/0_stateless/01504_rocksdb.sql
@@ -1,3 +1,7 @@
+-- Tags: no-ordinary-database, no-fasttest
+-- Tag no-ordinary-database: Sometimes cannot lock file most likely due to concurrent or adjacent tests, but we don't care how it works in Ordinary database
+-- Tag no-fasttest: In fasttest, ENABLE_LIBRARIES=0, so rocksdb engine is not enabled by default
+
 DROP TABLE IF EXISTS 01504_test;
 
 CREATE TABLE 01504_test (key String, value UInt32) Engine=EmbeddedRocksDB; -- { serverError 36 }
diff --git a/tests/queries/0_stateless/01505_distributed_local_type_conversion_enum.sql b/tests/queries/0_stateless/01505_distributed_local_type_conversion_enum.sql
index 6f62716d312..85c07a95919 100644
--- a/tests/queries/0_stateless/01505_distributed_local_type_conversion_enum.sql
+++ b/tests/queries/0_stateless/01505_distributed_local_type_conversion_enum.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS t;
 DROP TABLE IF EXISTS d;
 
diff --git a/tests/queries/0_stateless/01505_log_distributed_deadlock.sql b/tests/queries/0_stateless/01505_log_distributed_deadlock.sql
index 2b0b2b97188..49817dbed32 100644
--- a/tests/queries/0_stateless/01505_log_distributed_deadlock.sql
+++ b/tests/queries/0_stateless/01505_log_distributed_deadlock.sql
@@ -1,3 +1,5 @@
+-- Tags: deadlock, distributed
+
 DROP TABLE IF EXISTS t_local;
 DROP TABLE IF EXISTS t_dist;
 
diff --git a/tests/queries/0_stateless/01507_clickhouse_server_start_with_embedded_config.sh b/tests/queries/0_stateless/01507_clickhouse_server_start_with_embedded_config.sh
index 5b8f0cba639..5cee3ecff0d 100755
--- a/tests/queries/0_stateless/01507_clickhouse_server_start_with_embedded_config.sh
+++ b/tests/queries/0_stateless/01507_clickhouse_server_start_with_embedded_config.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CLICKHOUSE_PORT_TCP=50111
 CLICKHOUSE_DATABASE=default
diff --git a/tests/queries/0_stateless/01508_partition_pruning_long.sh b/tests/queries/0_stateless/01508_partition_pruning_long.sh
index 745d08496a7..ddf63bf4808 100755
--- a/tests/queries/0_stateless/01508_partition_pruning_long.sh
+++ b/tests/queries/0_stateless/01508_partition_pruning_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long, no-polymorphic-parts
+# Tag no-polymorphic-parts: bug, shoud be fixed
 
 # Description of test result:
 # Test the correctness of the partition pruning
diff --git a/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.sh b/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.sh
index 156deb60ff9..7db9f22951c 100755
--- a/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, zookeeper
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh b/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh
index 187357b94e2..c2682cd8cfa 100755
--- a/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh
+++ b/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long, no-replicated-database
+# Tag no-replicated-database: Fails due to additional replicas or shards
 
 set -e
 
diff --git a/tests/queries/0_stateless/01509_check_parallel_quorum_inserts_long.sh b/tests/queries/0_stateless/01509_check_parallel_quorum_inserts_long.sh
index 78336ea073b..1589f17c752 100755
--- a/tests/queries/0_stateless/01509_check_parallel_quorum_inserts_long.sh
+++ b/tests/queries/0_stateless/01509_check_parallel_quorum_inserts_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long, no-replicated-database
+# Tag no-replicated-database: Fails due to additional replicas or shards
 
 set -e
 
diff --git a/tests/queries/0_stateless/01509_dictionary_preallocate.sh b/tests/queries/0_stateless/01509_dictionary_preallocate.sh
index f2bc17d2e90..7b0448bfde8 100755
--- a/tests/queries/0_stateless/01509_dictionary_preallocate.sh
+++ b/tests/queries/0_stateless/01509_dictionary_preallocate.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 # shellcheck disable=SC2031
 # shellcheck disable=SC2030
diff --git a/tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh b/tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh
index fbeb65419ce..f3cdb70a074 100755
--- a/tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh
+++ b/tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long, no-replicated-database
+# Tag no-replicated-database: Fails due to additional replicas or shards
 
 set -e
 
diff --git a/tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas_long.sql b/tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas_long.sql
index ba2b774b718..2f0c59ab64b 100644
--- a/tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas_long.sql
+++ b/tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, replica, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 DROP TABLE IF EXISTS r1 SYNC;
 DROP TABLE IF EXISTS r2 SYNC;
 
diff --git a/tests/queries/0_stateless/01511_alter_version_versioned_collapsing_merge_tree_zookeeper.sql b/tests/queries/0_stateless/01511_alter_version_versioned_collapsing_merge_tree_zookeeper.sql
index 17a6b8883a4..aff4e100579 100644
--- a/tests/queries/0_stateless/01511_alter_version_versioned_collapsing_merge_tree_zookeeper.sql
+++ b/tests/queries/0_stateless/01511_alter_version_versioned_collapsing_merge_tree_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS table_with_version_replicated_1;
 DROP TABLE IF EXISTS table_with_version_replicated_2;
 
diff --git a/tests/queries/0_stateless/01512_create_replicate_merge_tree_one_arg.sql b/tests/queries/0_stateless/01512_create_replicate_merge_tree_one_arg.sql
index 2ee73865122..fbdf68e6063 100644
--- a/tests/queries/0_stateless/01512_create_replicate_merge_tree_one_arg.sql
+++ b/tests/queries/0_stateless/01512_create_replicate_merge_tree_one_arg.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 CREATE TABLE mt (v UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01497/mt')
     ORDER BY tuple() -- { serverError 36 }
 
diff --git a/tests/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper_long.sql b/tests/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper_long.sql
index 925dd042435..f800ff86aa5 100644
--- a/tests/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS quorum1 SYNC;
diff --git a/tests/queries/0_stateless/01513_optimize_aggregation_in_order_memory_long.sql b/tests/queries/0_stateless/01513_optimize_aggregation_in_order_memory_long.sql
index 87c66609421..cca994e8e4a 100644
--- a/tests/queries/0_stateless/01513_optimize_aggregation_in_order_memory_long.sql
+++ b/tests/queries/0_stateless/01513_optimize_aggregation_in_order_memory_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 drop table if exists data_01513;
 create table data_01513 (key String) engine=MergeTree() order by key;
 -- 10e3 groups, 1e3 keys each
diff --git a/tests/queries/0_stateless/01514_distributed_cancel_query_on_error.sh b/tests/queries/0_stateless/01514_distributed_cancel_query_on_error.sh
index 726dcc8ee6d..99025890cb3 100755
--- a/tests/queries/0_stateless/01514_distributed_cancel_query_on_error.sh
+++ b/tests/queries/0_stateless/01514_distributed_cancel_query_on_error.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: distributed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01514_input_format_json_enum_as_number.sql b/tests/queries/0_stateless/01514_input_format_json_enum_as_number.sql
index 8d55a257c47..0b2cb8c64e2 100644
--- a/tests/queries/0_stateless/01514_input_format_json_enum_as_number.sql
+++ b/tests/queries/0_stateless/01514_input_format_json_enum_as_number.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS table_with_enum_column_for_json_insert;
 
 CREATE TABLE table_with_enum_column_for_json_insert (
diff --git a/tests/queries/0_stateless/01515_logtrace_function.sh b/tests/queries/0_stateless/01515_logtrace_function.sh
index 9953fc2ae2b..131ec0edb9e 100755
--- a/tests/queries/0_stateless/01515_logtrace_function.sh
+++ b/tests/queries/0_stateless/01515_logtrace_function.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01515_with_global_and_with_propagation.sql b/tests/queries/0_stateless/01515_with_global_and_with_propagation.sql
index cd62dfa993d..31151fbc8f4 100644
--- a/tests/queries/0_stateless/01515_with_global_and_with_propagation.sql
+++ b/tests/queries/0_stateless/01515_with_global_and_with_propagation.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 SET enable_global_with_statement = 1;
 
 with 1 as x select x;
diff --git a/tests/queries/0_stateless/01516_create_table_primary_key.sql b/tests/queries/0_stateless/01516_create_table_primary_key.sql
index c0e9ce4a34d..b3c4acd50ff 100644
--- a/tests/queries/0_stateless/01516_create_table_primary_key.sql
+++ b/tests/queries/0_stateless/01516_create_table_primary_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01516;
 CREATE DATABASE test_01516 ENGINE=Ordinary;     -- Full ATTACH requires UUID with Atomic
 USE test_01516;
diff --git a/tests/queries/0_stateless/01516_drop_table_stress_long.sh b/tests/queries/0_stateless/01516_drop_table_stress_long.sh
index 20e76ce49c7..91818e45775 100755
--- a/tests/queries/0_stateless/01516_drop_table_stress_long.sh
+++ b/tests/queries/0_stateless/01516_drop_table_stress_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01517_drop_mv_with_inner_table.sql b/tests/queries/0_stateless/01517_drop_mv_with_inner_table.sql
index b97480c2911..5e31faa70da 100644
--- a/tests/queries/0_stateless/01517_drop_mv_with_inner_table.sql
+++ b/tests/queries/0_stateless/01517_drop_mv_with_inner_table.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 --
 -- Atomic no SYNC
 -- (should go first to check that thread for DROP TABLE does not hang)
diff --git a/tests/queries/0_stateless/01517_select_final_distributed.sql b/tests/queries/0_stateless/01517_select_final_distributed.sql
index 1acc4590982..a3d1fcfc185 100644
--- a/tests/queries/0_stateless/01517_select_final_distributed.sql
+++ b/tests/queries/0_stateless/01517_select_final_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS test5346;
 
 CREATE TABLE test5346 (`Id` String, `Timestamp` DateTime, `updated` DateTime) 
diff --git a/tests/queries/0_stateless/01519_topK_distributed_parametrized.sql b/tests/queries/0_stateless/01519_topK_distributed_parametrized.sql
index 9963823023d..0e35d270f20 100644
--- a/tests/queries/0_stateless/01519_topK_distributed_parametrized.sql
+++ b/tests/queries/0_stateless/01519_topK_distributed_parametrized.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 CREATE TABLE IF NOT EXISTS topXtest(A Int64) ENGINE = Memory;
 INSERT INTO topXtest SELECT number FROM numbers(100);
 INSERT INTO topXtest SELECT number FROM numbers(30);
diff --git a/tests/queries/0_stateless/01520_client_print_query_id.expect b/tests/queries/0_stateless/01520_client_print_query_id.expect
index b0ff5d9d165..1989ab51aea 100755
--- a/tests/queries/0_stateless/01520_client_print_query_id.expect
+++ b/tests/queries/0_stateless/01520_client_print_query_id.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01521_distributed_query_hang.sql b/tests/queries/0_stateless/01521_distributed_query_hang.sql
index 73e0f1ec921..9ec303947c9 100644
--- a/tests/queries/0_stateless/01521_distributed_query_hang.sql
+++ b/tests/queries/0_stateless/01521_distributed_query_hang.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- regression for endless loop with connections_with_failover_max_tries=0
 set connections_with_failover_max_tries=0;
 select * from remote('127.2', system.one);
diff --git a/tests/queries/0_stateless/01521_global_in_prewhere_15792.sql b/tests/queries/0_stateless/01521_global_in_prewhere_15792.sql
index adb7bccd0df..fe58710a9e6 100644
--- a/tests/queries/0_stateless/01521_global_in_prewhere_15792.sql
+++ b/tests/queries/0_stateless/01521_global_in_prewhere_15792.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 drop table if exists xp;
 drop table if exists xp_d;
 
diff --git a/tests/queries/0_stateless/01523_client_local_queries_file_parameter.sh b/tests/queries/0_stateless/01523_client_local_queries_file_parameter.sh
index f4681907ced..cf19efa9b7d 100755
--- a/tests/queries/0_stateless/01523_client_local_queries_file_parameter.sh
+++ b/tests/queries/0_stateless/01523_client_local_queries_file_parameter.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01526_alter_add_and_modify_order_zookeeper.sql b/tests/queries/0_stateless/01526_alter_add_and_modify_order_zookeeper.sql
index db8c2de0950..24f43a89c0b 100644
--- a/tests/queries/0_stateless/01526_alter_add_and_modify_order_zookeeper.sql
+++ b/tests/queries/0_stateless/01526_alter_add_and_modify_order_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS table_for_alter;
 
 SET replication_alter_partitions_sync = 2;
diff --git a/tests/queries/0_stateless/01526_client_start_and_exit.sh b/tests/queries/0_stateless/01526_client_start_and_exit.sh
index 19f9cb8c37b..82eb56305fc 100755
--- a/tests/queries/0_stateless/01526_client_start_and_exit.sh
+++ b/tests/queries/0_stateless/01526_client_start_and_exit.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01526_complex_key_dict_direct_layout.sql b/tests/queries/0_stateless/01526_complex_key_dict_direct_layout.sql
index c303b35386f..30a5b7e8783 100644
--- a/tests/queries/0_stateless/01526_complex_key_dict_direct_layout.sql
+++ b/tests/queries/0_stateless/01526_complex_key_dict_direct_layout.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS db_01526;
 
 CREATE DATABASE db_01526;
diff --git a/tests/queries/0_stateless/01526_max_untracked_memory.sh b/tests/queries/0_stateless/01526_max_untracked_memory.sh
index df5dbae35a9..20c986f14ca 100755
--- a/tests/queries/0_stateless/01526_max_untracked_memory.sh
+++ b/tests/queries/0_stateless/01526_max_untracked_memory.sh
@@ -1,4 +1,9 @@
 #!/usr/bin/env bash
+# Tags: no-tsan, no-asan, no-ubsan, no-msan
+# Tag no-tsan: requires TraceCollector, does not available under sanitizers
+# Tag no-asan: requires TraceCollector, does not available under sanitizers
+# Tag no-ubsan: requires TraceCollector, does not available under sanitizers
+# Tag no-msan: requires TraceCollector, does not available under sanitizers
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01527_clickhouse_local_optimize.sh b/tests/queries/0_stateless/01527_clickhouse_local_optimize.sh
index 82453c00ca4..d63765fc179 100755
--- a/tests/queries/0_stateless/01527_clickhouse_local_optimize.sh
+++ b/tests/queries/0_stateless/01527_clickhouse_local_optimize.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01527_dist_sharding_key_dictGet_reload.sql b/tests/queries/0_stateless/01527_dist_sharding_key_dictGet_reload.sql
index 7e0782ebe84..5e42fe69c2f 100644
--- a/tests/queries/0_stateless/01527_dist_sharding_key_dictGet_reload.sql
+++ b/tests/queries/0_stateless/01527_dist_sharding_key_dictGet_reload.sql
@@ -1,3 +1,5 @@
+-- Tags: shard, no-parallel
+
 set allow_nondeterministic_optimize_skip_unused_shards=1;
 set optimize_skip_unused_shards=1;
 set force_optimize_skip_unused_shards=2;
diff --git a/tests/queries/0_stateless/01528_allow_nondeterministic_optimize_skip_unused_shards.sql b/tests/queries/0_stateless/01528_allow_nondeterministic_optimize_skip_unused_shards.sql
index 51970db73cb..08fba7480d1 100644
--- a/tests/queries/0_stateless/01528_allow_nondeterministic_optimize_skip_unused_shards.sql
+++ b/tests/queries/0_stateless/01528_allow_nondeterministic_optimize_skip_unused_shards.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 drop table if exists dist_01528;
 create table dist_01528 as system.one engine=Distributed('test_cluster_two_shards', system, one, rand()+dummy);
 
diff --git a/tests/queries/0_stateless/01529_bad_memory_tracking.sh b/tests/queries/0_stateless/01529_bad_memory_tracking.sh
index 6f614d8329f..f5d096cc799 100755
--- a/tests/queries/0_stateless/01529_bad_memory_tracking.sh
+++ b/tests/queries/0_stateless/01529_bad_memory_tracking.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
 
diff --git a/tests/queries/0_stateless/01530_drop_database_atomic_sync.sql b/tests/queries/0_stateless/01530_drop_database_atomic_sync.sql
index 07fe00693d1..7a2e64742cf 100644
--- a/tests/queries/0_stateless/01530_drop_database_atomic_sync.sql
+++ b/tests/queries/0_stateless/01530_drop_database_atomic_sync.sql
@@ -1,3 +1,6 @@
+-- Tags: no-parallel
+-- Tag no-parallel: creates database
+
 drop database if exists db_01530_atomic sync;
 
 create database db_01530_atomic Engine=Atomic;
diff --git a/tests/queries/0_stateless/01532_collate_in_low_cardinality.sql b/tests/queries/0_stateless/01532_collate_in_low_cardinality.sql
index b6fba26eb2d..ace36236292 100644
--- a/tests/queries/0_stateless/01532_collate_in_low_cardinality.sql
+++ b/tests/queries/0_stateless/01532_collate_in_low_cardinality.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS test_collate;
 DROP TABLE IF EXISTS test_collate_null;
 
diff --git a/tests/queries/0_stateless/01532_execute_merges_on_single_replica_long.sql b/tests/queries/0_stateless/01532_execute_merges_on_single_replica_long.sql
index 85a2e893f37..8df6d0b314e 100644
--- a/tests/queries/0_stateless/01532_execute_merges_on_single_replica_long.sql
+++ b/tests/queries/0_stateless/01532_execute_merges_on_single_replica_long.sql
@@ -1,3 +1,7 @@
+-- Tags: long, replica, no-replicated-database, no-parallel
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+-- Tag no-parallel: static zk path
+
 DROP TABLE IF EXISTS execute_on_single_replica_r1 NO DELAY;
 DROP TABLE IF EXISTS execute_on_single_replica_r2 NO DELAY;
 
diff --git a/tests/queries/0_stateless/01532_primary_key_without_order_by_zookeeper.sql b/tests/queries/0_stateless/01532_primary_key_without_order_by_zookeeper.sql
index 31294d8ebbc..8d413cf6c35 100644
--- a/tests/queries/0_stateless/01532_primary_key_without_order_by_zookeeper.sql
+++ b/tests/queries/0_stateless/01532_primary_key_without_order_by_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS merge_tree_pk;
 
 CREATE TABLE merge_tree_pk
diff --git a/tests/queries/0_stateless/01533_collate_in_nullable.sql b/tests/queries/0_stateless/01533_collate_in_nullable.sql
index 40b48bee465..9e54581bc54 100644
--- a/tests/queries/0_stateless/01533_collate_in_nullable.sql
+++ b/tests/queries/0_stateless/01533_collate_in_nullable.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS test_collate;
 
 CREATE TABLE test_collate (x UInt32, s Nullable(String)) ENGINE=Memory();
diff --git a/tests/queries/0_stateless/01541_max_memory_usage_for_user_long.sh b/tests/queries/0_stateless/01541_max_memory_usage_for_user_long.sh
index 32877bfd0fe..e2d0306fee0 100755
--- a/tests/queries/0_stateless/01541_max_memory_usage_for_user_long.sh
+++ b/tests/queries/0_stateless/01541_max_memory_usage_for_user_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-replicated-database, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01542_collate_in_array.sql b/tests/queries/0_stateless/01542_collate_in_array.sql
index dd0ec769e7d..1e748bd549f 100644
--- a/tests/queries/0_stateless/01542_collate_in_array.sql
+++ b/tests/queries/0_stateless/01542_collate_in_array.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS collate_test1;
 DROP TABLE IF EXISTS collate_test2;
 DROP TABLE IF EXISTS collate_test3;
diff --git a/tests/queries/0_stateless/01542_dictionary_load_exception_race.sh b/tests/queries/0_stateless/01542_dictionary_load_exception_race.sh
index 334fcc87baf..981beb785a5 100755
--- a/tests/queries/0_stateless/01542_dictionary_load_exception_race.sh
+++ b/tests/queries/0_stateless/01542_dictionary_load_exception_race.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01543_avro_deserialization_with_lc.sh b/tests/queries/0_stateless/01543_avro_deserialization_with_lc.sh
index f3f636dee73..6dea9f30db3 100755
--- a/tests/queries/0_stateless/01543_avro_deserialization_with_lc.sh
+++ b/tests/queries/0_stateless/01543_avro_deserialization_with_lc.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01543_collate_in_tuple.sql b/tests/queries/0_stateless/01543_collate_in_tuple.sql
index 17d9426cf45..222f7762b32 100644
--- a/tests/queries/0_stateless/01543_collate_in_tuple.sql
+++ b/tests/queries/0_stateless/01543_collate_in_tuple.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS collate_test1;
 DROP TABLE IF EXISTS collate_test2;
 DROP TABLE IF EXISTS collate_test3;
diff --git a/tests/queries/0_stateless/01545_system_errors.sh b/tests/queries/0_stateless/01545_system_errors.sh
index 970fd403866..11db3836ddb 100755
--- a/tests/queries/0_stateless/01545_system_errors.sh
+++ b/tests/queries/0_stateless/01545_system_errors.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
+# Tag no-fasttest: Checks system.errors
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01557_max_parallel_replicas_no_sample.sql b/tests/queries/0_stateless/01557_max_parallel_replicas_no_sample.sql
index d86f692a1ea..2b1a66147a4 100644
--- a/tests/queries/0_stateless/01557_max_parallel_replicas_no_sample.sql
+++ b/tests/queries/0_stateless/01557_max_parallel_replicas_no_sample.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 DROP TABLE IF EXISTS t;
 CREATE TABLE t (x String) ENGINE = MergeTree ORDER BY x;
 INSERT INTO t VALUES ('Hello');
diff --git a/tests/queries/0_stateless/01560_merge_distributed_join.sql b/tests/queries/0_stateless/01560_merge_distributed_join.sql
index 991a0609dcd..40e89135de7 100644
--- a/tests/queries/0_stateless/01560_merge_distributed_join.sql
+++ b/tests/queries/0_stateless/01560_merge_distributed_join.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- test from https://github.com/ClickHouse/ClickHouse/issues/11755#issuecomment-700850254
 DROP TABLE IF EXISTS cat_hist;
 DROP TABLE IF EXISTS prod_hist;
diff --git a/tests/queries/0_stateless/01560_optimize_on_insert_long.sql b/tests/queries/0_stateless/01560_optimize_on_insert_long.sql
index 1c6418a50df..5570bb76230 100644
--- a/tests/queries/0_stateless/01560_optimize_on_insert_long.sql
+++ b/tests/queries/0_stateless/01560_optimize_on_insert_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SELECT 'Replacing Merge Tree';
 DROP TABLE IF EXISTS replacing_merge_tree;
 CREATE TABLE replacing_merge_tree (key UInt32, date Datetime) ENGINE=ReplacingMergeTree() PARTITION BY date ORDER BY key;
diff --git a/tests/queries/0_stateless/01560_optimize_on_insert_zookeeper.sql b/tests/queries/0_stateless/01560_optimize_on_insert_zookeeper.sql
index a98818b2195..f909c2129c1 100644
--- a/tests/queries/0_stateless/01560_optimize_on_insert_zookeeper.sql
+++ b/tests/queries/0_stateless/01560_optimize_on_insert_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper, no-parallel
+
 DROP TABLE IF EXISTS empty1;
 DROP TABLE IF EXISTS empty2;
 
diff --git a/tests/queries/0_stateless/01561_clickhouse_client_stage.sh b/tests/queries/0_stateless/01561_clickhouse_client_stage.sh
index a01bc7f5065..72161333812 100755
--- a/tests/queries/0_stateless/01561_clickhouse_client_stage.sh
+++ b/tests/queries/0_stateless/01561_clickhouse_client_stage.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01561_mann_whitney_scipy.sh b/tests/queries/0_stateless/01561_mann_whitney_scipy.sh
index a04b630e2f3..8c68dec8925 100755
--- a/tests/queries/0_stateless/01561_mann_whitney_scipy.sh
+++ b/tests/queries/0_stateless/01561_mann_whitney_scipy.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: Require python libraries like scipy, pandas and numpy
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01563_distributed_query_finish.sh b/tests/queries/0_stateless/01563_distributed_query_finish.sh
index a9e6a5b1fce..b49042ead9d 100755
--- a/tests/queries/0_stateless/01563_distributed_query_finish.sh
+++ b/tests/queries/0_stateless/01563_distributed_query_finish.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: distributed, no-parallel, no-fasttest
+# Tag no-fasttest: Checks system.errors
 
 # query finish should not produce any NETWORK_ERROR
 # (NETWORK_ERROR will be in case of connection reset)
diff --git a/tests/queries/0_stateless/01565_reconnect_after_client_error.expect b/tests/queries/0_stateless/01565_reconnect_after_client_error.expect
index 712fe4ff64a..261e46c2111 100755
--- a/tests/queries/0_stateless/01565_reconnect_after_client_error.expect
+++ b/tests/queries/0_stateless/01565_reconnect_after_client_error.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-fasttest
 
 # This is a separate test, because we want to test the interactive mode.
 # https://github.com/ClickHouse/ClickHouse/issues/19353
diff --git a/tests/queries/0_stateless/01568_window_functions_distributed.sql b/tests/queries/0_stateless/01568_window_functions_distributed.sql
index 5e20c57d23d..140b02bfa6d 100644
--- a/tests/queries/0_stateless/01568_window_functions_distributed.sql
+++ b/tests/queries/0_stateless/01568_window_functions_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- { echo }
 select row_number() over (order by dummy) from (select * from remote('127.0.0.{1,2}', system, one));
 
diff --git a/tests/queries/0_stateless/01569_query_profiler_big_query_id.sh b/tests/queries/0_stateless/01569_query_profiler_big_query_id.sh
index 98e85e9b196..2588a98fbfc 100755
--- a/tests/queries/0_stateless/01569_query_profiler_big_query_id.sh
+++ b/tests/queries/0_stateless/01569_query_profiler_big_query_id.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-unbundled
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01575_disable_detach_table_of_dictionary.sql b/tests/queries/0_stateless/01575_disable_detach_table_of_dictionary.sql
index 0dc402715c3..2cf9ce661b6 100644
--- a/tests/queries/0_stateless/01575_disable_detach_table_of_dictionary.sql
+++ b/tests/queries/0_stateless/01575_disable_detach_table_of_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS database_for_dict;
 
 CREATE DATABASE database_for_dict;
diff --git a/tests/queries/0_stateless/01581_deduplicate_by_columns_replicated_long.sql b/tests/queries/0_stateless/01581_deduplicate_by_columns_replicated_long.sql
index cc8c721b6a8..87eec36a596 100644
--- a/tests/queries/0_stateless/01581_deduplicate_by_columns_replicated_long.sql
+++ b/tests/queries/0_stateless/01581_deduplicate_by_columns_replicated_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 --- See also tests/queries/0_stateless/01581_deduplicate_by_columns_local.sql
 
 --- replicated case
diff --git a/tests/queries/0_stateless/01584_distributed_buffer_cannot_find_column.sql b/tests/queries/0_stateless/01584_distributed_buffer_cannot_find_column.sql
index 4d58e51d690..648eb14f507 100644
--- a/tests/queries/0_stateless/01584_distributed_buffer_cannot_find_column.sql
+++ b/tests/queries/0_stateless/01584_distributed_buffer_cannot_find_column.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS realtimedrep;
 DROP TABLE IF EXISTS realtimedistributed;
 DROP TABLE IF EXISTS realtimebuff;
diff --git a/tests/queries/0_stateless/01585_use_index_for_global_in.sql b/tests/queries/0_stateless/01585_use_index_for_global_in.sql
index 8f89fc1a57b..a0a5b90ac1f 100644
--- a/tests/queries/0_stateless/01585_use_index_for_global_in.sql
+++ b/tests/queries/0_stateless/01585_use_index_for_global_in.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 drop table if exists xp;
 drop table if exists xp_d;
 
diff --git a/tests/queries/0_stateless/01585_use_index_for_global_in_with_null.sql b/tests/queries/0_stateless/01585_use_index_for_global_in_with_null.sql
index 72f12ce435a..6129c92c888 100644
--- a/tests/queries/0_stateless/01585_use_index_for_global_in_with_null.sql
+++ b/tests/queries/0_stateless/01585_use_index_for_global_in_with_null.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 drop table if exists xp;
 drop table if exists xp_d;
 
diff --git a/tests/queries/0_stateless/01586_replicated_mutations_empty_partition.sql b/tests/queries/0_stateless/01586_replicated_mutations_empty_partition.sql
index 73245fe49ec..e52e0c94c3c 100644
--- a/tests/queries/0_stateless/01586_replicated_mutations_empty_partition.sql
+++ b/tests/queries/0_stateless/01586_replicated_mutations_empty_partition.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 DROP TABLE IF EXISTS replicated_mutations_empty_partitions;
 
 CREATE TABLE replicated_mutations_empty_partitions
diff --git a/tests/queries/0_stateless/01592_long_window_functions1.sql b/tests/queries/0_stateless/01592_long_window_functions1.sql
index 14fe3affed3..4911b7aa792 100644
--- a/tests/queries/0_stateless/01592_long_window_functions1.sql
+++ b/tests/queries/0_stateless/01592_long_window_functions1.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 drop table if exists stack;
 
 set max_insert_threads = 4;
diff --git a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh
index d40406222c2..bc0b92eb55b 100755
--- a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh
+++ b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.sh b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.sh
index bb04facba15..f8f3ccd6dd6 100755
--- a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.sh
+++ b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, replica, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01594_too_low_memory_limits.sh b/tests/queries/0_stateless/01594_too_low_memory_limits.sh
index 6a33bd81dd1..b513a947bd9 100755
--- a/tests/queries/0_stateless/01594_too_low_memory_limits.sh
+++ b/tests/queries/0_stateless/01594_too_low_memory_limits.sh
@@ -1,4 +1,9 @@
 #!/usr/bin/env bash
+# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-parallel, no-fasttest
+# Tag no-tsan: requires jemalloc to track small allocations
+# Tag no-asan: requires jemalloc to track small allocations
+# Tag no-ubsan: requires jemalloc to track small allocations
+# Tag no-msan: requires jemalloc to track small allocations
 
 #
 # Regression for INSERT SELECT, that abnormally terminates the server
diff --git a/tests/queries/0_stateless/01598_memory_limit_zeros.sql b/tests/queries/0_stateless/01598_memory_limit_zeros.sql
index a07ce0bcca3..f8d6cf6ca7a 100644
--- a/tests/queries/0_stateless/01598_memory_limit_zeros.sql
+++ b/tests/queries/0_stateless/01598_memory_limit_zeros.sql
@@ -1,2 +1,4 @@
+-- Tags: no-parallel, no-fasttest
+
 SET max_memory_usage = 1, max_untracked_memory = 1000000;
 select 'test', count(*) from zeros_mt(1000000) where not ignore(zero); -- { serverError 241 }
diff --git a/tests/queries/0_stateless/01600_detach_permanently.sh b/tests/queries/0_stateless/01600_detach_permanently.sh
index 087545ec378..4469d9135e1 100755
--- a/tests/queries/0_stateless/01600_detach_permanently.sh
+++ b/tests/queries/0_stateless/01600_detach_permanently.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01600_log_queries_with_extensive_info.sh b/tests/queries/0_stateless/01600_log_queries_with_extensive_info.sh
index 6f0f1c29208..46fea5001a1 100755
--- a/tests/queries/0_stateless/01600_log_queries_with_extensive_info.sh
+++ b/tests/queries/0_stateless/01600_log_queries_with_extensive_info.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
+
 set -ue
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/01600_multiple_left_join_with_aliases.sql b/tests/queries/0_stateless/01600_multiple_left_join_with_aliases.sql
index 9eb4221d063..ae296e18560 100644
--- a/tests/queries/0_stateless/01600_multiple_left_join_with_aliases.sql
+++ b/tests/queries/0_stateless/01600_multiple_left_join_with_aliases.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop database if exists test_01600;
 create database test_01600;
 
diff --git a/tests/queries/0_stateless/01600_parts_states_metrics_long.sh b/tests/queries/0_stateless/01600_parts_states_metrics_long.sh
index 634cb403f85..9c0d28fdd91 100755
--- a/tests/queries/0_stateless/01600_parts_states_metrics_long.sh
+++ b/tests/queries/0_stateless/01600_parts_states_metrics_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01600_parts_types_metrics_long.sh b/tests/queries/0_stateless/01600_parts_types_metrics_long.sh
index 67d2c0c306d..6e4ccbdd325 100755
--- a/tests/queries/0_stateless/01600_parts_types_metrics_long.sh
+++ b/tests/queries/0_stateless/01600_parts_types_metrics_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01601_detach_permanently.sql b/tests/queries/0_stateless/01601_detach_permanently.sql
index 3af8ed573ef..3bf05b872b9 100644
--- a/tests/queries/0_stateless/01601_detach_permanently.sql
+++ b/tests/queries/0_stateless/01601_detach_permanently.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SELECT 'database atomic tests';
 
 DROP DATABASE IF EXISTS test1601_detach_permanently_atomic;
diff --git a/tests/queries/0_stateless/01601_proxy_protocol.sh b/tests/queries/0_stateless/01601_proxy_protocol.sh
index e8d1a7c45b2..5f4ec6cc597 100755
--- a/tests/queries/0_stateless/01601_proxy_protocol.sh
+++ b/tests/queries/0_stateless/01601_proxy_protocol.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: nc - command not found
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01602_max_distributed_connections.sh b/tests/queries/0_stateless/01602_max_distributed_connections.sh
index 772acb39344..51ff803ad5e 100755
--- a/tests/queries/0_stateless/01602_max_distributed_connections.sh
+++ b/tests/queries/0_stateless/01602_max_distributed_connections.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: distributed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01602_show_create_view.sql b/tests/queries/0_stateless/01602_show_create_view.sql
index fd5bf70d470..11b9c235290 100644
--- a/tests/queries/0_stateless/01602_show_create_view.sql
+++ b/tests/queries/0_stateless/01602_show_create_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_1602;
 
 CREATE DATABASE test_1602;
diff --git a/tests/queries/0_stateless/01603_read_with_backoff_bug.sql b/tests/queries/0_stateless/01603_read_with_backoff_bug.sql
index e80d657fdb4..0c8f80f2b63 100644
--- a/tests/queries/0_stateless/01603_read_with_backoff_bug.sql
+++ b/tests/queries/0_stateless/01603_read_with_backoff_bug.sql
@@ -1,3 +1,6 @@
+-- Tags: no-tsan
+-- Tag no-tsan: Too long for TSan
+
 drop table if exists t;
 
 create table t (x UInt64, s String) engine = MergeTree order by x;
diff --git a/tests/queries/0_stateless/01603_rename_overwrite_bug.sql b/tests/queries/0_stateless/01603_rename_overwrite_bug.sql
index c857e08b243..82f9996991f 100644
--- a/tests/queries/0_stateless/01603_rename_overwrite_bug.sql
+++ b/tests/queries/0_stateless/01603_rename_overwrite_bug.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP database IF EXISTS test_1603_rename_bug_ordinary;
 create database test_1603_rename_bug_ordinary engine=Ordinary;
 create table test_1603_rename_bug_ordinary.foo engine=Memory as select * from numbers(100);
diff --git a/tests/queries/0_stateless/01610_client_spawn_editor.sh b/tests/queries/0_stateless/01610_client_spawn_editor.sh
index b372d82847c..873b45e12a9 100755
--- a/tests/queries/0_stateless/01610_client_spawn_editor.sh
+++ b/tests/queries/0_stateless/01610_client_spawn_editor.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01615_random_one_shard_insertion.sql b/tests/queries/0_stateless/01615_random_one_shard_insertion.sql
index 59412adbdbf..e205a358db1 100644
--- a/tests/queries/0_stateless/01615_random_one_shard_insertion.sql
+++ b/tests/queries/0_stateless/01615_random_one_shard_insertion.sql
@@ -1,3 +1,5 @@
+-- Tags: shard, no-parallel
+
 create database if not exists shard_0;
 create database if not exists shard_1;
 drop table if exists shard_0.tbl;
diff --git a/tests/queries/0_stateless/01622_codec_zstd_long.sql b/tests/queries/0_stateless/01622_codec_zstd_long.sql
index 7045699d73f..ddfa9952f2d 100644
--- a/tests/queries/0_stateless/01622_codec_zstd_long.sql
+++ b/tests/queries/0_stateless/01622_codec_zstd_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS zstd_1_00;
 DROP TABLE IF EXISTS zstd_1_24;
 DROP TABLE IF EXISTS zstd_9_00;
diff --git a/tests/queries/0_stateless/01622_defaults_for_url_engine.sh b/tests/queries/0_stateless/01622_defaults_for_url_engine.sh
index 491a1bd8988..0a93a3ef479 100755
--- a/tests/queries/0_stateless/01622_defaults_for_url_engine.sh
+++ b/tests/queries/0_stateless/01622_defaults_for_url_engine.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: nc - command not found
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01639_distributed_sync_insert_zero_rows.sql b/tests/queries/0_stateless/01639_distributed_sync_insert_zero_rows.sql
index 7fb81efaac8..f38b1da29e4 100644
--- a/tests/queries/0_stateless/01639_distributed_sync_insert_zero_rows.sql
+++ b/tests/queries/0_stateless/01639_distributed_sync_insert_zero_rows.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS local;
 DROP TABLE IF EXISTS distributed;
 
diff --git a/tests/queries/0_stateless/01640_distributed_async_insert_compression.sql b/tests/queries/0_stateless/01640_distributed_async_insert_compression.sql
index b0a674b8389..8bf370b13d7 100644
--- a/tests/queries/0_stateless/01640_distributed_async_insert_compression.sql
+++ b/tests/queries/0_stateless/01640_distributed_async_insert_compression.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS local;
 DROP TABLE IF EXISTS distributed;
 
diff --git a/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql b/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql
index 8bbc9ec0a14..6bbf6fcec6a 100644
--- a/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql
+++ b/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database
+
 drop table if exists data_01641;
 
 create table data_01641 (key Int, value String) engine=MergeTree order by (key, repeat(value, 40)) settings old_parts_lifetime=0, min_bytes_for_wide_part=0;
diff --git a/tests/queries/0_stateless/01644_distributed_async_insert_fsync_smoke.sql b/tests/queries/0_stateless/01644_distributed_async_insert_fsync_smoke.sql
index 87ae96aa451..d0d64294ed4 100644
--- a/tests/queries/0_stateless/01644_distributed_async_insert_fsync_smoke.sql
+++ b/tests/queries/0_stateless/01644_distributed_async_insert_fsync_smoke.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 drop table if exists dist_01643;
 drop table if exists data_01643;
 
diff --git a/tests/queries/0_stateless/01646_system_restart_replicas_smoke.sql b/tests/queries/0_stateless/01646_system_restart_replicas_smoke.sql
index 0b7fba5b02e..7307ba60e3f 100644
--- a/tests/queries/0_stateless/01646_system_restart_replicas_smoke.sql
+++ b/tests/queries/0_stateless/01646_system_restart_replicas_smoke.sql
@@ -1,3 +1,6 @@
+-- Tags: replica, no-tsan, no-parallel
+-- Tag no-tsan: RESTART REPLICAS can acquire too much locks, while only 64 is possible from one thread under TSan
+
 DROP TABLE IF EXISTS data_01646;
 CREATE TABLE data_01646 (x Date, s String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01646/data_01646', 'r') ORDER BY s PARTITION BY x;
 SYSTEM RESTART REPLICAS;
diff --git a/tests/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper_long.sql b/tests/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper_long.sql
index a839883e683..1aa568c1663 100644
--- a/tests/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 DROP TABLE IF EXISTS partitioned_table;
 
 CREATE TABLE partitioned_table (
diff --git a/tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path_long.sql b/tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path_long.sql
index 85b37cee15a..f9b9181b5b7 100644
--- a/tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path_long.sql
+++ b/tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, no-replicated-database
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS test_01640;
 DROP TABLE IF EXISTS restore_01640;
 
diff --git a/tests/queries/0_stateless/01655_test_isnull_mysql_dialect.sql b/tests/queries/0_stateless/01655_test_isnull_mysql_dialect.sql
index 03970134ca0..827f559f3d8 100644
--- a/tests/queries/0_stateless/01655_test_isnull_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01655_test_isnull_mysql_dialect.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT ISNULL(NULL);
 SELECT '---';
 SELECT ISNULL('abc');
diff --git a/tests/queries/0_stateless/01656_sequence_next_node_long.sql b/tests/queries/0_stateless/01656_sequence_next_node_long.sql
index 9c181f5e491..a53074701b3 100644
--- a/tests/queries/0_stateless/01656_sequence_next_node_long.sql
+++ b/tests/queries/0_stateless/01656_sequence_next_node_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET allow_experimental_funnel_functions = 1;
 
 DROP TABLE IF EXISTS test_sequenceNextNode_Nullable;
diff --git a/tests/queries/0_stateless/01656_test_hex_mysql_dialect.sql b/tests/queries/0_stateless/01656_test_hex_mysql_dialect.sql
index 7ac335062b8..003bc3d9383 100644
--- a/tests/queries/0_stateless/01656_test_hex_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01656_test_hex_mysql_dialect.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT HEX(10);
diff --git a/tests/queries/0_stateless/01656_test_query_log_factories_info.sql b/tests/queries/0_stateless/01656_test_query_log_factories_info.sql
index 50d50155480..7205d547df9 100644
--- a/tests/queries/0_stateless/01656_test_query_log_factories_info.sql
+++ b/tests/queries/0_stateless/01656_test_query_log_factories_info.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET database_atomic_wait_for_drop_and_detach_synchronously=1;
 SET log_queries=1;
 
diff --git a/tests/queries/0_stateless/01657_test_toHour_mysql_compatibility.sql b/tests/queries/0_stateless/01657_test_toHour_mysql_compatibility.sql
index f691481dfc4..c9d4fb6d105 100644
--- a/tests/queries/0_stateless/01657_test_toHour_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01657_test_toHour_mysql_compatibility.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT HOUR(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh b/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh
index 1bfcf863184..3797b264f26 100755
--- a/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh
+++ b/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
+
 set -eu
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.sql b/tests/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.sql
index 0d255e771b4..9eee88f7422 100644
--- a/tests/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT TO_BASE64('test string');
diff --git a/tests/queries/0_stateless/01659_h3_buffer_overflow.sql b/tests/queries/0_stateless/01659_h3_buffer_overflow.sql
index f2d77641ec9..d7564af01af 100644
--- a/tests/queries/0_stateless/01659_h3_buffer_overflow.sql
+++ b/tests/queries/0_stateless/01659_h3_buffer_overflow.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 -- the behaviour on overflow can be implementation specific
 -- and we don't care about the results, but no buffer overflow should be possible.
 SELECT length(h3kRing(9223372036854775807, 1000)) FORMAT Null;
diff --git a/tests/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.sql b/tests/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.sql
index 3e130716091..0b233e07aa9 100644
--- a/tests/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT FROM_BASE64('dGVzdCBzdHJpbmc=');
diff --git a/tests/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.sql b/tests/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.sql
index 7de1d287d2d..8998f6f8008 100644
--- a/tests/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT DAYOFYEAR(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.sql b/tests/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.sql
index cde47ea483e..007f15ebe06 100644
--- a/tests/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT DAYOFWEEK(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.sql b/tests/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.sql
index 88b97613ff8..a9b078205da 100644
--- a/tests/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT DAYOFMONTH(toDateTime('2016-06-15 23:00:00'));
 SELECT '---';
 SELECT DAY(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01663_aes_msan.sql b/tests/queries/0_stateless/01663_aes_msan.sql
index 1d549aece56..16ad0029f44 100644
--- a/tests/queries/0_stateless/01663_aes_msan.sql
+++ b/tests/queries/0_stateless/01663_aes_msan.sql
@@ -1,2 +1,5 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 SELECT hex(encrypt('aes-128-cbc', 'text', 'keykeykeykeykeyk', ''));
 SELECT decrypt('aes-128-cbc', encrypt('aes-128-cbc', 'text', 'keykeykeykeykeyk', ''), 'keykeykeykeykeyk', '');
diff --git a/tests/queries/0_stateless/01663_test_toDate_mysql_compatibility.sql b/tests/queries/0_stateless/01663_test_toDate_mysql_compatibility.sql
index cefa672777c..bfc815c8863 100644
--- a/tests/queries/0_stateless/01663_test_toDate_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01663_test_toDate_mysql_compatibility.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT DATE(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01664_ntoa_aton_mysql_compatibility.sql b/tests/queries/0_stateless/01664_ntoa_aton_mysql_compatibility.sql
index 4f4aef09259..3378f782d03 100644
--- a/tests/queries/0_stateless/01664_ntoa_aton_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01664_ntoa_aton_mysql_compatibility.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT INET6_NTOA(toFixedString(unhex('2A0206B8000000000000000000000011'), 16));
 SELECT hex(INET6_ATON('2a02:6b8::11'));
 SELECT INET_NTOA(toUInt32(1337));
diff --git a/tests/queries/0_stateless/01666_blns_long.sql b/tests/queries/0_stateless/01666_blns_long.sql
index 19caf45832f..fd959cf0a73 100644
--- a/tests/queries/0_stateless/01666_blns_long.sql
+++ b/tests/queries/0_stateless/01666_blns_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, no-fasttest
+-- Tag no-fasttest: JSON functions
+
 -- https://github.com/minimaxir/big-list-of-naughty-strings
 
 /*
diff --git a/tests/queries/0_stateless/01667_aes_args_check.sql b/tests/queries/0_stateless/01667_aes_args_check.sql
index b1d7088c956..fc271e8aca1 100644
--- a/tests/queries/0_stateless/01667_aes_args_check.sql
+++ b/tests/queries/0_stateless/01667_aes_args_check.sql
@@ -1 +1,4 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 SELECT encrypt('aes-128-ecb', [1, -1, 0, NULL], 'text'); -- { serverError 43 }
diff --git a/tests/queries/0_stateless/01668_test_toMonth_mysql_dialect.sql b/tests/queries/0_stateless/01668_test_toMonth_mysql_dialect.sql
index bdde3e7b825..c6b0cb84f35 100644
--- a/tests/queries/0_stateless/01668_test_toMonth_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01668_test_toMonth_mysql_dialect.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT MONTH(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01669_columns_declaration_serde_long.sql b/tests/queries/0_stateless/01669_columns_declaration_serde_long.sql
index b1a85754fce..7d42358bbc6 100644
--- a/tests/queries/0_stateless/01669_columns_declaration_serde_long.sql
+++ b/tests/queries/0_stateless/01669_columns_declaration_serde_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 CREATE TEMPORARY TABLE test ("\\" String DEFAULT '\r\n\t\\' || '
 ');
 
diff --git a/tests/queries/0_stateless/01669_test_toYear_mysql_dialect.sql b/tests/queries/0_stateless/01669_test_toYear_mysql_dialect.sql
index afd79e2c1ba..31088b5dd5f 100644
--- a/tests/queries/0_stateless/01669_test_toYear_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01669_test_toYear_mysql_dialect.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT YEAR(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01670_dictionary_create_key_expression.sql b/tests/queries/0_stateless/01670_dictionary_create_key_expression.sql
index 2d75764c0fa..32e7dc17479 100644
--- a/tests/queries/0_stateless/01670_dictionary_create_key_expression.sql
+++ b/tests/queries/0_stateless/01670_dictionary_create_key_expression.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE database_dictionary_test_key_expression;
 
 CREATE TABLE database_dictionary_test_key_expression.test_for_dictionary (value String) ENGINE=TinyLog;
diff --git a/tests/queries/0_stateless/01670_distributed_bytes_to_throw_insert.sql b/tests/queries/0_stateless/01670_distributed_bytes_to_throw_insert.sql
index 1415c895290..0e85b61070b 100644
--- a/tests/queries/0_stateless/01670_distributed_bytes_to_throw_insert.sql
+++ b/tests/queries/0_stateless/01670_distributed_bytes_to_throw_insert.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 drop table if exists dist_01670;
 drop table if exists data_01670;
 
diff --git a/tests/queries/0_stateless/01670_test_repeat_mysql_dialect.sql b/tests/queries/0_stateless/01670_test_repeat_mysql_dialect.sql
index ae2bdb46412..87cdc00fe29 100644
--- a/tests/queries/0_stateless/01670_test_repeat_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01670_test_repeat_mysql_dialect.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT REPEAT('Test', 3);
diff --git a/tests/queries/0_stateless/01671_ddl_hang_timeout_long.sh b/tests/queries/0_stateless/01671_ddl_hang_timeout_long.sh
index 641eba2d8fa..93c4451524c 100755
--- a/tests/queries/0_stateless/01671_ddl_hang_timeout_long.sh
+++ b/tests/queries/0_stateless/01671_ddl_hang_timeout_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long
+
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
diff --git a/tests/queries/0_stateless/01671_test_toQuarter_mysql_dialect.sql b/tests/queries/0_stateless/01671_test_toQuarter_mysql_dialect.sql
index 369f2b47723..9c9965c8fce 100644
--- a/tests/queries/0_stateless/01671_test_toQuarter_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01671_test_toQuarter_mysql_dialect.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT QUARTER(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01672_test_toSecond_mysql_dialect.sql b/tests/queries/0_stateless/01672_test_toSecond_mysql_dialect.sql
index 0306fde14cd..3438b598413 100644
--- a/tests/queries/0_stateless/01672_test_toSecond_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01672_test_toSecond_mysql_dialect.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT SECOND(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01673_test_toMinute_mysql_dialect.sql b/tests/queries/0_stateless/01673_test_toMinute_mysql_dialect.sql
index 5d188b5b95b..a4f1427e0c3 100644
--- a/tests/queries/0_stateless/01673_test_toMinute_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01673_test_toMinute_mysql_dialect.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT MINUTE(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01674_clickhouse_client_query_param_cte.sh b/tests/queries/0_stateless/01674_clickhouse_client_query_param_cte.sh
index ee75f675eb3..c9a7c3e55b1 100755
--- a/tests/queries/0_stateless/01674_clickhouse_client_query_param_cte.sh
+++ b/tests/queries/0_stateless/01674_clickhouse_client_query_param_cte.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01674_executable_dictionary_implicit_key.sql b/tests/queries/0_stateless/01674_executable_dictionary_implicit_key.sql
index c98cb0a5e0f..caa3e976017 100644
--- a/tests/queries/0_stateless/01674_executable_dictionary_implicit_key.sql
+++ b/tests/queries/0_stateless/01674_executable_dictionary_implicit_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SELECT dictGet('simple_executable_cache_dictionary_no_implicit_key', 'value', toUInt64(1));
 SELECT dictGet('simple_executable_cache_dictionary_implicit_key', 'value', toUInt64(1));
 
diff --git a/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert_long.sh b/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert_long.sh
index 5687fe323d0..e373f632155 100755
--- a/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert_long.sh
+++ b/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, distributed
 
 # NOTE: $SECONDS accuracy is second, so we need some delta, hence -1 in time conditions.
 
diff --git a/tests/queries/0_stateless/01676_dictget_in_default_expression.sql b/tests/queries/0_stateless/01676_dictget_in_default_expression.sql
index cd4feaf5709..54e46a2b718 100644
--- a/tests/queries/0_stateless/01676_dictget_in_default_expression.sql
+++ b/tests/queries/0_stateless/01676_dictget_in_default_expression.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01676 SYNC;
 
 CREATE DATABASE test_01676;
diff --git a/tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.sh b/tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.sh
index c8cfe0084cd..9537326d0cd 100755
--- a/tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.sh
+++ b/tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01676_range_hashed_dictionary.sql b/tests/queries/0_stateless/01676_range_hashed_dictionary.sql
index 455e850b239..e933d599bd2 100644
--- a/tests/queries/0_stateless/01676_range_hashed_dictionary.sql
+++ b/tests/queries/0_stateless/01676_range_hashed_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS database_for_range_dict;
 
 CREATE DATABASE database_for_range_dict;
diff --git a/tests/queries/0_stateless/01681_cache_dictionary_simple_key.sql b/tests/queries/0_stateless/01681_cache_dictionary_simple_key.sql
index f200ead341b..c6133e7a5ee 100644
--- a/tests/queries/0_stateless/01681_cache_dictionary_simple_key.sql
+++ b/tests/queries/0_stateless/01681_cache_dictionary_simple_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01681_database_for_cache_dictionary;
 CREATE DATABASE 01681_database_for_cache_dictionary;
 
diff --git a/tests/queries/0_stateless/01681_hyperscan_debug_assertion.sh b/tests/queries/0_stateless/01681_hyperscan_debug_assertion.sh
index 0bbf8942c1a..2b4cd1a5f01 100755
--- a/tests/queries/0_stateless/01681_hyperscan_debug_assertion.sh
+++ b/tests/queries/0_stateless/01681_hyperscan_debug_assertion.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-debug, no-fasttest
+# Tag no-fasttest: Hyperscan
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
 
diff --git a/tests/queries/0_stateless/01682_cache_dictionary_complex_key.sql b/tests/queries/0_stateless/01682_cache_dictionary_complex_key.sql
index 4cc83412457..dbbbf8ad454 100644
--- a/tests/queries/0_stateless/01682_cache_dictionary_complex_key.sql
+++ b/tests/queries/0_stateless/01682_cache_dictionary_complex_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01682_database_for_cache_dictionary;
 CREATE DATABASE 01682_database_for_cache_dictionary;
 
diff --git a/tests/queries/0_stateless/01683_codec_encrypted.sql b/tests/queries/0_stateless/01683_codec_encrypted.sql
index ec90e6c3129..e780819ebd3 100644
--- a/tests/queries/0_stateless/01683_codec_encrypted.sql
+++ b/tests/queries/0_stateless/01683_codec_encrypted.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 DROP TABLE IF EXISTS encryption_test;
 CREATE TABLE encryption_test (i Int, s String Codec(Encrypted('AES-128-GCM-SIV'))) ENGINE = MergeTree ORDER BY i;
 
diff --git a/tests/queries/0_stateless/01683_flat_dictionary.sql b/tests/queries/0_stateless/01683_flat_dictionary.sql
index c9f864c6a16..f65695219a5 100644
--- a/tests/queries/0_stateless/01683_flat_dictionary.sql
+++ b/tests/queries/0_stateless/01683_flat_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01681_database_for_flat_dictionary;
 CREATE DATABASE 01681_database_for_flat_dictionary;
 
diff --git a/tests/queries/0_stateless/01683_text_log_deadlock.sh b/tests/queries/0_stateless/01683_text_log_deadlock.sh
index ee772bffa27..debb7a0017f 100755
--- a/tests/queries/0_stateless/01683_text_log_deadlock.sh
+++ b/tests/queries/0_stateless/01683_text_log_deadlock.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01684_insert_specify_shard_id.sql b/tests/queries/0_stateless/01684_insert_specify_shard_id.sql
index 712fbfcc506..830f987e811 100644
--- a/tests/queries/0_stateless/01684_insert_specify_shard_id.sql
+++ b/tests/queries/0_stateless/01684_insert_specify_shard_id.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS x;
 DROP TABLE IF EXISTS x_dist;
 DROP TABLE IF EXISTS y;
diff --git a/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sh b/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sh
index 3e6b5146a80..5a030bfdfaf 100755
--- a/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sh
+++ b/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01685_json_extract_double_as_float.sql b/tests/queries/0_stateless/01685_json_extract_double_as_float.sql
index c9aa2518085..ffbddf43907 100644
--- a/tests/queries/0_stateless/01685_json_extract_double_as_float.sql
+++ b/tests/queries/0_stateless/01685_json_extract_double_as_float.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 WITH '{ "v":1.1}' AS raw
 SELECT
     JSONExtract(raw, 'v', 'float') AS float32_1,
diff --git a/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sh b/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sh
index 82344a64e99..7f47ce1438f 100755
--- a/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sh
+++ b/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01686_rocksdb.sql b/tests/queries/0_stateless/01686_rocksdb.sql
index 23baf249d1f..ad6f56772b0 100644
--- a/tests/queries/0_stateless/01686_rocksdb.sql
+++ b/tests/queries/0_stateless/01686_rocksdb.sql
@@ -1,3 +1,7 @@
+-- Tags: no-ordinary-database, no-fasttest
+-- Tag no-ordinary-database: Sometimes cannot lock file most likely due to concurrent or adjacent tests, but we don't care how it works in Ordinary database
+-- Tag no-fasttest: In fasttest, ENABLE_LIBRARIES=0, so rocksdb engine is not enabled by default
+
 DROP TABLE IF EXISTS 01686_test;
 
 CREATE TABLE 01686_test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key);
diff --git a/tests/queries/0_stateless/01700_system_zookeeper_path_in.sql b/tests/queries/0_stateless/01700_system_zookeeper_path_in.sql
index a147952dfe1..cf4bc7650e7 100644
--- a/tests/queries/0_stateless/01700_system_zookeeper_path_in.sql
+++ b/tests/queries/0_stateless/01700_system_zookeeper_path_in.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS sample_table;
 
 CREATE TABLE sample_table (
diff --git a/tests/queries/0_stateless/01702_system_query_log.sql b/tests/queries/0_stateless/01702_system_query_log.sql
index e3ebf97edb7..f40b2604645 100644
--- a/tests/queries/0_stateless/01702_system_query_log.sql
+++ b/tests/queries/0_stateless/01702_system_query_log.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- fire all kinds of queries and then check if those are present in the system.query_log
 SET log_comment='system.query_log logging test';
 
diff --git a/tests/queries/0_stateless/01710_projection_fetch_long.sql b/tests/queries/0_stateless/01710_projection_fetch_long.sql
index 09750a72289..6c41c69254e 100644
--- a/tests/queries/0_stateless/01710_projection_fetch_long.sql
+++ b/tests/queries/0_stateless/01710_projection_fetch_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 drop table if exists tp_1;
 drop table if exists tp_2;
 
diff --git a/tests/queries/0_stateless/01710_projections_in_distributed_query.sql b/tests/queries/0_stateless/01710_projections_in_distributed_query.sql
index 475e8372fc6..fa734b605cd 100644
--- a/tests/queries/0_stateless/01710_projections_in_distributed_query.sql
+++ b/tests/queries/0_stateless/01710_projections_in_distributed_query.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 drop table if exists projection_test;
 
 create table projection_test (dt DateTime, cost Int64, projection p (select toStartOfMinute(dt) dt_m, sum(cost) group by dt_m)) engine MergeTree partition by toDate(dt) order by dt;
diff --git a/tests/queries/0_stateless/01713_table_ttl_old_syntax_zookeeper.sql b/tests/queries/0_stateless/01713_table_ttl_old_syntax_zookeeper.sql
index 71898bdedcb..1709a2d412a 100644
--- a/tests/queries/0_stateless/01713_table_ttl_old_syntax_zookeeper.sql
+++ b/tests/queries/0_stateless/01713_table_ttl_old_syntax_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS ttl_table;
 
 CREATE TABLE ttl_table
diff --git a/tests/queries/0_stateless/01715_background_checker_blather_zookeeper_long.sql b/tests/queries/0_stateless/01715_background_checker_blather_zookeeper_long.sql
index c0335ae3753..dad5cdbf1f3 100644
--- a/tests/queries/0_stateless/01715_background_checker_blather_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01715_background_checker_blather_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS i20203_1;
 DROP TABLE IF EXISTS i20203_2;
 
diff --git a/tests/queries/0_stateless/01717_global_with_subquery_fix.sql b/tests/queries/0_stateless/01717_global_with_subquery_fix.sql
index 14c4ac3e4ca..eaebbe1163e 100644
--- a/tests/queries/0_stateless/01717_global_with_subquery_fix.sql
+++ b/tests/queries/0_stateless/01717_global_with_subquery_fix.sql
@@ -1 +1,3 @@
+-- Tags: global
+
 WITH (SELECT count(distinct colU) from tabA) AS withA, (SELECT count(distinct colU) from tabA) AS withB SELECT withA / withB AS ratio FROM (SELECT date AS period, colX FROM (SELECT date, if(colA IN (SELECT colB FROM tabC), 0, colA) AS colX FROM tabB) AS tempB GROUP BY period, colX) AS main; -- {serverError 60}
diff --git a/tests/queries/0_stateless/01720_dictionary_create_source_with_functions.sql b/tests/queries/0_stateless/01720_dictionary_create_source_with_functions.sql
index a0a4fbbfab9..216a6284508 100644
--- a/tests/queries/0_stateless/01720_dictionary_create_source_with_functions.sql
+++ b/tests/queries/0_stateless/01720_dictionary_create_source_with_functions.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01720_dictionary_db;
 CREATE DATABASE 01720_dictionary_db;
 
diff --git a/tests/queries/0_stateless/01721_dictionary_decimal_p_s.sql b/tests/queries/0_stateless/01721_dictionary_decimal_p_s.sql
index 0451d455009..272bd2d7104 100644
--- a/tests/queries/0_stateless/01721_dictionary_decimal_p_s.sql
+++ b/tests/queries/0_stateless/01721_dictionary_decimal_p_s.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 set allow_experimental_bigint_types=1;
 drop database if exists db_01721;
 drop table if exists db_01721.table_decimal_dict;
diff --git a/tests/queries/0_stateless/01721_engine_file_truncate_on_insert.sql b/tests/queries/0_stateless/01721_engine_file_truncate_on_insert.sql
index 079b2546a20..fb61931d738 100644
--- a/tests/queries/0_stateless/01721_engine_file_truncate_on_insert.sql
+++ b/tests/queries/0_stateless/01721_engine_file_truncate_on_insert.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database, no-parallel
+-- Tag no-replicated-database: user_files
+
 DROP TABLE IF EXISTS test;
 
 INSERT INTO TABLE FUNCTION file('01721_file/test/data.TSV', 'TSV', 'id UInt32') VALUES (1);
diff --git a/tests/queries/0_stateless/01721_join_implicit_cast_long.sql.j2 b/tests/queries/0_stateless/01721_join_implicit_cast_long.sql.j2
index 4479f507046..8c3ed03fce7 100644
--- a/tests/queries/0_stateless/01721_join_implicit_cast_long.sql.j2
+++ b/tests/queries/0_stateless/01721_join_implicit_cast_long.sql.j2
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 
diff --git a/tests/queries/0_stateless/01722_long_brotli_http_compression_json_format.sh b/tests/queries/0_stateless/01722_long_brotli_http_compression_json_format.sh
index a187d778fdb..7295537a2d2 100755
--- a/tests/queries/0_stateless/01722_long_brotli_http_compression_json_format.sh
+++ b/tests/queries/0_stateless/01722_long_brotli_http_compression_json_format.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01730_distributed_group_by_no_merge_order_by_long.sql b/tests/queries/0_stateless/01730_distributed_group_by_no_merge_order_by_long.sql
index e43b81dca48..7f36bcb6c8a 100644
--- a/tests/queries/0_stateless/01730_distributed_group_by_no_merge_order_by_long.sql
+++ b/tests/queries/0_stateless/01730_distributed_group_by_no_merge_order_by_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, distributed
+
 drop table if exists data_01730;
 
 -- does not use 127.1 due to prefer_localhost_replica
diff --git a/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh b/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh
index b7dd76760d4..5bb10220f7f 100755
--- a/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh
+++ b/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 unset CLICKHOUSE_LOG_COMMENT
 
diff --git a/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh b/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh
index a4fd7529ab2..d83656e0e8c 100755
--- a/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh
+++ b/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01746_executable_pool_dictionary.sql b/tests/queries/0_stateless/01746_executable_pool_dictionary.sql
index aa59d209b51..69c37d127dc 100644
--- a/tests/queries/0_stateless/01746_executable_pool_dictionary.sql
+++ b/tests/queries/0_stateless/01746_executable_pool_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SELECT 'executable_pool_simple';
 
 SELECT dictGet('executable_pool_simple', 'a', toUInt64(1));
diff --git a/tests/queries/0_stateless/01746_long_zlib_http_compression_json_format.sh b/tests/queries/0_stateless/01746_long_zlib_http_compression_json_format.sh
index 7a2343a953a..feaf4bcf623 100755
--- a/tests/queries/0_stateless/01746_long_zlib_http_compression_json_format.sh
+++ b/tests/queries/0_stateless/01746_long_zlib_http_compression_json_format.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01746_long_zstd_http_compression_json_format.sh b/tests/queries/0_stateless/01746_long_zstd_http_compression_json_format.sh
index f520a21e9b3..02943cad583 100755
--- a/tests/queries/0_stateless/01746_long_zstd_http_compression_json_format.sh
+++ b/tests/queries/0_stateless/01746_long_zstd_http_compression_json_format.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper_long.sql b/tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper_long.sql
index 033a66a477f..09a85baada6 100644
--- a/tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS report;
 
 CREATE TABLE report
diff --git a/tests/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.sql b/tests/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.sql
index 6c6d33c7d43..fb3b7e20e98 100644
--- a/tests/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.sql
+++ b/tests/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SELECT 'executable_pool_simple_implicit_key';
 
 SELECT dictGet('executable_pool_simple_implicit_key', 'a', toUInt64(1));
diff --git a/tests/queries/0_stateless/01747_join_view_filter_dictionary.sql b/tests/queries/0_stateless/01747_join_view_filter_dictionary.sql
index b43fa336485..738c12f00ac 100644
--- a/tests/queries/0_stateless/01747_join_view_filter_dictionary.sql
+++ b/tests/queries/0_stateless/01747_join_view_filter_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists summing_table01747;
 drop view if exists rates01747;
 drop view if exists agg_view01747;
diff --git a/tests/queries/0_stateless/01747_system_session_log_long.sh b/tests/queries/0_stateless/01747_system_session_log_long.sh
index 16b32a08442..b41bf077b57 100755
--- a/tests/queries/0_stateless/01747_system_session_log_long.sh
+++ b/tests/queries/0_stateless/01747_system_session_log_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel, no-fasttest
+# Tag no-fasttest: Accesses CH via mysql table function (which is unavailable)
 
 ##################################################################################################
 # Verify that login, logout, and login failure events are properly stored in system.session_log
diff --git a/tests/queries/0_stateless/01748_dictionary_table_dot.sql b/tests/queries/0_stateless/01748_dictionary_table_dot.sql
index a974786f446..a2364fdf823 100644
--- a/tests/queries/0_stateless/01748_dictionary_table_dot.sql
+++ b/tests/queries/0_stateless/01748_dictionary_table_dot.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01748;
 CREATE DATABASE test_01748;
 USE test_01748;
diff --git a/tests/queries/0_stateless/01752_distributed_query_sigsegv.sql b/tests/queries/0_stateless/01752_distributed_query_sigsegv.sql
index a6936aec913..c6af23bd1db 100644
--- a/tests/queries/0_stateless/01752_distributed_query_sigsegv.sql
+++ b/tests/queries/0_stateless/01752_distributed_query_sigsegv.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- this is enough to trigger the regression
 SELECT throwIf(dummy = 0) FROM remote('127.1', system.one); -- { serverError 395 }
 
diff --git a/tests/queries/0_stateless/01753_direct_dictionary_simple_key.sql b/tests/queries/0_stateless/01753_direct_dictionary_simple_key.sql
index afd91ffdaa5..86af09f391d 100644
--- a/tests/queries/0_stateless/01753_direct_dictionary_simple_key.sql
+++ b/tests/queries/0_stateless/01753_direct_dictionary_simple_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01753_dictionary_db;
 CREATE DATABASE 01753_dictionary_db;
 
diff --git a/tests/queries/0_stateless/01753_system_zookeeper_query_param_path_long.sh b/tests/queries/0_stateless/01753_system_zookeeper_query_param_path_long.sh
index d3046e73b93..40567f944df 100755
--- a/tests/queries/0_stateless/01753_system_zookeeper_query_param_path_long.sh
+++ b/tests/queries/0_stateless/01753_system_zookeeper_query_param_path_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, zookeeper
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01754_cluster_all_replicas_shard_num.sql b/tests/queries/0_stateless/01754_cluster_all_replicas_shard_num.sql
index 833f86c538d..59e0ca60f8f 100644
--- a/tests/queries/0_stateless/01754_cluster_all_replicas_shard_num.sql
+++ b/tests/queries/0_stateless/01754_cluster_all_replicas_shard_num.sql
@@ -1,3 +1,5 @@
+-- Tags: replica, shard
+
 SELECT _shard_num FROM cluster('test_shard_localhost', system.one);
 SELECT _shard_num FROM clusterAllReplicas('test_shard_localhost', system.one);
 
diff --git a/tests/queries/0_stateless/01754_direct_dictionary_complex_key.sql b/tests/queries/0_stateless/01754_direct_dictionary_complex_key.sql
index 51b29457011..a695302161d 100644
--- a/tests/queries/0_stateless/01754_direct_dictionary_complex_key.sql
+++ b/tests/queries/0_stateless/01754_direct_dictionary_complex_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01754_dictionary_db;
 CREATE DATABASE 01754_dictionary_db;
 
diff --git a/tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect b/tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect
index 5543af4dd05..89c4bec3dca 100755
--- a/tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect
+++ b/tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-unbundled, no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01755_shard_pruning_with_literal.sql b/tests/queries/0_stateless/01755_shard_pruning_with_literal.sql
index 0e93d76573c..1633665610a 100644
--- a/tests/queries/0_stateless/01755_shard_pruning_with_literal.sql
+++ b/tests/queries/0_stateless/01755_shard_pruning_with_literal.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 set optimize_skip_unused_shards=1;
 
 drop table if exists data_01755;
diff --git a/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql b/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql
index ea7d526c039..efde0ac1e60 100644
--- a/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql
+++ b/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- NOTE: this test cannot use 'current_database = currentDatabase()',
 -- because it does not propagated via remote queries,
 -- hence it uses 'with (select currentDatabase()) as X'
diff --git a/tests/queries/0_stateless/01757_optimize_skip_unused_shards_limit.sql b/tests/queries/0_stateless/01757_optimize_skip_unused_shards_limit.sql
index 68247dbfbe5..fd19e17b6bb 100644
--- a/tests/queries/0_stateless/01757_optimize_skip_unused_shards_limit.sql
+++ b/tests/queries/0_stateless/01757_optimize_skip_unused_shards_limit.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 drop table if exists dist_01757;
 create table dist_01757 as system.one engine=Distributed(test_cluster_two_shards, system, one, dummy);
 
diff --git a/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.sh b/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.sh
index d18ea8694a9..b963f3a618f 100755
--- a/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.sh
+++ b/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: shard
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=trace
 
diff --git a/tests/queries/0_stateless/01759_dictionary_unique_attribute_names.sql b/tests/queries/0_stateless/01759_dictionary_unique_attribute_names.sql
index 11a52976716..59f20ca7a51 100644
--- a/tests/queries/0_stateless/01759_dictionary_unique_attribute_names.sql
+++ b/tests/queries/0_stateless/01759_dictionary_unique_attribute_names.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01759_db;
 CREATE DATABASE 01759_db;
 
diff --git a/tests/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.sql b/tests/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.sql
index 08b9581ace2..937bd1c0c63 100644
--- a/tests/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.sql
+++ b/tests/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- { echo }
 select * from remote('127.{1,2}', system, one, dummy)  where 0 settings optimize_skip_unused_shards=1, force_optimize_skip_unused_shards=1;
 select count() from remote('127.{1,2}', system, one, dummy)  where 0 settings optimize_skip_unused_shards=1, force_optimize_skip_unused_shards=1;
diff --git a/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.sql b/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.sql
index 9c405640930..55c0d1e3678 100644
--- a/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.sql
+++ b/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS ddl_dictonary_test_source;
 CREATE TABLE ddl_dictonary_test_source
 (
diff --git a/tests/queries/0_stateless/01760_polygon_dictionaries.sql b/tests/queries/0_stateless/01760_polygon_dictionaries.sql
index 0054be0642d..1589a091ee7 100644
--- a/tests/queries/0_stateless/01760_polygon_dictionaries.sql
+++ b/tests/queries/0_stateless/01760_polygon_dictionaries.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01760_db;
 CREATE DATABASE 01760_db;
 
diff --git a/tests/queries/0_stateless/01760_system_dictionaries.sql b/tests/queries/0_stateless/01760_system_dictionaries.sql
index f4e0cfa0086..a5609281e49 100644
--- a/tests/queries/0_stateless/01760_system_dictionaries.sql
+++ b/tests/queries/0_stateless/01760_system_dictionaries.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01760_db;
 CREATE DATABASE 01760_db;
 
diff --git a/tests/queries/0_stateless/01761_alter_decimal_zookeeper_long.sql b/tests/queries/0_stateless/01761_alter_decimal_zookeeper_long.sql
index d1bd3b65182..5d28e8ca6b3 100644
--- a/tests/queries/0_stateless/01761_alter_decimal_zookeeper_long.sql
+++ b/tests/queries/0_stateless/01761_alter_decimal_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS test_alter_decimal;
 
 CREATE TABLE test_alter_decimal
diff --git a/tests/queries/0_stateless/01763_long_ttl_group_by.sql b/tests/queries/0_stateless/01763_long_ttl_group_by.sql
index e0c6f678f15..9e1ad574f52 100644
--- a/tests/queries/0_stateless/01763_long_ttl_group_by.sql
+++ b/tests/queries/0_stateless/01763_long_ttl_group_by.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS test_ttl_group_by01763;
 CREATE TABLE test_ttl_group_by01763
 (key UInt32, ts DateTime, value UInt32, min_value UInt32 default value, max_value UInt32 default value)
diff --git a/tests/queries/0_stateless/01763_max_distributed_depth.sql b/tests/queries/0_stateless/01763_max_distributed_depth.sql
index 89909a3bd8d..12b2e368007 100644
--- a/tests/queries/0_stateless/01763_max_distributed_depth.sql
+++ b/tests/queries/0_stateless/01763_max_distributed_depth.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS tt6;
 
 CREATE TABLE tt6
diff --git a/tests/queries/0_stateless/01764_table_function_dictionary.sql b/tests/queries/0_stateless/01764_table_function_dictionary.sql
index 0168566077d..b642fdd741e 100644
--- a/tests/queries/0_stateless/01764_table_function_dictionary.sql
+++ b/tests/queries/0_stateless/01764_table_function_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS table_function_dictionary_source_table;
 CREATE TABLE table_function_dictionary_source_table
 (
diff --git a/tests/queries/0_stateless/01765_hashed_dictionary_simple_key.sql b/tests/queries/0_stateless/01765_hashed_dictionary_simple_key.sql
index 7502c6a93bb..db3431b1572 100644
--- a/tests/queries/0_stateless/01765_hashed_dictionary_simple_key.sql
+++ b/tests/queries/0_stateless/01765_hashed_dictionary_simple_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01765_db;
 CREATE DATABASE 01765_db;
 
diff --git a/tests/queries/0_stateless/01766_hashed_dictionary_complex_key.sql b/tests/queries/0_stateless/01766_hashed_dictionary_complex_key.sql
index de7ab5b5a1a..1342e3d69cb 100644
--- a/tests/queries/0_stateless/01766_hashed_dictionary_complex_key.sql
+++ b/tests/queries/0_stateless/01766_hashed_dictionary_complex_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01766_db;
 CREATE DATABASE 01766_db;
 
diff --git a/tests/queries/0_stateless/01776_decrypt_aead_size_check.sql b/tests/queries/0_stateless/01776_decrypt_aead_size_check.sql
index 8730ed0eda2..f03b1e0350a 100644
--- a/tests/queries/0_stateless/01776_decrypt_aead_size_check.sql
+++ b/tests/queries/0_stateless/01776_decrypt_aead_size_check.sql
@@ -1 +1,4 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 SELECT decrypt('aes-128-gcm', 'text', 'key', 'IV'); -- { serverError 36 }
diff --git a/tests/queries/0_stateless/01778_hierarchical_dictionaries.sql b/tests/queries/0_stateless/01778_hierarchical_dictionaries.sql
index f6e1a7c9375..8e5f68c2c5f 100644
--- a/tests/queries/0_stateless/01778_hierarchical_dictionaries.sql
+++ b/tests/queries/0_stateless/01778_hierarchical_dictionaries.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01778_db;
 CREATE DATABASE 01778_db;
 
diff --git a/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.sql b/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.sql
index 5673e646a47..2ea6119cef8 100644
--- a/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.sql
+++ b/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01780_db;
 CREATE DATABASE 01780_db;
 
diff --git a/tests/queries/0_stateless/01781_merge_tree_deduplication.sql b/tests/queries/0_stateless/01781_merge_tree_deduplication.sql
index 236f7b35b80..1e3b464da30 100644
--- a/tests/queries/0_stateless/01781_merge_tree_deduplication.sql
+++ b/tests/queries/0_stateless/01781_merge_tree_deduplication.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS merge_tree_deduplication;
 
 CREATE TABLE merge_tree_deduplication
diff --git a/tests/queries/0_stateless/01783_http_chunk_size.sh b/tests/queries/0_stateless/01783_http_chunk_size.sh
index 66ac4dfa975..a4fa7780077 100755
--- a/tests/queries/0_stateless/01783_http_chunk_size.sh
+++ b/tests/queries/0_stateless/01783_http_chunk_size.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database
+# Tag no-replicated-database: Requires investigation
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01785_dictionary_element_count.sql b/tests/queries/0_stateless/01785_dictionary_element_count.sql
index 6db65152a56..1d60fc92447 100644
--- a/tests/queries/0_stateless/01785_dictionary_element_count.sql
+++ b/tests/queries/0_stateless/01785_dictionary_element_count.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01785_db;
 CREATE DATABASE 01785_db;
 
diff --git a/tests/queries/0_stateless/01798_uniq_theta_sketch.sql b/tests/queries/0_stateless/01798_uniq_theta_sketch.sql
index 0b728d690d2..bb400c5de14 100644
--- a/tests/queries/0_stateless/01798_uniq_theta_sketch.sql
+++ b/tests/queries/0_stateless/01798_uniq_theta_sketch.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT 'uniqTheta many agrs';
 
 SELECT
diff --git a/tests/queries/0_stateless/01799_long_uniq_theta_sketch.sql b/tests/queries/0_stateless/01799_long_uniq_theta_sketch.sql
index 8f0b096a11d..d86575c3f0a 100644
--- a/tests/queries/0_stateless/01799_long_uniq_theta_sketch.sql
+++ b/tests/queries/0_stateless/01799_long_uniq_theta_sketch.sql
@@ -1,3 +1,5 @@
+-- Tags: long, no-fasttest
+
 SELECT 'uniqTheta';
 
 SELECT Y, uniqTheta(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
diff --git a/tests/queries/0_stateless/01801_distinct_group_by_shard.sql b/tests/queries/0_stateless/01801_distinct_group_by_shard.sql
index ca6572b91ee..848077f05d4 100644
--- a/tests/queries/0_stateless/01801_distinct_group_by_shard.sql
+++ b/tests/queries/0_stateless/01801_distinct_group_by_shard.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT DISTINCT a FROM remote('127.0.0.{1,2,3}', values('a UInt8, b UInt8', (1, 2), (1, 3))) GROUP BY a, b;
diff --git a/tests/queries/0_stateless/01801_s3_cluster.sql b/tests/queries/0_stateless/01801_s3_cluster.sql
index 9c13c257249..e466b1e108e 100644
--- a/tests/queries/0_stateless/01801_s3_cluster.sql
+++ b/tests/queries/0_stateless/01801_s3_cluster.sql
@@ -1,2 +1,5 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on AWS
+
 select * from s3('http://localhost:11111/test/{a,b,c}.tsv', 'test', 'testtest', 'TSV', 'a UInt64, b UInt64, c UInt64') ORDER BY a, b, c;
 select * from s3Cluster('test_cluster_two_shards', 'http://localhost:11111/test/{a,b,c}.tsv', 'test', 'testtest', 'TSV', 'a UInt64, b UInt64, c UInt64') ORDER BY a, b, c;
diff --git a/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh b/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh
index 4b3e35047bc..4713b15bb5b 100755
--- a/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh
+++ b/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
+# Tag no-parallel: Creates database and users
+# Tag no-fasttest: Requires postgresql-client
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01804_dictionary_decimal256_type.sql b/tests/queries/0_stateless/01804_dictionary_decimal256_type.sql
index 1aba8ef7596..77e9abfb742 100644
--- a/tests/queries/0_stateless/01804_dictionary_decimal256_type.sql
+++ b/tests/queries/0_stateless/01804_dictionary_decimal256_type.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET allow_experimental_bigint_types = 1;
 
 DROP TABLE IF EXISTS dictionary_decimal_source_table;
diff --git a/tests/queries/0_stateless/01810_max_part_removal_threads_long.sh b/tests/queries/0_stateless/01810_max_part_removal_threads_long.sh
index f2aa1f63197..a2945de5b0c 100755
--- a/tests/queries/0_stateless/01810_max_part_removal_threads_long.sh
+++ b/tests/queries/0_stateless/01810_max_part_removal_threads_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 # NOTE: this done as not .sql since we need to Ordinary database
 # (to account threads in query_log for DROP TABLE query)
diff --git a/tests/queries/0_stateless/01811_filter_by_null.sql b/tests/queries/0_stateless/01811_filter_by_null.sql
index 496faf428ab..77d6335254e 100644
--- a/tests/queries/0_stateless/01811_filter_by_null.sql
+++ b/tests/queries/0_stateless/01811_filter_by_null.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 DROP TABLE IF EXISTS test_01344;
 
 CREATE TABLE test_01344 (x String, INDEX idx (x) TYPE set(10) GRANULARITY 1) ENGINE = MergeTree ORDER BY tuple() SETTINGS min_bytes_for_wide_part = 0;
diff --git a/tests/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.sql b/tests/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.sql
index c39947f2c04..668c3511d82 100644
--- a/tests/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.sql
+++ b/tests/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- remote() does not have sharding key, while force_optimize_skip_unused_shards=2 requires from table to have it.
 -- But due to only one node, everything works.
 select * from remote('127.1', system.one) settings optimize_skip_unused_shards=1, force_optimize_skip_unused_shards=2 format Null;
diff --git a/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.sql b/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.sql
index 722bd4af5bb..9ccea41c5cc 100644
--- a/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.sql
+++ b/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS data;
 CREATE TABLE data (a Int64, b Int64) ENGINE = TinyLog();
 
diff --git a/tests/queries/0_stateless/01814_distributed_push_down_limit.sh b/tests/queries/0_stateless/01814_distributed_push_down_limit.sh
index 24b27e74ba5..81ed4568092 100755
--- a/tests/queries/0_stateless/01814_distributed_push_down_limit.sh
+++ b/tests/queries/0_stateless/01814_distributed_push_down_limit.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: distributed
+
 # shellcheck disable=SC2206
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.sql b/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.sql
index 636426fcc91..c53c59df72a 100644
--- a/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.sql
+++ b/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS dictionary_primary_key_source_table;
 CREATE TABLE dictionary_primary_key_source_table
 (
diff --git a/tests/queries/0_stateless/01821_join_table_race_long.sh b/tests/queries/0_stateless/01821_join_table_race_long.sh
index 7c56bf77bfd..e02fe788653 100755
--- a/tests/queries/0_stateless/01821_join_table_race_long.sh
+++ b/tests/queries/0_stateless/01821_join_table_race_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01821_table_comment.sql b/tests/queries/0_stateless/01821_table_comment.sql
index 6d9218d5a42..4bd71d3e278 100644
--- a/tests/queries/0_stateless/01821_table_comment.sql
+++ b/tests/queries/0_stateless/01821_table_comment.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 DROP TABLE IF EXISTS t3;
diff --git a/tests/queries/0_stateless/01823_explain_json.sh b/tests/queries/0_stateless/01823_explain_json.sh
index 004e85cd965..3db2dcb6dc4 100755
--- a/tests/queries/0_stateless/01823_explain_json.sh
+++ b/tests/queries/0_stateless/01823_explain_json.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01824_prefer_global_in_and_join.sql b/tests/queries/0_stateless/01824_prefer_global_in_and_join.sql
index 7f163f9ac7b..01ef768b423 100644
--- a/tests/queries/0_stateless/01824_prefer_global_in_and_join.sql
+++ b/tests/queries/0_stateless/01824_prefer_global_in_and_join.sql
@@ -1,3 +1,5 @@
+-- Tags: global, no-parallel
+
 -- { echo }
 CREATE DATABASE IF NOT EXISTS test_01824;
 USE test_01824;
diff --git a/tests/queries/0_stateless/01833_test_collation_alvarotuso.sql b/tests/queries/0_stateless/01833_test_collation_alvarotuso.sql
index 65422731711..7a9e9cd8838 100644
--- a/tests/queries/0_stateless/01833_test_collation_alvarotuso.sql
+++ b/tests/queries/0_stateless/01833_test_collation_alvarotuso.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS test_collation;
 
 CREATE TABLE test_collation
diff --git a/tests/queries/0_stateless/01837_database_memory_ddl_dictionaries.sql b/tests/queries/0_stateless/01837_database_memory_ddl_dictionaries.sql
index baba8b5188e..99bde21d2e5 100644
--- a/tests/queries/0_stateless/01837_database_memory_ddl_dictionaries.sql
+++ b/tests/queries/0_stateless/01837_database_memory_ddl_dictionaries.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 DROP DATABASE IF EXISTS 01837_db;
 CREATE DATABASE 01837_db ENGINE = Memory;
 
diff --git a/tests/queries/0_stateless/01849_geoToS2.sql b/tests/queries/0_stateless/01849_geoToS2.sql
index eb50fa81b8a..abd084a2b19 100644
--- a/tests/queries/0_stateless/01849_geoToS2.sql
+++ b/tests/queries/0_stateless/01849_geoToS2.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s2
+
 DROP TABLE IF EXISTS s2_indexes;
 
 CREATE TABLE s2_indexes (s2_index UInt64, longitude Float64, latitude Float64) ENGINE = Memory;
diff --git a/tests/queries/0_stateless/01850_dist_INSERT_preserve_error.sql b/tests/queries/0_stateless/01850_dist_INSERT_preserve_error.sql
index ab4c63ccdf2..790173013f6 100644
--- a/tests/queries/0_stateless/01850_dist_INSERT_preserve_error.sql
+++ b/tests/queries/0_stateless/01850_dist_INSERT_preserve_error.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 create database if not exists shard_0;
 create database if not exists shard_1;
 
diff --git a/tests/queries/0_stateless/01851_s2_to_geo.sql b/tests/queries/0_stateless/01851_s2_to_geo.sql
index 76e4b2a5346..d833b95a62f 100644
--- a/tests/queries/0_stateless/01851_s2_to_geo.sql
+++ b/tests/queries/0_stateless/01851_s2_to_geo.sql
@@ -1,2 +1,5 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s2
+
 select s2ToGeo(4573520603753570041);
 select s2ToGeo(4573517609713934091);
diff --git a/tests/queries/0_stateless/01852_dictionary_found_rate_long.sql b/tests/queries/0_stateless/01852_dictionary_found_rate_long.sql
index a51309b3ffd..09ca0e2063d 100644
--- a/tests/queries/0_stateless/01852_dictionary_found_rate_long.sql
+++ b/tests/queries/0_stateless/01852_dictionary_found_rate_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, no-parallel
+
 --
 -- Simple key
 --
diff --git a/tests/queries/0_stateless/01852_s2_get_neighbours.sql b/tests/queries/0_stateless/01852_s2_get_neighbours.sql
index 8163f827697..89232c512df 100644
--- a/tests/queries/0_stateless/01852_s2_get_neighbours.sql
+++ b/tests/queries/0_stateless/01852_s2_get_neighbours.sql
@@ -1 +1,4 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s2
+
 select s2GetNeighbors(5074766849661468672);
diff --git a/tests/queries/0_stateless/01853_dictionary_cache_duplicates.sh b/tests/queries/0_stateless/01853_dictionary_cache_duplicates.sh
index 409f8d5ecf5..218320772c9 100755
--- a/tests/queries/0_stateless/01853_dictionary_cache_duplicates.sh
+++ b/tests/queries/0_stateless/01853_dictionary_cache_duplicates.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01853_s2_cells_intersect.sql b/tests/queries/0_stateless/01853_s2_cells_intersect.sql
index 2a033a67d58..c426a86f631 100644
--- a/tests/queries/0_stateless/01853_s2_cells_intersect.sql
+++ b/tests/queries/0_stateless/01853_s2_cells_intersect.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s2
+
 select s2CellsIntersect(9926595209846587392, 9926594385212866560);
 select s2CellsIntersect(9926595209846587392, 9937259648002293760);
 
diff --git a/tests/queries/0_stateless/01854_dictionary_range_hashed_min_max_attr.sql b/tests/queries/0_stateless/01854_dictionary_range_hashed_min_max_attr.sql
index f6a9d6aa25c..34ce7ea04b5 100644
--- a/tests/queries/0_stateless/01854_dictionary_range_hashed_min_max_attr.sql
+++ b/tests/queries/0_stateless/01854_dictionary_range_hashed_min_max_attr.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DICTIONARY IF EXISTS dict_01864;
 CREATE DICTIONARY dict_01864
 (
diff --git a/tests/queries/0_stateless/01854_s2_cap_contains.sql b/tests/queries/0_stateless/01854_s2_cap_contains.sql
index 1a8d2548352..4ee4158fdbb 100644
--- a/tests/queries/0_stateless/01854_s2_cap_contains.sql
+++ b/tests/queries/0_stateless/01854_s2_cap_contains.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s2
+
 select s2CapContains(1157339245694594829, 1.0, 1157347770437378819);
 select s2CapContains(1157339245694594829, 1.0, 1152921504606846977);
 select s2CapContains(1157339245694594829, 3.14, 1157339245694594829);
diff --git a/tests/queries/0_stateless/01854_s2_cap_union.sql b/tests/queries/0_stateless/01854_s2_cap_union.sql
index 921a00ac663..9f8510fb833 100644
--- a/tests/queries/0_stateless/01854_s2_cap_union.sql
+++ b/tests/queries/0_stateless/01854_s2_cap_union.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s2
+
 select s2CapUnion(3814912406305146967, 1.0, 1157347770437378819, 1.0);
 select s2CapUnion(1157339245694594829, -1.0, 1152921504606846977, -1.0);
 select s2CapUnion(1157339245694594829, toFloat64(toUInt64(-1)), 1157339245694594829, toFloat64(toUInt64(-1)));
diff --git a/tests/queries/0_stateless/01856_create_function.sql b/tests/queries/0_stateless/01856_create_function.sql
index 3dc6c9f4445..10f87f4a3df 100644
--- a/tests/queries/0_stateless/01856_create_function.sql
+++ b/tests/queries/0_stateless/01856_create_function.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE FUNCTION 01856_test_function_0 AS (a, b, c) -> a * b * c;
 SELECT 01856_test_function_0(2, 3, 4);
 SELECT isConstant(01856_test_function_0(1, 2, 3));
diff --git a/tests/queries/0_stateless/01860_Distributed__shard_num_GROUP_BY.sql b/tests/queries/0_stateless/01860_Distributed__shard_num_GROUP_BY.sql
index d8a86b7799e..5dfdb9482ee 100644
--- a/tests/queries/0_stateless/01860_Distributed__shard_num_GROUP_BY.sql
+++ b/tests/queries/0_stateless/01860_Distributed__shard_num_GROUP_BY.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- GROUP BY _shard_num
 SELECT _shard_num, count() FROM remote('127.0.0.{1,2}', system.one) GROUP BY _shard_num ORDER BY _shard_num;
 SELECT _shard_num s, count() FROM remote('127.0.0.{1,2}', system.one) GROUP BY _shard_num ORDER BY _shard_num;
diff --git a/tests/queries/0_stateless/01870_buffer_flush.sql b/tests/queries/0_stateless/01870_buffer_flush.sql
index 55ec79325dc..5e60bc7e080 100644
--- a/tests/queries/0_stateless/01870_buffer_flush.sql
+++ b/tests/queries/0_stateless/01870_buffer_flush.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- Check that Buffer will be flushed before shutdown
 -- (via DETACH DATABASE)
 
diff --git a/tests/queries/0_stateless/01870_modulo_partition_key.sql b/tests/queries/0_stateless/01870_modulo_partition_key.sql
index 0226bcc0a3c..06b6fc86d3e 100644
--- a/tests/queries/0_stateless/01870_modulo_partition_key.sql
+++ b/tests/queries/0_stateless/01870_modulo_partition_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SELECT 'simple partition key:';
 DROP TABLE IF EXISTS table1 SYNC;
 CREATE TABLE table1 (id Int64, v UInt64)
diff --git a/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.sh b/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.sh
index 51c47d4ad14..806fbd05fbf 100755
--- a/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.sh
+++ b/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01883_subcolumns_distributed.sql b/tests/queries/0_stateless/01883_subcolumns_distributed.sql
index 5593dc60251..7aedc7c8eab 100644
--- a/tests/queries/0_stateless/01883_subcolumns_distributed.sql
+++ b/tests/queries/0_stateless/01883_subcolumns_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS t_subcolumns_local;
 DROP TABLE IF EXISTS t_subcolumns_dist;
 
diff --git a/tests/queries/0_stateless/01889_check_row_policy_defined_using_user_function.sh b/tests/queries/0_stateless/01889_check_row_policy_defined_using_user_function.sh
index b49c7b5371c..b5be39a91df 100755
--- a/tests/queries/0_stateless/01889_check_row_policy_defined_using_user_function.sh
+++ b/tests/queries/0_stateless/01889_check_row_policy_defined_using_user_function.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=none
 
diff --git a/tests/queries/0_stateless/01889_clickhouse_client_config_format.sh b/tests/queries/0_stateless/01889_clickhouse_client_config_format.sh
index 6cea18e2c66..aa162911399 100755
--- a/tests/queries/0_stateless/01889_clickhouse_client_config_format.sh
+++ b/tests/queries/0_stateless/01889_clickhouse_client_config_format.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01889_postgresql_protocol_null_fields.sh b/tests/queries/0_stateless/01889_postgresql_protocol_null_fields.sh
index 9d61f7034cf..e9467d77451 100755
--- a/tests/queries/0_stateless/01889_postgresql_protocol_null_fields.sh
+++ b/tests/queries/0_stateless/01889_postgresql_protocol_null_fields.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
+# Tag no-fasttest: needs psql
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01889_sql_json_functions.sql b/tests/queries/0_stateless/01889_sql_json_functions.sql
index 1c5069ccfde..0c4f3aff9a3 100644
--- a/tests/queries/0_stateless/01889_sql_json_functions.sql
+++ b/tests/queries/0_stateless/01889_sql_json_functions.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT '--JSON_VALUE--';
 SELECT JSON_VALUE('$', '{"hello":1}'); -- root is a complex object => default value (empty string)
 SELECT JSON_VALUE('$.hello', '{"hello":1}');
diff --git a/tests/queries/0_stateless/01889_sqlite_read_write.sh b/tests/queries/0_stateless/01889_sqlite_read_write.sh
index 3e7e15d2830..247f44b61e7 100755
--- a/tests/queries/0_stateless/01889_sqlite_read_write.sh
+++ b/tests/queries/0_stateless/01889_sqlite_read_write.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01890_jit_aggregation_function_sum_long.sql b/tests/queries/0_stateless/01890_jit_aggregation_function_sum_long.sql
index 0f61ab168f5..d1b8f407389 100644
--- a/tests/queries/0_stateless/01890_jit_aggregation_function_sum_long.sql
+++ b/tests/queries/0_stateless/01890_jit_aggregation_function_sum_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01890_materialized_distributed_join.sh b/tests/queries/0_stateless/01890_materialized_distributed_join.sh
index e9808a80db1..8aca09303e0 100755
--- a/tests/queries/0_stateless/01890_materialized_distributed_join.sh
+++ b/tests/queries/0_stateless/01890_materialized_distributed_join.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: distributed
 
 # FIXME: this is an .sh test because JOIN with Distributed in the left will use default database for the right.
 
diff --git a/tests/queries/0_stateless/01890_stem.sql b/tests/queries/0_stateless/01890_stem.sql
index 472cfb54251..8fe41d225ec 100644
--- a/tests/queries/0_stateless/01890_stem.sql
+++ b/tests/queries/0_stateless/01890_stem.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: depends on libstemmer_c
+
 SET allow_experimental_nlp_functions = 1;
 
 SELECT stem('en', 'given');
diff --git a/tests/queries/0_stateless/01891_jit_aggregation_function_any_long.sql b/tests/queries/0_stateless/01891_jit_aggregation_function_any_long.sql
index 28e81640993..237f1fd4e21 100644
--- a/tests/queries/0_stateless/01891_jit_aggregation_function_any_long.sql
+++ b/tests/queries/0_stateless/01891_jit_aggregation_function_any_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01891_partition_hash_no_long_int.sql b/tests/queries/0_stateless/01891_partition_hash_no_long_int.sql
index 0751ff2729f..643266f1ea3 100644
--- a/tests/queries/0_stateless/01891_partition_hash_no_long_int.sql
+++ b/tests/queries/0_stateless/01891_partition_hash_no_long_int.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 drop table if exists tab;
 create table tab (i8 Int8, i16 Int16, i32 Int32, i64 Int64, u8 UInt8, u16 UInt16, u32 UInt32, u64 UInt64, id UUID, s String, fs FixedString(33), a Array(UInt8), t Tuple(UInt16, UInt32), d Date, dt DateTime('Europe/Moscow'), dt64 DateTime64(3, 'Europe/Moscow'), dec128 Decimal128(3), lc LowCardinality(String)) engine = MergeTree PARTITION BY (i8, i16, i32, i64, u8, u16, u32, u64, id, s, fs, a, t, d, dt, dt64, dec128, lc) order by tuple();
 insert into tab values (-1, -1, -1, -1, -1, -1, -1, -1, '61f0c404-5cb3-11e7-907b-a6006ad3dba0', 'a', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', [1, 2, 3], (-1, -2), '2020-01-01', '2020-01-01 01:01:01', '2020-01-01 01:01:01', '123.456', 'a');
diff --git a/tests/queries/0_stateless/01892_jit_aggregation_function_any_last_long.sql b/tests/queries/0_stateless/01892_jit_aggregation_function_any_last_long.sql
index c02ed8f18ee..13ebd958a84 100644
--- a/tests/queries/0_stateless/01892_jit_aggregation_function_any_last_long.sql
+++ b/tests/queries/0_stateless/01892_jit_aggregation_function_any_last_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01892_setting_limit_offset_distributed.sql b/tests/queries/0_stateless/01892_setting_limit_offset_distributed.sql
index bcd6e47d4c7..88867eef24a 100644
--- a/tests/queries/0_stateless/01892_setting_limit_offset_distributed.sql
+++ b/tests/queries/0_stateless/01892_setting_limit_offset_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SELECT 'limit', * FROM remote('127.1', view(SELECT * FROM numbers(10))) SETTINGS limit=5;
 SELECT 'offset', * FROM remote('127.1', view(SELECT * FROM numbers(10))) SETTINGS offset=5;
 
diff --git a/tests/queries/0_stateless/01893_jit_aggregation_function_min_long.sql b/tests/queries/0_stateless/01893_jit_aggregation_function_min_long.sql
index 5e700e537eb..2f2b683a153 100644
--- a/tests/queries/0_stateless/01893_jit_aggregation_function_min_long.sql
+++ b/tests/queries/0_stateless/01893_jit_aggregation_function_min_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01894_jit_aggregation_function_max_long.sql b/tests/queries/0_stateless/01894_jit_aggregation_function_max_long.sql
index 8ba11f4c643..99dda05930e 100644
--- a/tests/queries/0_stateless/01894_jit_aggregation_function_max_long.sql
+++ b/tests/queries/0_stateless/01894_jit_aggregation_function_max_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01895_jit_aggregation_function_avg_long.sql b/tests/queries/0_stateless/01895_jit_aggregation_function_avg_long.sql
index 903a7c65f21..27a97faa45a 100644
--- a/tests/queries/0_stateless/01895_jit_aggregation_function_avg_long.sql
+++ b/tests/queries/0_stateless/01895_jit_aggregation_function_avg_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01896_jit_aggregation_function_if_long.sql b/tests/queries/0_stateless/01896_jit_aggregation_function_if_long.sql
index 8b5618230f0..a3228d4a841 100644
--- a/tests/queries/0_stateless/01896_jit_aggregation_function_if_long.sql
+++ b/tests/queries/0_stateless/01896_jit_aggregation_function_if_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01897_jit_aggregation_function_avg_weighted_long.sql b/tests/queries/0_stateless/01897_jit_aggregation_function_avg_weighted_long.sql
index 04b8a818382..5e378f3ec6b 100644
--- a/tests/queries/0_stateless/01897_jit_aggregation_function_avg_weighted_long.sql
+++ b/tests/queries/0_stateless/01897_jit_aggregation_function_avg_weighted_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01900_kill_mutation_parallel_long.sh b/tests/queries/0_stateless/01900_kill_mutation_parallel_long.sh
index bb12f7c0e42..30dff6db0c4 100755
--- a/tests/queries/0_stateless/01900_kill_mutation_parallel_long.sh
+++ b/tests/queries/0_stateless/01900_kill_mutation_parallel_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 #
 # Check that KILL MUTATION can be executed in parallel for different tables.
diff --git a/tests/queries/0_stateless/01901_in_literal_shard_prune.sql b/tests/queries/0_stateless/01901_in_literal_shard_prune.sql
index cc587c36613..9250547dad8 100644
--- a/tests/queries/0_stateless/01901_in_literal_shard_prune.sql
+++ b/tests/queries/0_stateless/01901_in_literal_shard_prune.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 set optimize_skip_unused_shards=1;
 set force_optimize_skip_unused_shards=1;
 
diff --git a/tests/queries/0_stateless/01901_test_attach_partition_from.sql b/tests/queries/0_stateless/01901_test_attach_partition_from.sql
index c15edacc6c8..1fe073f0c32 100644
--- a/tests/queries/0_stateless/01901_test_attach_partition_from.sql
+++ b/tests/queries/0_stateless/01901_test_attach_partition_from.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS test_alter_attach_01901S;
 DROP TABLE IF EXISTS test_alter_attach_01901D;
 
diff --git a/tests/queries/0_stateless/01902_dictionary_array_type.sql b/tests/queries/0_stateless/01902_dictionary_array_type.sql
index 700f26e915d..bff107d4dad 100644
--- a/tests/queries/0_stateless/01902_dictionary_array_type.sql
+++ b/tests/queries/0_stateless/01902_dictionary_array_type.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS dictionary_array_source_table;
 CREATE TABLE dictionary_array_source_table
 (
diff --git a/tests/queries/0_stateless/01902_table_function_merge_db_repr.sql b/tests/queries/0_stateless/01902_table_function_merge_db_repr.sql
index 3aabf1a1f36..3801a83e247 100644
--- a/tests/queries/0_stateless/01902_table_function_merge_db_repr.sql
+++ b/tests/queries/0_stateless/01902_table_function_merge_db_repr.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01902_db;
 DROP DATABASE IF EXISTS 01902_db1;
 DROP DATABASE IF EXISTS 01902_db2;
diff --git a/tests/queries/0_stateless/01903_ssd_cache_dictionary_array_type.sh b/tests/queries/0_stateless/01903_ssd_cache_dictionary_array_type.sh
index 70aa4623320..b1d6049abcf 100755
--- a/tests/queries/0_stateless/01903_ssd_cache_dictionary_array_type.sh
+++ b/tests/queries/0_stateless/01903_ssd_cache_dictionary_array_type.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01904_dictionary_default_nullable_type.sql b/tests/queries/0_stateless/01904_dictionary_default_nullable_type.sql
index 0d4f7119fa3..e6831c92c9f 100644
--- a/tests/queries/0_stateless/01904_dictionary_default_nullable_type.sql
+++ b/tests/queries/0_stateless/01904_dictionary_default_nullable_type.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS dictionary_nullable_source_table;
 CREATE TABLE dictionary_nullable_source_table
 (
diff --git a/tests/queries/0_stateless/01904_ssd_cache_dictionary_default_nullable_type.sh b/tests/queries/0_stateless/01904_ssd_cache_dictionary_default_nullable_type.sh
index d3a4389e6d5..07d2ac7baad 100755
--- a/tests/queries/0_stateless/01904_ssd_cache_dictionary_default_nullable_type.sh
+++ b/tests/queries/0_stateless/01904_ssd_cache_dictionary_default_nullable_type.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01905_to_json_string.sql b/tests/queries/0_stateless/01905_to_json_string.sql
index 80d9c2e2625..e92c32f3422 100644
--- a/tests/queries/0_stateless/01905_to_json_string.sql
+++ b/tests/queries/0_stateless/01905_to_json_string.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 create temporary table t engine Memory as select * from generateRandom(
 $$
     a Array(Int8),
diff --git a/tests/queries/0_stateless/01906_h3_to_geo.sql b/tests/queries/0_stateless/01906_h3_to_geo.sql
index aa6ecca1754..dd8608fbccd 100644
--- a/tests/queries/0_stateless/01906_h3_to_geo.sql
+++ b/tests/queries/0_stateless/01906_h3_to_geo.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 DROP TABLE IF EXISTS h3_indexes;
 
 CREATE TABLE h3_indexes (h3_index UInt64) ENGINE = Memory;
diff --git a/tests/queries/0_stateless/01910_client_replxx_container_overflow_long.expect b/tests/queries/0_stateless/01910_client_replxx_container_overflow_long.expect
index 55211dca979..3003a0de42d 100755
--- a/tests/queries/0_stateless/01910_client_replxx_container_overflow_long.expect
+++ b/tests/queries/0_stateless/01910_client_replxx_container_overflow_long.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: long, no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01910_memory_tracking_topk.sql b/tests/queries/0_stateless/01910_memory_tracking_topk.sql
index e6309c1eeb8..ea0b4f9047e 100644
--- a/tests/queries/0_stateless/01910_memory_tracking_topk.sql
+++ b/tests/queries/0_stateless/01910_memory_tracking_topk.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database
+
 -- Memory limit must correctly apply, triggering an exception:
 
 SET max_memory_usage = '100M';
diff --git a/tests/queries/0_stateless/01910_view_dictionary.sql b/tests/queries/0_stateless/01910_view_dictionary.sql
index 28c50daeba1..7b807c7fbba 100644
--- a/tests/queries/0_stateless/01910_view_dictionary.sql
+++ b/tests/queries/0_stateless/01910_view_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS dictionary_source_en;
 DROP TABLE IF EXISTS dictionary_source_ru;
 DROP TABLE IF EXISTS dictionary_source_view;
diff --git a/tests/queries/0_stateless/01913_replace_dictionary.sql b/tests/queries/0_stateless/01913_replace_dictionary.sql
index 43dd460707a..891d0c6abd6 100644
--- a/tests/queries/0_stateless/01913_replace_dictionary.sql
+++ b/tests/queries/0_stateless/01913_replace_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01913_db;
 CREATE DATABASE 01913_db ENGINE=Atomic;
 
diff --git a/tests/queries/0_stateless/01914_exchange_dictionaries.sql b/tests/queries/0_stateless/01914_exchange_dictionaries.sql
index 77bcf53ab5e..8c86a04fd90 100644
--- a/tests/queries/0_stateless/01914_exchange_dictionaries.sql
+++ b/tests/queries/0_stateless/01914_exchange_dictionaries.sql
@@ -1,3 +1,6 @@
+-- Tags: no-ordinary-database, no-parallel
+-- Tag no-ordinary-database: Requires Atomic database
+
 DROP DATABASE IF EXISTS 01914_db;
 CREATE DATABASE 01914_db ENGINE=Atomic;
 
diff --git a/tests/queries/0_stateless/01915_create_or_replace_dictionary.sql b/tests/queries/0_stateless/01915_create_or_replace_dictionary.sql
index 1520dd41973..6f52aea0f69 100644
--- a/tests/queries/0_stateless/01915_create_or_replace_dictionary.sql
+++ b/tests/queries/0_stateless/01915_create_or_replace_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01915_db;
 CREATE DATABASE test_01915_db ENGINE=Atomic;
 
diff --git a/tests/queries/0_stateless/01915_json_extract_raw_string.sql b/tests/queries/0_stateless/01915_json_extract_raw_string.sql
index 4c5be79f6ef..884c599c206 100644
--- a/tests/queries/0_stateless/01915_json_extract_raw_string.sql
+++ b/tests/queries/0_stateless/01915_json_extract_raw_string.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 select JSONExtract('{"a": "123", "b": 456, "c": [7, 8, 9]}', 'Tuple(a String, b String, c String)');
 
 with '{"string_value":null}' as json select JSONExtract(json, 'string_value', 'Nullable(String)');
diff --git a/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh b/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh
index 80022bd472d..07988da12c2 100755
--- a/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01922_client_param.sh b/tests/queries/0_stateless/01922_client_param.sh
index bb0abfb2191..b126746a53b 100755
--- a/tests/queries/0_stateless/01922_client_param.sh
+++ b/tests/queries/0_stateless/01922_client_param.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh b/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh
index bcb3775f86a..ec5aa141859 100755
--- a/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh
+++ b/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: needs pv
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01925_broken_partition_id_zookeeper.sql b/tests/queries/0_stateless/01925_broken_partition_id_zookeeper.sql
index 07e490d0ce0..7d151f063e1 100644
--- a/tests/queries/0_stateless/01925_broken_partition_id_zookeeper.sql
+++ b/tests/queries/0_stateless/01925_broken_partition_id_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS broken_partition;
 
 CREATE TABLE broken_partition
diff --git a/tests/queries/0_stateless/01925_jit_aggregation_function_count_long.sql b/tests/queries/0_stateless/01925_jit_aggregation_function_count_long.sql
index 03a3c4f8b65..01e2c711ed5 100644
--- a/tests/queries/0_stateless/01925_jit_aggregation_function_count_long.sql
+++ b/tests/queries/0_stateless/01925_jit_aggregation_function_count_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01925_json_as_string_data_in_square_brackets.sql b/tests/queries/0_stateless/01925_json_as_string_data_in_square_brackets.sql
index c568cf92118..3b1e5176ff9 100644
--- a/tests/queries/0_stateless/01925_json_as_string_data_in_square_brackets.sql
+++ b/tests/queries/0_stateless/01925_json_as_string_data_in_square_brackets.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS json_square_brackets;
 CREATE TABLE json_square_brackets (field String) ENGINE = Memory;
 INSERT INTO json_square_brackets FORMAT JSONAsString [{"id": 1, "name": "name1"}, {"id": 2, "name": "name2"}];
diff --git a/tests/queries/0_stateless/01925_test_storage_merge_aliases.sql b/tests/queries/0_stateless/01925_test_storage_merge_aliases.sql
index f3a5b2db62e..56d255570c8 100644
--- a/tests/queries/0_stateless/01925_test_storage_merge_aliases.sql
+++ b/tests/queries/0_stateless/01925_test_storage_merge_aliases.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists merge;
 create table merge
 (
diff --git a/tests/queries/0_stateless/01926_json_as_string_array.sh b/tests/queries/0_stateless/01926_json_as_string_array.sh
index 25259a0f511..477cb8cff9e 100755
--- a/tests/queries/0_stateless/01926_json_as_string_array.sh
+++ b/tests/queries/0_stateless/01926_json_as_string_array.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/01930_optimize_skip_unused_shards_rewrite_in.sql b/tests/queries/0_stateless/01930_optimize_skip_unused_shards_rewrite_in.sql
index 7e53c0c2db7..afc2d014f4f 100644
--- a/tests/queries/0_stateless/01930_optimize_skip_unused_shards_rewrite_in.sql
+++ b/tests/queries/0_stateless/01930_optimize_skip_unused_shards_rewrite_in.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 set optimize_skip_unused_shards=1;
 set force_optimize_skip_unused_shards=2;
 
diff --git a/tests/queries/0_stateless/01932_global_in_function.sql b/tests/queries/0_stateless/01932_global_in_function.sql
index 467bf6c3495..ccae1e17a55 100644
--- a/tests/queries/0_stateless/01932_global_in_function.sql
+++ b/tests/queries/0_stateless/01932_global_in_function.sql
@@ -1,2 +1,4 @@
+-- Tags: global
+
 select number from cluster(test_cluster_two_shards_localhost, numbers(1)) where number global in tuple(0, 1, 2, 3);
 select number from cluster(test_cluster_two_shards_localhost, numbers(1)) where number global in array(0, 1, 2, 3);
diff --git a/tests/queries/0_stateless/01932_remote_sharding_key_column.sql b/tests/queries/0_stateless/01932_remote_sharding_key_column.sql
index ded2f187821..20b86eacd71 100644
--- a/tests/queries/0_stateless/01932_remote_sharding_key_column.sql
+++ b/tests/queries/0_stateless/01932_remote_sharding_key_column.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- regression test for the following query:
 --
 --     select * from remote('127.1', system.one, dummy)
diff --git a/tests/queries/0_stateless/01933_client_replxx_convert_history.expect b/tests/queries/0_stateless/01933_client_replxx_convert_history.expect
index 890d024847f..664c3f06d20 100755
--- a/tests/queries/0_stateless/01933_client_replxx_convert_history.expect
+++ b/tests/queries/0_stateless/01933_client_replxx_convert_history.expect
@@ -1,4 +1,6 @@
 #!/usr/bin/expect -f
+# Tags: no-parallel, no-fasttest
+# Tag no-parallel: Uses non unique history file
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01939_type_map_json.sql b/tests/queries/0_stateless/01939_type_map_json.sql
index df782334c90..9a2d8840e93 100644
--- a/tests/queries/0_stateless/01939_type_map_json.sql
+++ b/tests/queries/0_stateless/01939_type_map_json.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT map(1, 2, 3, 4) AS m FORMAT JSONEachRow;
 SELECT map(1, 2, 3, 4) AS m, toJSONString(m) AS s, isValidJSON(s);
 
diff --git a/tests/queries/0_stateless/01939_user_with_default_database.sh b/tests/queries/0_stateless/01939_user_with_default_database.sh
index 6dcd288797b..7dee12ced2e 100755
--- a/tests/queries/0_stateless/01939_user_with_default_database.sh
+++ b/tests/queries/0_stateless/01939_user_with_default_database.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/01940_custom_tld_sharding_key.sql b/tests/queries/0_stateless/01940_custom_tld_sharding_key.sql
index 5d38cfb18dc..dd2ec704ce9 100644
--- a/tests/queries/0_stateless/01940_custom_tld_sharding_key.sql
+++ b/tests/queries/0_stateless/01940_custom_tld_sharding_key.sql
@@ -1,2 +1,4 @@
+-- Tags: shard
+
 select * from remote('127.{1,2}', view(select 'foo.com' key), cityHash64(key)) where key = cutToFirstSignificantSubdomainCustom('foo.com', 'public_suffix_list') settings optimize_skip_unused_shards=1, force_optimize_skip_unused_shards=1;
 select * from remote('127.{1,2}', view(select 'foo.com' key), cityHash64(key)) where key = cutToFirstSignificantSubdomainCustom('bar.com', 'public_suffix_list') settings optimize_skip_unused_shards=1, force_optimize_skip_unused_shards=1;
diff --git a/tests/queries/0_stateless/01943_query_id_check.sql b/tests/queries/0_stateless/01943_query_id_check.sql
index 6e3d281386d..cb2ef090854 100644
--- a/tests/queries/0_stateless/01943_query_id_check.sql
+++ b/tests/queries/0_stateless/01943_query_id_check.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: Different query_id
+
 DROP TABLE IF EXISTS tmp;
 
 CREATE TABLE tmp ENGINE = TinyLog AS SELECT queryID();
diff --git a/tests/queries/0_stateless/01944_insert_partition_by.sql b/tests/queries/0_stateless/01944_insert_partition_by.sql
index 1c7d96d7762..5396ca4daf6 100644
--- a/tests/queries/0_stateless/01944_insert_partition_by.sql
+++ b/tests/queries/0_stateless/01944_insert_partition_by.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s3
+
 INSERT INTO TABLE FUNCTION file('foo.csv', 'CSV', 'id Int32, val Int32') PARTITION BY val VALUES (1, 1), (2, 2); -- { serverError NOT_IMPLEMENTED }
 INSERT INTO TABLE FUNCTION s3('http://localhost:9001/foo/test_{_partition_id}.csv', 'admin', 'admin', 'CSV', 'id Int32, val String') PARTITION BY val VALUES (1, '\r\n'); -- { serverError CANNOT_PARSE_TEXT }
 INSERT INTO TABLE FUNCTION s3('http://localhost:9001/foo/test_{_partition_id}.csv', 'admin', 'admin', 'CSV', 'id Int32, val String') PARTITION BY val VALUES (1, 'abc\x00abc'); -- { serverError CANNOT_PARSE_TEXT }
diff --git a/tests/queries/0_stateless/01946_test_wrong_host_name_access.sh b/tests/queries/0_stateless/01946_test_wrong_host_name_access.sh
index 86e1fdd768f..a00f307673e 100755
--- a/tests/queries/0_stateless/01946_test_wrong_host_name_access.sh
+++ b/tests/queries/0_stateless/01946_test_wrong_host_name_access.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 MYHOSTNAME=$(hostname -f)
 
diff --git a/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh b/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh
index abca5cdfa3b..b6721d4a798 100755
--- a/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh
+++ b/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01948_dictionary_quoted_database_name.sql b/tests/queries/0_stateless/01948_dictionary_quoted_database_name.sql
index 21e8e07c724..33fd79b14eb 100644
--- a/tests/queries/0_stateless/01948_dictionary_quoted_database_name.sql
+++ b/tests/queries/0_stateless/01948_dictionary_quoted_database_name.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS `01945.db`;
 CREATE DATABASE `01945.db`;
 
diff --git a/tests/queries/0_stateless/01951_distributed_push_down_limit.sql b/tests/queries/0_stateless/01951_distributed_push_down_limit.sql
index 0d6e2069215..fa2fc1800c1 100644
--- a/tests/queries/0_stateless/01951_distributed_push_down_limit.sql
+++ b/tests/queries/0_stateless/01951_distributed_push_down_limit.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- { echo }
 explain select * from remote('127.{1,2}', view(select * from numbers(1e6))) order by number limit 10 settings distributed_push_down_limit=0;
 explain select * from remote('127.{1,2}', view(select * from numbers(1e6))) order by number limit 10 settings distributed_push_down_limit=1;
diff --git a/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.sql b/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.sql
index 2ae872f72b0..d1f80b42e75 100644
--- a/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.sql
+++ b/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 set optimize_skip_unused_shards=1;
 set optimize_distributed_group_by_sharding_key=1;
 
diff --git a/tests/queries/0_stateless/01954_clickhouse_benchmark_multiple_long.sh b/tests/queries/0_stateless/01954_clickhouse_benchmark_multiple_long.sh
index 069695c16db..38e5edf15fd 100755
--- a/tests/queries/0_stateless/01954_clickhouse_benchmark_multiple_long.sh
+++ b/tests/queries/0_stateless/01954_clickhouse_benchmark_multiple_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01955_clickhouse_benchmark_connection_hang.sh b/tests/queries/0_stateless/01955_clickhouse_benchmark_connection_hang.sh
index 9085d646a28..e7871454192 100755
--- a/tests/queries/0_stateless/01955_clickhouse_benchmark_connection_hang.sh
+++ b/tests/queries/0_stateless/01955_clickhouse_benchmark_connection_hang.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-ubsan
+# Tag no-ubsan: Limits RLIMIT_NOFILE, see comment in the test
+
 # shellcheck disable=SC2086
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.sh b/tests/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.sh
index 0e2f1857aed..3ddb6346631 100755
--- a/tests/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.sh
+++ b/tests/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: shard
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=trace
 
diff --git a/tests/queries/0_stateless/01961_roaring_memory_tracking.sql b/tests/queries/0_stateless/01961_roaring_memory_tracking.sql
index 57d71cdc91c..64c31472e89 100644
--- a/tests/queries/0_stateless/01961_roaring_memory_tracking.sql
+++ b/tests/queries/0_stateless/01961_roaring_memory_tracking.sql
@@ -1,2 +1,4 @@
+-- Tags: no-replicated-database
+
 SET max_memory_usage = '100M';
 SELECT cityHash64(rand() % 1000) as n, groupBitmapState(number) FROM numbers_mt(2000000000) GROUP BY n; -- { serverError 241 }
diff --git a/tests/queries/0_stateless/01999_grant_with_replace.sql b/tests/queries/0_stateless/01999_grant_with_replace.sql
index 31a9187c0d2..0f11bc5423c 100644
--- a/tests/queries/0_stateless/01999_grant_with_replace.sql
+++ b/tests/queries/0_stateless/01999_grant_with_replace.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP USER IF EXISTS test_user_01999;
 
 CREATE USER test_user_01999;
diff --git a/tests/queries/0_stateless/02001_add_default_database_to_system_users.sql b/tests/queries/0_stateless/02001_add_default_database_to_system_users.sql
index b006f9acb22..9cf02930199 100644
--- a/tests/queries/0_stateless/02001_add_default_database_to_system_users.sql
+++ b/tests/queries/0_stateless/02001_add_default_database_to_system_users.sql
@@ -1,3 +1,6 @@
+-- Tags: no-parallel
+-- Tag no-parallel: create user
+
 create user if not exists u_02001 default database system;
 select default_database from system.users where name = 'u_02001';
 drop user if exists u_02001;
diff --git a/tests/queries/0_stateless/02001_shard_num_shard_count.sql b/tests/queries/0_stateless/02001_shard_num_shard_count.sql
index daf1084a614..0d4a92f4ede 100644
--- a/tests/queries/0_stateless/02001_shard_num_shard_count.sql
+++ b/tests/queries/0_stateless/02001_shard_num_shard_count.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 select shardNum() n, shardCount() c;
 select shardNum() n, shardCount() c from remote('127.0.0.{1,2,3}', system.one) order by n settings prefer_localhost_replica = 0;
 select shardNum() n, shardCount() c from remote('127.0.0.{1,2,3}', system.one) order by n settings prefer_localhost_replica = 1;
diff --git a/tests/queries/0_stateless/02002_global_subqueries_subquery_or_table_name.sql b/tests/queries/0_stateless/02002_global_subqueries_subquery_or_table_name.sql
index 1b24617569c..7d9c08c7cb6 100644
--- a/tests/queries/0_stateless/02002_global_subqueries_subquery_or_table_name.sql
+++ b/tests/queries/0_stateless/02002_global_subqueries_subquery_or_table_name.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 SELECT
     cityHash64(number GLOBAL IN (NULL, -2147483648, -9223372036854775808), nan, 1024, NULL, NULL, 1.000100016593933, NULL),
     (NULL, cityHash64(inf, -2147483648, NULL, NULL, 10.000100135803223), cityHash64(1.1754943508222875e-38, NULL, NULL, NULL), 2147483647)
diff --git a/tests/queries/0_stateless/02002_row_level_filter_bug.sh b/tests/queries/0_stateless/02002_row_level_filter_bug.sh
index 7e19374c123..d15a26f48f5 100755
--- a/tests/queries/0_stateless/02002_row_level_filter_bug.sh
+++ b/tests/queries/0_stateless/02002_row_level_filter_bug.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
+# Tag no-parallel: create user
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02003_compress_bz2.sh b/tests/queries/0_stateless/02003_compress_bz2.sh
index b65ce2f233b..afcea410297 100755
--- a/tests/queries/0_stateless/02003_compress_bz2.sh
+++ b/tests/queries/0_stateless/02003_compress_bz2.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: depends on bzip2
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02003_memory_limit_in_client.expect b/tests/queries/0_stateless/02003_memory_limit_in_client.expect
index 49b81240829..47ac4926537 100755
--- a/tests/queries/0_stateless/02003_memory_limit_in_client.expect
+++ b/tests/queries/0_stateless/02003_memory_limit_in_client.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-parallel, no-fasttest
 
 # This is a test for system.warnings. Testing in interactive mode is necessary,
 # as we want to see certain warnings from client
diff --git a/tests/queries/0_stateless/02004_max_hyperscan_regex_length.sql b/tests/queries/0_stateless/02004_max_hyperscan_regex_length.sql
index 6058ef2f430..9d62093a702 100644
--- a/tests/queries/0_stateless/02004_max_hyperscan_regex_length.sql
+++ b/tests/queries/0_stateless/02004_max_hyperscan_regex_length.sql
@@ -1,3 +1,6 @@
+-- Tags: no-debug, no-fasttest
+-- Tag no-fasttest: Hyperscan
+
 set max_hyperscan_regexp_length = 1;
 set max_hyperscan_regexp_total_length = 1;
 
diff --git a/tests/queries/0_stateless/02006_client_test_hint_error_name.sql b/tests/queries/0_stateless/02006_client_test_hint_error_name.sql
index 268406a8054..60d840fb4ec 100644
--- a/tests/queries/0_stateless/02006_client_test_hint_error_name.sql
+++ b/tests/queries/0_stateless/02006_client_test_hint_error_name.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 select throwIf(1); -- { serverError FUNCTION_THROW_IF_VALUE_IS_NON_ZERO }
diff --git a/tests/queries/0_stateless/02006_client_test_hint_no_such_error_name.sh b/tests/queries/0_stateless/02006_client_test_hint_no_such_error_name.sh
index 15ede23a510..b846136ae58 100755
--- a/tests/queries/0_stateless/02006_client_test_hint_no_such_error_name.sh
+++ b/tests/queries/0_stateless/02006_client_test_hint_no_such_error_name.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02008_aliased_column_distributed_bug.sql b/tests/queries/0_stateless/02008_aliased_column_distributed_bug.sql
index 92cc30c38dc..9796beefd6d 100644
--- a/tests/queries/0_stateless/02008_aliased_column_distributed_bug.sql
+++ b/tests/queries/0_stateless/02008_aliased_column_distributed_bug.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS click_storage;
 DROP TABLE IF EXISTS click_storage_dst;
 
diff --git a/tests/queries/0_stateless/02008_complex_key_range_hashed_dictionary.sql b/tests/queries/0_stateless/02008_complex_key_range_hashed_dictionary.sql
index ba6ed30b609..677879b1ebd 100644
--- a/tests/queries/0_stateless/02008_complex_key_range_hashed_dictionary.sql
+++ b/tests/queries/0_stateless/02008_complex_key_range_hashed_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS date_table;
 CREATE TABLE date_table
 (
diff --git a/tests/queries/0_stateless/02009_array_join_partition.sql b/tests/queries/0_stateless/02009_array_join_partition.sql
index a78efe96f66..1b99deec0f9 100644
--- a/tests/queries/0_stateless/02009_array_join_partition.sql
+++ b/tests/queries/0_stateless/02009_array_join_partition.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 CREATE TABLE table_2009_part (`i` Int64, `d` Date, `s` String) ENGINE = MergeTree PARTITION BY toYYYYMM(d) ORDER BY i;
 
 ALTER TABLE table_2009_part ATTACH PARTITION tuple(arrayJoin([0, 1])); -- {serverError 248}
diff --git a/tests/queries/0_stateless/02009_mysql_client_empty_result.sh b/tests/queries/0_stateless/02009_mysql_client_empty_result.sh
index cc1d0aece77..f9fef73e64b 100755
--- a/tests/queries/0_stateless/02009_mysql_client_empty_result.sh
+++ b/tests/queries/0_stateless/02009_mysql_client_empty_result.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02011_dictionary_empty_attribute_list.sql b/tests/queries/0_stateless/02011_dictionary_empty_attribute_list.sql
index 5c0668cb839..684cc365b73 100644
--- a/tests/queries/0_stateless/02011_dictionary_empty_attribute_list.sql
+++ b/tests/queries/0_stateless/02011_dictionary_empty_attribute_list.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS test_table;
 CREATE TABLE test_table (id UInt64) ENGINE=TinyLog;
 INSERT INTO test_table VALUES (0);
diff --git a/tests/queries/0_stateless/02012_changed_enum_type_non_replicated.sql b/tests/queries/0_stateless/02012_changed_enum_type_non_replicated.sql
index 9e25df0f41a..5f53984a8e4 100644
--- a/tests/queries/0_stateless/02012_changed_enum_type_non_replicated.sql
+++ b/tests/queries/0_stateless/02012_changed_enum_type_non_replicated.sql
@@ -1,3 +1,6 @@
+-- Tags: replica, no-replicated-database
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 create table enum_alter_issue (a Enum8('one' = 1, 'two' = 2)) engine = MergeTree() ORDER BY a;
 insert into enum_alter_issue values ('one'), ('two');
 alter table enum_alter_issue modify column a Enum8('one' = 1, 'two' = 2, 'three' = 3);
diff --git a/tests/queries/0_stateless/02012_settings_clause_for_s3.sql b/tests/queries/0_stateless/02012_settings_clause_for_s3.sql
index 4f750fb99c4..87d45c9d566 100644
--- a/tests/queries/0_stateless/02012_settings_clause_for_s3.sql
+++ b/tests/queries/0_stateless/02012_settings_clause_for_s3.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on AWS
+
 DROP TABLE IF EXISTS table_with_range;
 
 CREATE TABLE table_with_range(`name` String,`number` UInt32)　ENGINE = S3('http://localhost:11111/test/tsv_with_header.tsv', 'test', 'testtest', 'TSVWithNames')　SETTINGS input_format_with_names_use_header = 1;
diff --git a/tests/queries/0_stateless/02012_sha512_fixedstring.sql b/tests/queries/0_stateless/02012_sha512_fixedstring.sql
index 8ea0fbb2f4e..cd014a58e65 100644
--- a/tests/queries/0_stateless/02012_sha512_fixedstring.sql
+++ b/tests/queries/0_stateless/02012_sha512_fixedstring.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 SELECT hex(SHA512(''));
 SELECT hex(SHA512('abc'));
 
diff --git a/tests/queries/0_stateless/02012_zookeeper_changed_enum_type.sql b/tests/queries/0_stateless/02012_zookeeper_changed_enum_type.sql
index 0c95c7ff403..790db4c5c3d 100644
--- a/tests/queries/0_stateless/02012_zookeeper_changed_enum_type.sql
+++ b/tests/queries/0_stateless/02012_zookeeper_changed_enum_type.sql
@@ -1,3 +1,6 @@
+-- Tags: zookeeper, no-replicated-database
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 create table enum_alter_issue (a Enum8('one' = 1, 'two' = 2), b Int)
 engine = ReplicatedMergeTree('/clickhouse/tables/{database}/test_02012/enum_alter_issue', 'r1')
 ORDER BY a;
diff --git a/tests/queries/0_stateless/02012_zookeeper_changed_enum_type_incompatible.sql b/tests/queries/0_stateless/02012_zookeeper_changed_enum_type_incompatible.sql
index e86023c96fa..697758be0c8 100644
--- a/tests/queries/0_stateless/02012_zookeeper_changed_enum_type_incompatible.sql
+++ b/tests/queries/0_stateless/02012_zookeeper_changed_enum_type_incompatible.sql
@@ -1,3 +1,6 @@
+-- Tags: zookeeper, no-replicated-database
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 drop table if exists enum_alter_issue;
 create table enum_alter_issue (a Enum16('one' = 1, 'two' = 2), b Int)
 engine = ReplicatedMergeTree('/clickhouse/tables/{database}/test_02012/enum_alter_issue', 'r2')
diff --git a/tests/queries/0_stateless/02013_zlib_read_after_eof.sh b/tests/queries/0_stateless/02013_zlib_read_after_eof.sh
index d74dca6cc61..a4a20fe5970 100755
--- a/tests/queries/0_stateless/02013_zlib_read_after_eof.sh
+++ b/tests/queries/0_stateless/02013_zlib_read_after_eof.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: depends on Go
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02015_shard_crash_clang_12_build.sh b/tests/queries/0_stateless/02015_shard_crash_clang_12_build.sh
index f6ede6592ff..256297e253e 100755
--- a/tests/queries/0_stateless/02015_shard_crash_clang_12_build.sh
+++ b/tests/queries/0_stateless/02015_shard_crash_clang_12_build.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: shard
 
 # This test reproduces crash in case of insufficient coroutines stack size
 
diff --git a/tests/queries/0_stateless/02017_create_distributed_table_coredump.sql b/tests/queries/0_stateless/02017_create_distributed_table_coredump.sql
index 27c98c3e237..a7a77672aa9 100644
--- a/tests/queries/0_stateless/02017_create_distributed_table_coredump.sql
+++ b/tests/queries/0_stateless/02017_create_distributed_table_coredump.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 drop table if exists t;
 drop table if exists td1;
 drop table if exists td2;
diff --git a/tests/queries/1_stateful/00009_uniq_distributed.sql b/tests/queries/1_stateful/00009_uniq_distributed.sql
index 71d90efbccc..f78604fd401 100644
--- a/tests/queries/1_stateful/00009_uniq_distributed.sql
+++ b/tests/queries/1_stateful/00009_uniq_distributed.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT uniq(UserID), uniqIf(UserID, CounterID = 800784), uniqIf(FUniqID, RegionID = 213) FROM remote('127.0.0.{1,2}', test, hits)
diff --git a/tests/queries/1_stateful/00012_sorting_distributed.sql b/tests/queries/1_stateful/00012_sorting_distributed.sql
index b0cdb8bd8a2..c71f643045d 100644
--- a/tests/queries/1_stateful/00012_sorting_distributed.sql
+++ b/tests/queries/1_stateful/00012_sorting_distributed.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT EventTime::DateTime('Europe/Moscow') FROM remote('127.0.0.{1,2}', test, hits) ORDER BY EventTime DESC LIMIT 10
diff --git a/tests/queries/1_stateful/00016_any_if_distributed_cond_always_false.sql b/tests/queries/1_stateful/00016_any_if_distributed_cond_always_false.sql
index 8beedd09e4e..2afe28639f2 100644
--- a/tests/queries/1_stateful/00016_any_if_distributed_cond_always_false.sql
+++ b/tests/queries/1_stateful/00016_any_if_distributed_cond_always_false.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT anyIf(SearchPhrase, CounterID = -1) FROM remote('127.0.0.{1,2}:9000', test, hits)
diff --git a/tests/queries/1_stateful/00020_distinct_order_by_distributed.sql b/tests/queries/1_stateful/00020_distinct_order_by_distributed.sql
index c3c726e4ca7..21b577d3b56 100644
--- a/tests/queries/1_stateful/00020_distinct_order_by_distributed.sql
+++ b/tests/queries/1_stateful/00020_distinct_order_by_distributed.sql
@@ -1,2 +1,4 @@
+-- Tags: distributed
+
 SET max_rows_to_sort = 10000;
 SELECT count() FROM (SELECT DISTINCT PredLastVisit AS x FROM remote('127.0.0.{1,2}', test, visits) ORDER BY VisitID);
diff --git a/tests/queries/1_stateful/00046_uniq_upto_distributed.sql b/tests/queries/1_stateful/00046_uniq_upto_distributed.sql
index 1491972b37d..3aa1d5b9909 100644
--- a/tests/queries/1_stateful/00046_uniq_upto_distributed.sql
+++ b/tests/queries/1_stateful/00046_uniq_upto_distributed.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT RegionID, uniqExact(UserID) AS u1, uniqUpTo(10)(UserID) AS u2 FROM remote('127.0.0.{1,2}', test, visits) GROUP BY RegionID HAVING u1 <= 11 AND u1 != u2
\ No newline at end of file
diff --git a/tests/queries/1_stateful/00053_replicate_segfault.sql b/tests/queries/1_stateful/00053_replicate_segfault.sql
index b727ae3aad8..3e0be96861b 100644
--- a/tests/queries/1_stateful/00053_replicate_segfault.sql
+++ b/tests/queries/1_stateful/00053_replicate_segfault.sql
@@ -1 +1,3 @@
+-- Tags: replica
+
 SELECT count() > 0 FROM (SELECT ParsedParams.Key1 AS p FROM test.visits WHERE arrayAll(y -> arrayExists(x -> y != x, p), p))
diff --git a/tests/queries/1_stateful/00054_merge_tree_partitions.sql b/tests/queries/1_stateful/00054_merge_tree_partitions.sql
index 73020952977..91e67ac857a 100644
--- a/tests/queries/1_stateful/00054_merge_tree_partitions.sql
+++ b/tests/queries/1_stateful/00054_merge_tree_partitions.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS test.partitions;
 CREATE TABLE test.partitions (EventDate Date, CounterID UInt32) ENGINE = MergeTree(EventDate, CounterID, 8192);
 INSERT INTO test.partitions SELECT EventDate + UserID % 365 AS EventDate, CounterID FROM test.hits WHERE CounterID = 1704509;
diff --git a/tests/queries/1_stateful/00066_sorting_distributed_many_replicas.sql b/tests/queries/1_stateful/00066_sorting_distributed_many_replicas.sql
index 4bc563712c0..3e34d9d1348 100644
--- a/tests/queries/1_stateful/00066_sorting_distributed_many_replicas.sql
+++ b/tests/queries/1_stateful/00066_sorting_distributed_many_replicas.sql
@@ -1,2 +1,4 @@
+-- Tags: replica, distributed
+
 SET max_parallel_replicas = 2;
 SELECT EventTime::DateTime('Europe/Moscow') FROM remote('127.0.0.{1|2}', test, hits) ORDER BY EventTime DESC LIMIT 10
diff --git a/tests/queries/1_stateful/00088_global_in_one_shard_and_rows_before_limit.sql b/tests/queries/1_stateful/00088_global_in_one_shard_and_rows_before_limit.sql
index 60dbec2e9bc..52f9c46997f 100644
--- a/tests/queries/1_stateful/00088_global_in_one_shard_and_rows_before_limit.sql
+++ b/tests/queries/1_stateful/00088_global_in_one_shard_and_rows_before_limit.sql
@@ -1,2 +1,4 @@
+-- Tags: shard
+
 SET output_format_write_statistics = 0;
 SELECT EventDate, count() FROM remote('127.0.0.1', test.hits) WHERE UserID GLOBAL IN (SELECT UserID FROM test.hits) GROUP BY EventDate ORDER BY EventDate LIMIT 5 FORMAT JSONCompact;
diff --git a/tests/queries/1_stateful/00090_thread_pool_deadlock.sh b/tests/queries/1_stateful/00090_thread_pool_deadlock.sh
index e94243bfea2..75665166741 100755
--- a/tests/queries/1_stateful/00090_thread_pool_deadlock.sh
+++ b/tests/queries/1_stateful/00090_thread_pool_deadlock.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/1_stateful/00095_hyperscan_profiler.sql b/tests/queries/1_stateful/00095_hyperscan_profiler.sql
index df07bc92408..c704907178c 100644
--- a/tests/queries/1_stateful/00095_hyperscan_profiler.sql
+++ b/tests/queries/1_stateful/00095_hyperscan_profiler.sql
@@ -1,3 +1,5 @@
+-- Tags: no-debug
+
 -- Check that server does not get segfault due to bad stack unwinding from Hyperscan
 
 SET query_profiler_cpu_time_period_ns = 1000000;
diff --git a/tests/queries/1_stateful/00140_rename.sql b/tests/queries/1_stateful/00140_rename.sql
index b0ecd2aeb92..9702d00a4d5 100644
--- a/tests/queries/1_stateful/00140_rename.sql
+++ b/tests/queries/1_stateful/00140_rename.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: Does not support renaming of multiple tables in single query
+
 RENAME TABLE test.hits TO test.visits_tmp, test.visits TO test.hits, test.visits_tmp TO test.visits;
 
 SELECT sum(Sign) FROM test.hits WHERE CounterID = 912887;
diff --git a/tests/queries/1_stateful/00147_global_in_aggregate_function.sql b/tests/queries/1_stateful/00147_global_in_aggregate_function.sql
index 8276f4c1b16..075c01530c6 100644
--- a/tests/queries/1_stateful/00147_global_in_aggregate_function.sql
+++ b/tests/queries/1_stateful/00147_global_in_aggregate_function.sql
@@ -1,2 +1,4 @@
+-- Tags: global
+
 SELECT sum(UserID GLOBAL IN (SELECT UserID FROM remote('127.0.0.{1,2}', test.hits))) FROM remote('127.0.0.{1,2}', test.hits);
 SELECT sum(UserID GLOBAL IN (SELECT UserID FROM test.hits)) FROM remote('127.0.0.{1,2}', test.hits);
diff --git a/tests/queries/1_stateful/00149_quantiles_timing_distributed.sql b/tests/queries/1_stateful/00149_quantiles_timing_distributed.sql
index dc63cb5867f..6f910646fb7 100644
--- a/tests/queries/1_stateful/00149_quantiles_timing_distributed.sql
+++ b/tests/queries/1_stateful/00149_quantiles_timing_distributed.sql
@@ -1,2 +1,4 @@
+-- Tags: distributed
+
 SELECT sum(cityHash64(*)) FROM (SELECT CounterID, quantileTiming(0.5)(SendTiming), count() FROM remote('127.0.0.{1,2,3,4,5,6,7,8,9,10}', test.hits) WHERE SendTiming != -1 GROUP BY CounterID);
 SELECT sum(cityHash64(*)) FROM (SELECT CounterID, quantileTiming(0.5)(SendTiming), count() FROM remote('127.0.0.{1,2,3,4,5,6,7,8,9,10}', test.hits) WHERE SendTiming != -1 GROUP BY CounterID) SETTINGS optimize_aggregation_in_order = 1;
diff --git a/tests/queries/1_stateful/00151_replace_partition_with_different_granularity.sql b/tests/queries/1_stateful/00151_replace_partition_with_different_granularity.sql
index fa18b53bdf9..c1a2001e2a5 100644
--- a/tests/queries/1_stateful/00151_replace_partition_with_different_granularity.sql
+++ b/tests/queries/1_stateful/00151_replace_partition_with_different_granularity.sql
@@ -1,3 +1,5 @@
+-- Tags: no-tsan
+
 DROP TABLE IF EXISTS mixed_granularity_table;
 
 CREATE TABLE mixed_granularity_table (`WatchID` UInt64, `JavaEnable` UInt8, `Title` String, `GoodEvent` Int16, `EventTime` DateTime, `EventDate` Date, `CounterID` UInt32, `ClientIP` UInt32, `ClientIP6` FixedString(16), `RegionID` UInt32, `UserID` UInt64, `CounterClass` Int8, `OS` UInt8, `UserAgent` UInt8, `URL` String, `Referer` String, `URLDomain` String, `RefererDomain` String, `Refresh` UInt8, `IsRobot` UInt8, `RefererCategories` Array(UInt16), `URLCategories` Array(UInt16), `URLRegions` Array(UInt32), `RefererRegions` Array(UInt32), `ResolutionWidth` UInt16, `ResolutionHeight` UInt16, `ResolutionDepth` UInt8, `FlashMajor` UInt8, `FlashMinor` UInt8, `FlashMinor2` String, `NetMajor` UInt8, `NetMinor` UInt8, `UserAgentMajor` UInt16, `UserAgentMinor` FixedString(2), `CookieEnable` UInt8, `JavascriptEnable` UInt8, `IsMobile` UInt8, `MobilePhone` UInt8, `MobilePhoneModel` String, `Params` String, `IPNetworkID` UInt32, `TraficSourceID` Int8, `SearchEngineID` UInt16, `SearchPhrase` String, `AdvEngineID` UInt8, `IsArtifical` UInt8, `WindowClientWidth` UInt16, `WindowClientHeight` UInt16, `ClientTimeZone` Int16, `ClientEventTime` DateTime, `SilverlightVersion1` UInt8, `SilverlightVersion2` UInt8, `SilverlightVersion3` UInt32, `SilverlightVersion4` UInt16, `PageCharset` String, `CodeVersion` UInt32, `IsLink` UInt8, `IsDownload` UInt8, `IsNotBounce` UInt8, `FUniqID` UInt64, `HID` UInt32, `IsOldCounter` UInt8, `IsEvent` UInt8, `IsParameter` UInt8, `DontCountHits` UInt8, `WithHash` UInt8, `HitColor` FixedString(1), `UTCEventTime` DateTime, `Age` UInt8, `Sex` UInt8, `Income` UInt8, `Interests` UInt16, `Robotness` UInt8, `GeneralInterests` Array(UInt16), `RemoteIP` UInt32, `RemoteIP6` FixedString(16), `WindowName` Int32, `OpenerName` Int32, `HistoryLength` Int16, `BrowserLanguage` FixedString(2), `BrowserCountry` FixedString(2), `SocialNetwork` String, `SocialAction` String, `HTTPError` UInt16, `SendTiming` Int32, `DNSTiming` Int32, `ConnectTiming` Int32, `ResponseStartTiming` Int32, `ResponseEndTiming` Int32, `FetchTiming` Int32, `RedirectTiming` Int32, `DOMInteractiveTiming` Int32, `DOMContentLoadedTiming` Int32, `DOMCompleteTiming` Int32, `LoadEventStartTiming` Int32, `LoadEventEndTiming` Int32, `NSToDOMContentLoadedTiming` Int32, `FirstPaintTiming` Int32, `RedirectCount` Int8, `SocialSourceNetworkID` UInt8, `SocialSourcePage` String, `ParamPrice` Int64, `ParamOrderID` String, `ParamCurrency` FixedString(3), `ParamCurrencyID` UInt16, `GoalsReached` Array(UInt32), `OpenstatServiceName` String, `OpenstatCampaignID` String, `OpenstatAdID` String, `OpenstatSourceID` String, `UTMSource` String, `UTMMedium` String, `UTMCampaign` String, `UTMContent` String, `UTMTerm` String, `FromTag` String, `HasGCLID` UInt8, `RefererHash` UInt64, `URLHash` UInt64, `CLID` UInt32, `YCLID` UInt64, `ShareService` String, `ShareURL` String, `ShareTitle` String, `ParsedParams.Key1` Array(String), `ParsedParams.Key2` Array(String), `ParsedParams.Key3` Array(String), `ParsedParams.Key4` Array(String), `ParsedParams.Key5` Array(String), `ParsedParams.ValueDouble` Array(Float64), `IslandID` FixedString(16), `RequestNum` UInt32, `RequestTry` UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity=8192, enable_mixed_granularity_parts=1; -- same with hits, but enabled mixed granularity
diff --git a/tests/queries/1_stateful/00152_insert_different_granularity.sql b/tests/queries/1_stateful/00152_insert_different_granularity.sql
index 7e04aedf2dd..5c802642a5c 100644
--- a/tests/queries/1_stateful/00152_insert_different_granularity.sql
+++ b/tests/queries/1_stateful/00152_insert_different_granularity.sql
@@ -1,3 +1,6 @@
+-- Tags: no-tsan, no-replicated-database
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS fixed_granularity_table;
 
 CREATE TABLE fixed_granularity_table (`WatchID` UInt64, `JavaEnable` UInt8, `Title` String, `GoodEvent` Int16, `EventTime` DateTime, `EventDate` Date, `CounterID` UInt32, `ClientIP` UInt32, `ClientIP6` FixedString(16), `RegionID` UInt32, `UserID` UInt64, `CounterClass` Int8, `OS` UInt8, `UserAgent` UInt8, `URL` String, `Referer` String, `URLDomain` String, `RefererDomain` String, `Refresh` UInt8, `IsRobot` UInt8, `RefererCategories` Array(UInt16), `URLCategories` Array(UInt16), `URLRegions` Array(UInt32), `RefererRegions` Array(UInt32), `ResolutionWidth` UInt16, `ResolutionHeight` UInt16, `ResolutionDepth` UInt8, `FlashMajor` UInt8, `FlashMinor` UInt8, `FlashMinor2` String, `NetMajor` UInt8, `NetMinor` UInt8, `UserAgentMajor` UInt16, `UserAgentMinor` FixedString(2), `CookieEnable` UInt8, `JavascriptEnable` UInt8, `IsMobile` UInt8, `MobilePhone` UInt8, `MobilePhoneModel` String, `Params` String, `IPNetworkID` UInt32, `TraficSourceID` Int8, `SearchEngineID` UInt16, `SearchPhrase` String, `AdvEngineID` UInt8, `IsArtifical` UInt8, `WindowClientWidth` UInt16, `WindowClientHeight` UInt16, `ClientTimeZone` Int16, `ClientEventTime` DateTime, `SilverlightVersion1` UInt8, `SilverlightVersion2` UInt8, `SilverlightVersion3` UInt32, `SilverlightVersion4` UInt16, `PageCharset` String, `CodeVersion` UInt32, `IsLink` UInt8, `IsDownload` UInt8, `IsNotBounce` UInt8, `FUniqID` UInt64, `HID` UInt32, `IsOldCounter` UInt8, `IsEvent` UInt8, `IsParameter` UInt8, `DontCountHits` UInt8, `WithHash` UInt8, `HitColor` FixedString(1), `UTCEventTime` DateTime, `Age` UInt8, `Sex` UInt8, `Income` UInt8, `Interests` UInt16, `Robotness` UInt8, `GeneralInterests` Array(UInt16), `RemoteIP` UInt32, `RemoteIP6` FixedString(16), `WindowName` Int32, `OpenerName` Int32, `HistoryLength` Int16, `BrowserLanguage` FixedString(2), `BrowserCountry` FixedString(2), `SocialNetwork` String, `SocialAction` String, `HTTPError` UInt16, `SendTiming` Int32, `DNSTiming` Int32, `ConnectTiming` Int32, `ResponseStartTiming` Int32, `ResponseEndTiming` Int32, `FetchTiming` Int32, `RedirectTiming` Int32, `DOMInteractiveTiming` Int32, `DOMContentLoadedTiming` Int32, `DOMCompleteTiming` Int32, `LoadEventStartTiming` Int32, `LoadEventEndTiming` Int32, `NSToDOMContentLoadedTiming` Int32, `FirstPaintTiming` Int32, `RedirectCount` Int8, `SocialSourceNetworkID` UInt8, `SocialSourcePage` String, `ParamPrice` Int64, `ParamOrderID` String, `ParamCurrency` FixedString(3), `ParamCurrencyID` UInt16, `GoalsReached` Array(UInt32), `OpenstatServiceName` String, `OpenstatCampaignID` String, `OpenstatAdID` String, `OpenstatSourceID` String, `UTMSource` String, `UTMMedium` String, `UTMCampaign` String, `UTMContent` String, `UTMTerm` String, `FromTag` String, `HasGCLID` UInt8, `RefererHash` UInt64, `URLHash` UInt64, `CLID` UInt32, `YCLID` UInt64, `ShareService` String, `ShareURL` String, `ShareTitle` String, `ParsedParams.Key1` Array(String), `ParsedParams.Key2` Array(String), `ParsedParams.Key3` Array(String), `ParsedParams.Key4` Array(String), `ParsedParams.Key5` Array(String), `ParsedParams.ValueDouble` Array(Float64), `IslandID` FixedString(16), `RequestNum` UInt32, `RequestTry` UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity=8192, index_granularity_bytes=0, min_bytes_for_wide_part = 0; -- looks like default table before update
diff --git a/tests/queries/1_stateful/00153_aggregate_arena_race.sql b/tests/queries/1_stateful/00153_aggregate_arena_race.sql
index 239b5ad0aa5..cf3971df6a9 100644
--- a/tests/queries/1_stateful/00153_aggregate_arena_race.sql
+++ b/tests/queries/1_stateful/00153_aggregate_arena_race.sql
@@ -1,2 +1,4 @@
+-- Tags: race
+
 create temporary table dest00153 (`s` AggregateFunction(groupUniqArray, String)) engine Memory;
 insert into dest00153 select groupUniqArrayState(RefererDomain) from test.hits group by URLDomain;
diff --git a/tests/queries/1_stateful/00154_avro.sql b/tests/queries/1_stateful/00154_avro.sql
index b3c80f657c9..a2a35dfec12 100644
--- a/tests/queries/1_stateful/00154_avro.sql
+++ b/tests/queries/1_stateful/00154_avro.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 DROP TABLE IF EXISTS test.avro;
 
 SET max_threads = 1, max_block_size = 8192, min_insert_block_size_rows = 8192, min_insert_block_size_bytes = 1048576; -- lower memory usage
diff --git a/tests/queries/1_stateful/00157_cache_dictionary.sql b/tests/queries/1_stateful/00157_cache_dictionary.sql
index 368da1cc36a..a8f9d12ab3a 100644
--- a/tests/queries/1_stateful/00157_cache_dictionary.sql
+++ b/tests/queries/1_stateful/00157_cache_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-tsan, no-parallel
+
 CREATE DATABASE IF NOT EXISTS db_dict;
 DROP DICTIONARY IF EXISTS db_dict.cache_hits;
 
diff --git a/tests/queries/1_stateful/00158_cache_dictionary_has.sql b/tests/queries/1_stateful/00158_cache_dictionary_has.sql
index 8461728c58e..32c109417de 100644
--- a/tests/queries/1_stateful/00158_cache_dictionary_has.sql
+++ b/tests/queries/1_stateful/00158_cache_dictionary_has.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE IF NOT EXISTS db_dict;
 DROP DICTIONARY IF EXISTS db_dict.cache_hits;
 
diff --git a/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends.sh b/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends.sh
index 9f61b454d56..5d54328e45d 100755
--- a/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends.sh
+++ b/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/1_stateful/00166_explain_estimate.sql b/tests/queries/1_stateful/00166_explain_estimate.sql
index 06725ff7f9f..c4071271736 100644
--- a/tests/queries/1_stateful/00166_explain_estimate.sql
+++ b/tests/queries/1_stateful/00166_explain_estimate.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: Requires investigation
+
 EXPLAIN ESTIMATE SELECT count() FROM test.hits WHERE CounterID = 29103473;
 EXPLAIN ESTIMATE SELECT count() FROM test.hits WHERE CounterID != 29103473;
 EXPLAIN ESTIMATE SELECT count() FROM test.hits WHERE CounterID > 29103473;
diff --git a/tests/queries/bugs/01482_move_to_prewhere_and_cast.sql b/tests/queries/bugs/01482_move_to_prewhere_and_cast.sql
index b79a3cf05b4..b81cf585b13 100644
--- a/tests/queries/bugs/01482_move_to_prewhere_and_cast.sql
+++ b/tests/queries/bugs/01482_move_to_prewhere_and_cast.sql
@@ -1,3 +1,6 @@
+-- Tags: no-polymorphic-parts
+-- Tag no-polymorphic-parts: bug, shoud be fixed
+
 DROP TABLE IF EXISTS APPLICATION;
 DROP TABLE IF EXISTS DATABASE_IO;
 

From daa59793476d053adadd0d15ef69ef8bd1cfd595 Mon Sep 17 00:00:00 2001
From: Vitaly Baranov <vitbar@yandex-team.ru>
Date: Sun, 12 Sep 2021 01:20:56 +0300
Subject: [PATCH 222/273] Remove unnecessary files.

---
 docker/test/fasttest/run.sh                   | 128 -----
 tests/queries/skip_list.json                  | 515 ------------------
 .../skip_list_to_first_line_comment.py        | 429 ---------------
 3 files changed, 1072 deletions(-)
 delete mode 100644 tests/queries/skip_list.json
 delete mode 100755 tests/queries/skip_list_to_first_line_comment.py

diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index 282bd323847..6b92aca3866 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -261,134 +261,6 @@ function run_tests
 
     start_server
 
-    TESTS_TO_SKIP=(
-        00105_shard_collations
-        00109_shard_totals_after_having
-        00110_external_sort
-        00302_http_compression
-        00417_kill_query
-        00436_convert_charset
-        00490_special_line_separators_and_characters_outside_of_bmp
-        00652_replicated_mutations_zookeeper
-        00682_empty_parts_merge
-        00701_rollup
-        00834_cancel_http_readonly_queries_on_client_close
-        00911_tautological_compare
-
-        00926_multimatch # Hyperscan
-        00929_multi_match_edit_distance # Hyperscan
-        01681_hyperscan_debug_assertion # Hyperscan
-        02004_max_hyperscan_regex_length # Hyperscan
-
-        01176_mysql_client_interactive          # requires mysql client
-        01031_mutations_interpreter_and_context
-        01053_ssd_dictionary # this test mistakenly requires acces to /var/lib/clickhouse -- can't run this locally, disabled
-        01083_expressions_in_engine_arguments
-        01092_memory_profiler
-        01098_msgpack_format
-        01098_temporary_and_external_tables
-        01103_check_cpu_instructions_at_startup # avoid dependency on qemu -- invonvenient when running locally
-        01193_metadata_loading
-        01238_http_memory_tracking              # max_memory_usage_for_user can interfere another queries running concurrently
-        01251_dict_is_in_infinite_loop
-        01259_dictionary_custom_settings_ddl
-        01268_dictionary_direct_layout
-        01280_ssd_complex_key_dictionary
-        01281_group_by_limit_memory_tracking    # max_memory_usage_for_user can interfere another queries running concurrently
-        01318_encrypt                           # Depends on OpenSSL
-        01318_decrypt                           # Depends on OpenSSL
-        01663_aes_msan                          # Depends on OpenSSL
-        01667_aes_args_check                    # Depends on OpenSSL
-        01683_codec_encrypted                   # Depends on OpenSSL
-        01776_decrypt_aead_size_check           # Depends on OpenSSL
-        01811_filter_by_null                    # Depends on OpenSSL
-        02012_sha512_fixedstring                # Depends on OpenSSL
-        01281_unsucceeded_insert_select_queries_counter
-        01292_create_user
-        01294_lazy_database_concurrent
-        01305_replica_create_drop_zookeeper
-        01354_order_by_tuple_collate_const
-        01355_ilike
-        01411_bayesian_ab_testing
-        01798_uniq_theta_sketch
-        01799_long_uniq_theta_sketch
-        01890_stem                               # depends on libstemmer_c
-        02003_compress_bz2                       # depends on bzip2
-        01059_storage_file_compression           # depends on brotli and bzip2
-        collate
-        collation
-        _orc_
-        arrow
-        avro
-        base64
-        brotli
-        capnproto
-        client
-        ddl_dictionaries
-        h3
-        hashing
-        hdfs
-        java_hash
-        json
-        limit_memory
-        live_view
-        memory_leak
-        memory_limit
-        mysql
-        odbc
-        parallel_alter
-        parquet
-        protobuf
-        secure
-        sha256
-        xz
-
-        00646_url_engine     # Not sure why fail even in sequential mode. Disabled for now to make some progress.
-        00974_query_profiler # Not sure why fail even in sequential mode. Disabled for now to make some progress.
-
-        01504_rocksdb        # In fasttest, ENABLE_LIBRARIES=0, so rocksdb engine is not enabled by default
-        01686_rocksdb        # In fasttest, ENABLE_LIBRARIES=0, so rocksdb engine is not enabled by default
-
-        01460_DistributedFilesToInsert # Look at DistributedFilesToInsert, so cannot run in parallel.
-
-        01541_max_memory_usage_for_user_long
-
-        01322_ttest_scipy        # Require python libraries like scipy, pandas and numpy
-        01561_mann_whitney_scipy # Require python libraries like scipy, pandas and numpy
-
-        01545_system_errors            # Checks system.errors
-        01563_distributed_query_finish # Checks system.errors
-
-        01601_proxy_protocol          # nc - command not found
-        01622_defaults_for_url_engine # nc - command not found
-
-        01666_blns # JSON functions
-
-        01802_test_postgresql_protocol_with_row_policy # Requires postgresql-client
-
-        01801_s3_cluster             # Depends on AWS
-        02012_settings_clause_for_s3 # Depends on AWS
-
-        01889_postgresql_protocol_null_fields    # needs psql
-
-        01923_network_receive_time_metric_insert # needs pv
-
-        01889_sqlite_read_write
-
-        01849_geoToS2            # needs s2
-        01851_s2_to_geo          # needs s2
-        01852_s2_get_neighbours  # needs s2
-        01853_s2_cells_intersect # needs s2
-        01854_s2_cap_contains    # needs s2
-        01854_s2_cap_union       # needs s2
-
-        01944_insert_partition_by # needs s3
-
-        02013_zlib_read_after_eof # depends on Go
-
-        01747_system_session_log_long # Accesses CH via mysql table function (which is unavailable)
-    )
-
     time clickhouse-test --hung-check -j 8 --order=random \
             --fast-tests-only --no-long --testname --shard --zookeeper \
             -- "$FASTTEST_FOCUS" 2>&1 \
diff --git a/tests/queries/skip_list.json b/tests/queries/skip_list.json
deleted file mode 100644
index 19cb7b24e37..00000000000
--- a/tests/queries/skip_list.json
+++ /dev/null
@@ -1,515 +0,0 @@
-/** List of tests which should be skipped depending on clickhouse build options.
-  * This file in json format, but javascript-style comments are allowed.
-  */
-{
-    "thread-sanitizer": [
-        "00877",
-        "query_profiler",
-        "memory_profiler",
-        "01103_check_cpu_instructions_at_startup",
-        "00152_insert_different_granularity",
-        "00151_replace_partition_with_different_granularity",
-        "00157_cache_dictionary",
-        "01193_metadata_loading",
-        "01473_event_time_microseconds",
-        "01526_max_untracked_memory", /// requires TraceCollector, does not available under sanitizers
-        "01594_too_low_memory_limits", /// requires jemalloc to track small allocations
-        "01474_executable_dictionary", /// informational stderr from sanitizer at start
-        "functions_bad_arguments", /// Too long for TSan
-        "01603_read_with_backoff_bug", /// Too long for TSan
-        "01646_system_restart_replicas_smoke", /// RESTART REPLICAS can acquire too much locks, while only 64 is possible from one thread under TSan
-        "01017_uniqCombined_memory_usage" /// Fine thresholds on memory usage
-    ],
-    "address-sanitizer": [
-        "00877",
-        "query_profiler",
-        "memory_profiler",
-        "odbc_roundtrip",
-        "01103_check_cpu_instructions_at_startup",
-        "01473_event_time_microseconds",
-        "01526_max_untracked_memory", /// requires TraceCollector, does not available under sanitizers
-        "01594_too_low_memory_limits", /// requires jemalloc to track small allocations
-        "01193_metadata_loading",
-        "01017_uniqCombined_memory_usage" /// Fine thresholds on memory usage
-    ],
-    "ub-sanitizer": [
-        "capnproto",
-        "query_profiler",
-        "memory_profiler",
-        "01103_check_cpu_instructions_at_startup",
-        "00900_orc_load",
-        "01473_event_time_microseconds",
-        "01526_max_untracked_memory", /// requires TraceCollector, does not available under sanitizers
-        "01594_too_low_memory_limits", /// requires jemalloc to track small allocations
-        "01193_metadata_loading",
-        "01955_clickhouse_benchmark_connection_hang" /// Limits RLIMIT_NOFILE, see comment in the test
-    ],
-    "memory-sanitizer": [
-        "capnproto",
-        "query_profiler",
-        "memory_profiler",
-        "01175_distributed_ddl_output_mode_long",  /// issue 21600
-        "01103_check_cpu_instructions_at_startup",
-        "01086_odbc_roundtrip", /// can't pass because odbc libraries are not instrumented
-        "00877_memory_limit_for_new_delete", /// memory limits don't work correctly under msan because it replaces malloc/free
-        "01473_event_time_microseconds",
-        "01526_max_untracked_memory", /// requires TraceCollector, does not available under sanitizers
-        "01594_too_low_memory_limits", /// requires jemalloc to track small allocations
-        "01193_metadata_loading",
-        "01017_uniqCombined_memory_usage" /// Fine thresholds on memory usage
-    ],
-    "debug-build": [
-        "query_profiler",
-        "memory_profiler",
-        "00899_long_attach",
-        "00980_alter_settings_race",
-        "00834_kill_mutation_replicated_zookeeper",
-        "00834_kill_mutation",
-        "01200_mutations_memory_consumption",
-        "01103_check_cpu_instructions_at_startup",
-        "01037_polygon_dicts_",
-        "hyperscan",
-        "01193_metadata_loading",
-        "01473_event_time_microseconds",
-        "01396_inactive_replica_cleanup_nodes"
-    ],
-    "unbundled-build": [
-        "00429",
-        "00877",
-        "pocopatch",
-        "parquet",
-        "xxhash",
-        "_h3",
-        "query_profiler",
-        "memory_profiler",
-        "orc_load",
-        "01033_storage_odbc_parsing_exception_check",
-        "avro",
-        "01072_optimize_skip_unused_shards_const_expr_eval",
-        "00505_secure",
-        "00505_shard_secure",
-        "odbc_roundtrip",
-        "01103_check_cpu_instructions_at_startup",
-        "01114_mysql_database_engine_segfault",
-        "00834_cancel_http_readonly_queries_on_client_close",
-        "_arrow",
-        "01099_parallel_distributed_insert_select",
-        "01300_client_save_history_when_terminated",
-        "orc_output",
-        "01370_client_autocomplete_word_break_characters",
-        "01676_clickhouse_client_autocomplete",
-        "01193_metadata_loading",
-        "01455_time_zones",
-        "01755_client_highlight_multi_line_comment_regression"
-    ],
-    "release-build": [
-    ],
-    "database-ordinary": [
-        "00604_show_create_database",
-        "00609_mv_index_in_in",
-        "00510_materizlized_view_and_deduplication_zookeeper",
-        "00738_lock_for_inner_table",
-        "01153_attach_mv_uuid",
-        "01157_replace_table",
-        "01185_create_or_replace_table",
-        "rocksdb", /// Sometimes cannot lock file most likely due to concurrent or adjacent tests, but we don't care how it works in Ordinary database
-        "01914_exchange_dictionaries" /// Requires Atomic database
-    ],
-    "database-replicated": [
-        "memory_tracking",
-        "memory_usage",
-        "live_view",
-        "01148_zookeeper_path_macros_unfolding",
-        "01269_create_with_null",
-        "01451_replicated_detach_drop_and_quorum",
-        "01188_attach_table_from_path",
-        
-        "01181_db_atomic_drop_on_cluster",   /// ON CLUSTER is not allowed
-        "01175_distributed_ddl_output_mode", /// ON CLUSTER is not allowed
-        "01415_sticking_mutations",
-        "01721_engine_file_truncate_on_insert", /// user_files
-        
-        "quorum",                                                /// Fails due to additional replicas or shards
-        "01650_drop_part_and_deduplication_zookeeper",           /// Fails due to additional replicas or shards
-        "01532_execute_merges_on_single_replica",                /// Fails due to additional replicas or shards
-        "00652_replicated_mutations_default_database_zookeeper", /// Fails due to additional replicas or shards
-        "00620_optimize_on_nonleader_replica_zookeeper",         /// Fails due to additional replicas or shards
-        "01158_zookeeper_log",                                   /// Fails due to additional replicas or shards
-        
-        "01018_ddl_dictionaries_bad_queries", /// grep -c
-        "00908_bloom_filter_index",           /// grep -c
-        
-        "01650_fetch_patition_with_macro_in_zk_path",     /// Unsupported type of ALTER query
-        "01451_detach_drop_part",                         /// Unsupported type of ALTER query
-        "01451_replicated_detach_drop_part",              /// Unsupported type of ALTER query
-        "01417_freeze_partition_verbose",                 /// Unsupported type of ALTER query
-        "01417_freeze_partition_verbose_zookeeper",       /// Unsupported type of ALTER query
-        "01130_in_memory_parts_partitons",                /// Unsupported type of ALTER query
-        "01060_shutdown_table_after_detach",              /// Unsupported type of ALTER query
-        "01021_only_tuple_columns",                       /// Unsupported type of ALTER query
-        "01015_attach_part",                              /// Unsupported type of ALTER query
-        "00955_test_final_mark",                          /// Unsupported type of ALTER query
-        "00753_alter_attach",                             /// Unsupported type of ALTER query
-        "00626_replace_partition_from_table_zookeeper",   /// Unsupported type of ALTER query
-        "00626_replace_partition_from_table",             /// Unsupported type of ALTER query
-        "00152_insert_different_granularity",             /// Unsupported type of ALTER query
-        "00054_merge_tree_partitions",                    /// Unsupported type of ALTER query
-        "01781_merge_tree_deduplication",                 /// Unsupported type of ALTER query
-        "00980_zookeeper_merge_tree_alter_settings",      /// Unsupported type of ALTER query
-        "00980_merge_alter_settings",                     /// Unsupported type of ALTER query
-        "02009_array_join_partition",                     /// Unsupported type of ALTER query
-        "02012_changed_enum_type_non_replicated",         /// Unsupported type of ALTER query
-        "02012_zookeeper_changed_enum_type",              /// Unsupported type of ALTER query
-        "02012_zookeeper_changed_enum_type_incompatible", /// Unsupported type of ALTER query
-        
-        "01062_alter_on_mutataion_zookeeper",                         /// Old syntax is not allowed
-        "00925_zookeeper_empty_replicated_merge_tree_optimize_final", /// Old syntax is not allowed
-        "00754_alter_modify_order_by_replicated_zookeeper",           /// Old syntax is not allowed
-        "00652_replicated_mutations_zookeeper",                       /// Old syntax is not allowed
-        "00623_replicated_truncate_table_zookeeper",                  /// Old syntax is not allowed
-        "00516_deduplication_after_drop_partition_zookeeper",         /// Old syntax is not allowed
-        "00446_clear_column_in_partition_concurrent_zookeeper",       /// Old syntax is not allowed
-        "00236_replicated_drop_on_non_leader_zookeeper",              /// Old syntax is not allowed
-        "00226_zookeeper_deduplication_and_unexpected_parts",         /// Old syntax is not allowed
-        "00215_primary_key_order_zookeeper",                          /// Old syntax is not allowed
-        "00121_drop_column_zookeeper",                                /// Old syntax is not allowed
-        "00083_create_merge_tree_zookeeper",                          /// Old syntax is not allowed
-        "00062_replicated_merge_tree_alter_zookeeper",                /// Old syntax is not allowed
-        
-        "00634_rename_view", /// Does not support renaming of multiple tables in single query
-        "00140_rename",      /// Does not support renaming of multiple tables in single query
-        
-        "01943_query_id_check", /// Different query_id
-        
-        "00953_zookeeper_suetin_deduplication_bug", /// Requires investigation
-        "01783_http_chunk_size",                    /// Requires investigation
-        "00166_explain_estimate"                    /// Requires investigation
-    ],
-    "polymorphic-parts": [
-        "01508_partition_pruning_long", /// bug, shoud be fixed
-        "01482_move_to_prewhere_and_cast", /// bug, shoud be fixed
-        "01158_zookeeper_log"
-    ],
-    "parallel":
-    [
-        /// Pessimistic list of tests which work badly in parallel.
-        /// Probably they need better investigation.
-        "00080_show_tables_and_system_tables",
-        "00101_materialized_views_and_insert_without_explicit_database",
-        "00109_shard_totals_after_having",
-        "00110_external_sort",
-        "00116_storage_set",
-        "00133_long_shard_memory_tracker_and_exception_safety",
-        "00158_buffer_and_nonexistent_table",
-        "00180_attach_materialized_view",
-        "00305_http_and_readonly",
-        "00311_array_primary_key",
-        "00417_kill_query",
-        "00423_storage_log_single_thread",
-        "00429_long_http_bufferization",
-        "00446_clear_column_in_partition_concurrent_zookeeper",
-        "00463_long_sessions_in_http_interface",
-        "00505_shard_secure",
-        "00508_materialized_view_to",
-        "00534_functions_bad_arguments10",
-        "00552_or_nullable",
-        "00564_versioned_collapsing_merge_tree",
-        "00571_non_exist_database_when_create_materializ_view",
-        "00575_illegal_column_exception_when_drop_depen_column",
-        "00599_create_view_with_subquery",
-        "00600_replace_running_query",
-        "00604_show_create_database",
-        "00612_http_max_query_size",
-        "00619_union_highlite",
-        "00620_optimize_on_nonleader_replica_zookeeper",
-        "00623_truncate_table",
-        "00623_truncate_table_throw_exception",
-        "00625_arrays_in_nested",
-        "00626_replace_partition_from_table",
-        "00626_replace_partition_from_table_zookeeper",
-        "00633_materialized_view_and_too_many_parts_zookeeper",
-        "00652_mergetree_mutations",
-        "00652_replicated_mutations_zookeeper",
-        "00682_empty_parts_merge",
-        "00688_low_cardinality_serialization",
-        "00693_max_block_size_system_tables_columns",
-        "00699_materialized_view_mutations",
-        "00701_rollup",
-        "00715_fetch_merged_or_mutated_part_zookeeper",
-        "00716_allow_ddl",
-        "00719_parallel_ddl_db",
-        "00740_database_in_nested_view",
-        "00741_client_comment_multiline",
-        "00751_default_databasename_for_view",
-        "00753_alter_attach",
-        "00754_alter_modify_column_partitions",
-        "00763_long_lock_buffer_alter_destination_table",
-        "00800_versatile_storage_join",
-        "00804_test_alter_compression_codecs",
-        "00804_test_custom_compression_codecs",
-        "00804_test_custom_compression_codes_log_storages",
-        "00804_test_delta_codec_compression",
-        "00815_left_join_on_stepanel",
-        "00834_cancel_http_readonly_queries_on_client_close",
-        "00834_kill_mutation",
-        "00834_kill_mutation_replicated_zookeeper",
-        "00840_long_concurrent_select_and_drop_deadlock",
-        "00857_global_joinsavel_table_alias",
-        "00899_long_attach_memory_limit",
-        "00910_buffer_prewhere",
-        "00926_adaptive_index_granularity_merge_tree",
-        "00926_adaptive_index_granularity_pk",
-        "00926_adaptive_index_granularity_replacing_merge_tree",
-        "00933_alter_ttl",
-        "00933_reserved_word",
-        "00933_test_fix_extra_seek_on_compressed_cache",
-        "00933_ttl_with_default",
-        "00950_dict_get",
-        "00955_test_final_mark",
-        "00976_ttl_with_old_parts",
-        "00980_merge_alter_settings",
-        "00980_zookeeper_merge_tree_alter_settings",
-        "00989_parallel_parts_loading",
-        "00992_system_parts_race_condition_zookeeper_long",
-        "00993_system_parts_race_condition_drop_zookeeper",
-        "01012_show_tables_limit",
-        "01013_sync_replica_timeout_zookeeper",
-        "01014_lazy_database_basic",
-        "01014_lazy_database_concurrent_recreate_reattach_and_show_tables",
-        "01015_attach_part",
-        "01015_database_bad_tables",
-        "01018_ddl_dictionaries_concurrent_requrests",
-        "01018_ddl_dictionaries_create",
-        "01018_ddl_dictionaries_select",
-        "01018_ddl_dictionaries_special",
-        "01018_dictionaries_from_dictionaries",
-        "01018_ip_dictionary_long",
-        "01021_only_tuple_columns",
-        "01023_materialized_view_query_context",
-        "01031_mutations_interpreter_and_context",
-        "01033_dictionaries_lifetime",
-        "01035_concurrent_move_partition_from_table_zookeeper",
-        "01036_no_superfluous_dict_reload_on_create_database",
-        "01036_no_superfluous_dict_reload_on_create_database_2",
-        "01037_polygon_dicts_correctness_all",
-        "01037_polygon_dicts_correctness_fast",
-        "01037_polygon_dicts_simple_functions",
-        "01038_dictionary_lifetime_min_zero_sec",
-        "01040_dictionary_invalidate_query_switchover_long",
-        "01041_create_dictionary_if_not_exists",
-        "01042_system_reload_dictionary_reloads_completely",
-        "01043_dictionary_attribute_properties_values",
-        "01045_dictionaries_restrictions",
-        "01045_zookeeper_system_mutations_with_parts_names",
-        "01048_exists_query",
-        "01053_drop_database_mat_view",
-        "01053_ssd_dictionary",
-        "01054_cache_dictionary_bunch_update",
-        "01054_cache_dictionary_overflow_cell",
-        "01055_compact_parts_1",
-        "01056_create_table_as",
-        "01060_avro",
-        "01060_shutdown_table_after_detach",
-        "01069_database_memory",
-        "01070_materialize_ttl",
-        "01070_modify_ttl",
-        "01070_mutations_with_dependencies",
-        "01071_live_view_detach_dependency",
-        "01071_prohibition_secondary_index_with_old_format_merge_tree",
-        "01073_attach_if_not_exists",
-        "01073_show_tables_not_like",
-        "01076_cache_dictionary_datarace_exception_ptr",
-        "01076_parallel_alter_replicated_zookeeper",
-        "01079_parallel_alter_add_drop_column_zookeeper",
-        "01079_parallel_alter_detach_table_zookeeper",
-        "01079_parallel_alter_modify_zookeeper_long",
-        "01080_check_for_error_incorrect_size_of_nested_column",
-        "01083_expressions_in_engine_arguments",
-        "01084_regexp_empty",
-        "01085_max_distributed_connections_http",
-        "01092_memory_profiler",
-        "01098_temporary_and_external_tables",
-        "01103_distributed_product_mode_local_column_renames",
-        "01107_atomic_db_detach_attach",
-        "01108_restart_replicas_rename_deadlock_zookeeper",
-        "01109_exchange_tables",
-        "01110_dictionary_layout_without_arguments",
-        "01113_local_dictionary_type_conversion",
-        "01114_database_atomic",
-        "01114_mysql_database_engine_segfault",
-        "01115_join_with_dictionary",
-        "01125_dict_ddl_cannot_add_column",
-        "01127_month_partitioning_consistency_select",
-        "01130_in_memory_parts_partitons",
-        "01148_zookeeper_path_macros_unfolding",
-        "01150_ddl_guard_rwr",
-        "01153_attach_mv_uuid",
-        "01152_cross_replication",
-        "01154_move_partition_long",
-        "01155_rename_move_materialized_view",
-        "01185_create_or_replace_table",
-        "01190_full_attach_syntax",
-        "01191_rename_dictionary",
-        "01192_rename_database_zookeeper",
-        "01193_metadata_loading",
-        "01200_mutations_memory_consumption",
-        "01224_no_superfluous_dict_reload",
-        "01225_drop_dictionary_as_table",
-        "01225_show_create_table_from_dictionary",
-        "01231_distributed_aggregation_memory_efficient_mix_levels",
-        "01232_extremes",
-        "01238_http_memory_tracking",
-        "01249_bad_arguments_for_bloom_filter",
-        "01251_dict_is_in_infinite_loop",
-        "01254_dict_create_without_db",
-        "01254_dict_load_after_detach_attach",
-        "01257_dictionary_mismatch_types",
-        "01259_dictionary_custom_settings_ddl",
-        "01268_dictionary_direct_layout",
-        "01269_alias_type_differs",
-        "01272_suspicious_codecs",
-        "01280_ssd_complex_key_dictionary",
-        "01280_ttl_where_group_by",
-        "01281_group_by_limit_memory_tracking",
-        "01281_unsucceeded_insert_select_queries_counter",
-        "01293_system_distribution_queue",
-        "01294_lazy_database_concurrent",
-        "01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long",
-        "01294_system_distributed_on_cluster",
-        "01296_create_row_policy_in_current_database",
-        "01297_create_quota",
-        "01305_replica_create_drop_zookeeper",
-        "01307_multiple_leaders_zookeeper",
-        "01318_long_unsuccessful_mutation_zookeeper",
-        "01320_create_sync_race_condition_zookeeper",
-        "01338_long_select_and_alter",
-        "01338_long_select_and_alter_zookeeper",
-        "01355_alter_column_with_order",
-        "01355_ilike",
-        "01357_version_collapsing_attach_detach_zookeeper",
-        "01375_compact_parts_codecs",
-        "01376_GROUP_BY_injective_elimination_dictGet",
-        "01383_remote_ambiguous_column_shard",
-        "01388_clear_all_columns",
-        "01391_join_on_dict_crash",
-        "01392_column_resolve",
-        "01396_inactive_replica_cleanup_nodes_zookeeper",
-        "01412_cache_dictionary_race",
-        "01414_mutations_and_errors_zookeeper",
-        "01415_inconsistent_merge_tree_settings",
-        "01415_sticking_mutations",
-        "01417_freeze_partition_verbose",
-        "01417_freeze_partition_verbose_zookeeper",
-        "01444_create_table_drop_database_race",
-        "01454_storagememory_data_race_challenge",
-        "01455_rank_correlation_spearman",
-        "01456_modify_column_type_via_add_drop_update",
-        "01457_create_as_table_function_structure",
-        "01459_manual_write_to_replicas",
-        "01460_DistributedFilesToInsert",
-        "01465_ttl_recompression",
-        "01470_show_databases_like",
-        "01471_calculate_ttl_during_merge",
-        "01487_distributed_in_not_default_db",
-        "01493_storage_set_persistency",
-        "01494_storage_join_persistency",
-        "01501_cache_dictionary_all_fields",
-        "01507_clickhouse_server_start_with_embedded_config",
-        "01509_dictionary_preallocate",
-        "01516_create_table_primary_key",
-        "01517_drop_mv_with_inner_table",
-        "01526_complex_key_dict_direct_layout",
-        "01527_clickhouse_local_optimize",
-        "01527_dist_sharding_key_dictGet_reload",
-        "01541_max_memory_usage_for_user_long",
-        "01542_dictionary_load_exception_race",
-        "01545_system_errors", // looks at the difference of values in system.errors
-        "01560_optimize_on_insert_zookeeper",
-        "01563_distributed_query_finish", // looks at system.errors which is global
-        "01575_disable_detach_table_of_dictionary",
-        "01593_concurrent_alter_mutations_kill",
-        "01593_concurrent_alter_mutations_kill_many_replicas",
-        "01600_count_of_parts_metrics", // tests global system metrics
-        "01600_detach_permanently",
-        "01600_log_queries_with_extensive_info",
-        "01600_multiple_left_join_with_aliases",
-        "01601_detach_permanently",
-        "01602_show_create_view",
-        "01603_rename_overwrite_bug",
-        "01646_system_restart_replicas_smoke", // system restart replicas is a global query
-        "01656_test_query_log_factories_info",
-        "01658_read_file_to_stringcolumn",
-        "01676_dictget_in_default_expression",
-        "01681_cache_dictionary_simple_key",
-        "01682_cache_dictionary_complex_key",
-        "01683_flat_dictionary",
-        "01684_ssd_cache_dictionary_simple_key",
-        "01685_ssd_cache_dictionary_complex_key",
-        "01702_system_query_log", // It's ok to execute in parallel with oter tests but not several instances of the same test.
-        "01702_system_query_log", // Runs many global system queries
-        "01721_engine_file_truncate_on_insert", // It's ok to execute in parallel but not several instances of the same test.
-        "01722_long_brotli_http_compression_json_format", // It is broken in some unimaginable way with the genius error 'cannot write to ofstream'. Not sure how to debug this
-        "01748_dictionary_table_dot", // creates database
-        "01760_polygon_dictionaries",
-        "01760_system_dictionaries",
-        "01360_materialized_view_with_join_on_query_log", // creates and drops MVs on query_log, which may interrupt flushes.
-        "attach",
-        "ddl_dictionaries",
-        "dictionary",
-        "limit_memory",
-        "live_view",
-        "memory_leak",
-        "memory_limit",
-        "polygon_dicts", // they use an explicitly specified database
-        "01658_read_file_to_stringcolumn",
-        "01721_engine_file_truncate_on_insert", // It's ok to execute in parallel but not several instances of the same test.
-        "01702_system_query_log", // It's ok to execute in parallel but not several instances of the same test.
-        "01748_dictionary_table_dot", // creates database
-        "00950_dict_get",
-        "01615_random_one_shard_insertion",
-        "01683_flat_dictionary",
-        "01681_cache_dictionary_simple_key",
-        "01682_cache_dictionary_complex_key",
-        "01684_ssd_cache_dictionary_simple_key",
-        "01685_ssd_cache_dictionary_complex_key",
-        "01737_clickhouse_server_wait_server_pool_long", // This test is fully compatible to run in parallel, however under ASAN processes are pretty heavy and may fail under flaky adress check.
-        "01954_clickhouse_benchmark_round_robin", // This test is fully compatible to run in parallel, however under ASAN processes are pretty heavy and may fail under flaky adress check.
-        "01594_too_low_memory_limits", // This test is fully compatible to run in parallel, however under ASAN processes are pretty heavy and may fail under flaky adress check.
-        "01760_system_dictionaries",
-        "01760_polygon_dictionaries",
-        "01778_hierarchical_dictionaries",
-        "01780_clickhouse_dictionary_source_loop",
-        "01785_dictionary_element_count",
-        "01802_test_postgresql_protocol_with_row_policy", /// Creates database and users
-        "01804_dictionary_decimal256_type",
-        "01850_dist_INSERT_preserve_error", // uses cluster with different static databases shard_0/shard_1
-        "01821_table_comment",
-        "01856_create_function",
-        "01857_create_function_and_check_jit_compiled",
-        "01824_prefer_global_in_and_join",
-        "01870_modulo_partition_key",
-        "01870_buffer_flush", // creates database
-        "01889_postgresql_protocol_null_fields",
-        "01889_check_row_policy_defined_using_user_function",
-        "01921_concurrent_ttl_and_normal_merges_zookeeper_long", // heavy test, better to run sequentially
-        "01913_replace_dictionary",
-        "01914_exchange_dictionaries",
-        "01915_create_or_replace_dictionary",
-        "01925_test_storage_merge_aliases",
-        "01933_client_replxx_convert_history", /// Uses non unique history file
-        "01939_user_with_default_database", //create user and database
-        "01999_grant_with_replace",
-        "01902_table_function_merge_db_repr",
-        "01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer",
-        "01946_test_wrong_host_name_access",
-        "01493_alter_remove_properties_zookeeper",
-        "00510_materizlized_view_and_deduplication_zookeeper", /// static UUID
-        "00509_extended_storage_definition_syntax_zookeeper", /// leftovers
-        "00083_create_merge_tree_zookeeper", /// leftovers
-        "01532_execute_merges_on_single_replica", /// static zk path
-        "01530_drop_database_atomic_sync", /// creates database
-        "02001_add_default_database_to_system_users", ///create user
-        "02002_row_level_filter_bug", ///create user
-        "01747_system_session_log_long" // Reads from system.session_log and can't be run in parallel with any other test (since almost any other test writes to session_log)
-    ]
-}
diff --git a/tests/queries/skip_list_to_first_line_comment.py b/tests/queries/skip_list_to_first_line_comment.py
deleted file mode 100755
index 723127ad218..00000000000
--- a/tests/queries/skip_list_to_first_line_comment.py
+++ /dev/null
@@ -1,429 +0,0 @@
-#!/usr/bin/python3
-
-import os
-import time
-
-TEST_FILE_EXTENSIONS = ['.sql', '.sql.j2', '.sh', '.py', '.expect']
-TEST_FILE_EXTENSIONS += [ext + '.disabled' for ext in TEST_FILE_EXTENSIONS]
-TAGS_PREFIX = "Tags:"
-
-
-def parse_skip_list_json(text):
-    pos = 0
-    def skip_spaces():
-        nonlocal pos
-        start_pos = pos
-        while pos < len(text) and text[pos].isspace():
-            pos += 1
-        return pos > start_pos
-
-    def skip_comment():
-        nonlocal pos
-        if text.startswith('//', pos):
-            end_of_line = text.find('\n', pos + 1)
-            if end_of_line == -1:
-                pos = len(text)
-                return True
-            pos = end_of_line + 1
-            return True
-        elif text.startswith('/*', pos):
-            end_of_comment = text.find('*/', pos + 2)
-            if end_of_comment == -1:
-                raise Exception(f'Not found the end of a comment at pos {pos}')
-            pos = end_of_comment + 2
-            return True
-        else:
-            return False
-
-    def skip_spaces_or_comments():
-        while skip_spaces() or skip_comment():
-            pass
-
-    def skip_char_only(c):
-        nonlocal pos
-        if not text.startswith(c, pos):
-            return False
-        pos += 1
-        return True
-
-    def skip_char(c):
-        skip_spaces_or_comments()
-        return skip_char_only(c)
-
-    def expect_char(c):
-        nonlocal pos
-        skip_spaces_or_comments()
-        if not text.startswith(c, pos):
-            raise Exception(f"Expected '{c}' at pos {pos}")
-        pos += 1
-
-    def parse_quoted_string():
-        nonlocal pos
-        skip_spaces_or_comments()
-        expect_char('"')
-        end_of_string = text.find('"', pos)
-        if end_of_string == -1:
-            raise Exception(f'Not found the end of a quoted string at pos {pos-1}')
-        str = text[pos:end_of_string]
-        pos = end_of_string + 1
-        return str
-
-    def parse_description_comment():
-        nonlocal pos
-        while pos < len(text) and (text[pos] == ' ' or text[pos] == '\t'):
-            pos += 1
-        if not text.startswith('///', pos):
-            return None
-        end_of_line = text.find('\n', pos + 3)
-        if end_of_line == -1:
-            description = text[pos+3:]
-            pos = len(text)
-        else:
-            description = text[pos+3:end_of_line]
-            pos = end_of_line + 1
-        description = description.strip()
-        return description
-
-    res = {}
-    expect_char('{')
-    while not skip_char('}'):
-        build_flag = parse_quoted_string()
-        expect_char(':')
-        expect_char('[')
-        patterns = []
-        while not skip_char(']'):
-            pattern = parse_quoted_string()
-            skip_char_only(',')
-            description = parse_description_comment()
-            patterns.append((pattern, description))
-        skip_char(',')
-        res[build_flag] = patterns
-    return res
-
-
-def load_skip_list_json(path):
-    if not os.path.exists(path):
-        raise Exception(f'File {path} not found')
-    with open(path, 'r') as file:
-        contents = file.read()
-        skip_dict = parse_skip_list_json(contents)
-        return skip_dict
-
-
-def parse_fasttest_run_sh(text):
-    mark = 'TESTS_TO_SKIP=('
-    pos = text.find(mark)
-    if pos == -1:
-        raise Exception('TESTS_TO_SKIP not found in fasttest/run.sh')
-    pos += len(mark)
-
-    def skip_spaces():
-        nonlocal pos
-        start_pos = pos
-        while pos < len(text) and text[pos].isspace():
-            pos += 1
-        return pos > start_pos
-
-    def skip_comment():
-        nonlocal pos
-        if text.startswith('#', pos):
-            end_of_line = text.find('\n', pos + 1)
-            if end_of_line == -1:
-                pos = len(text)
-                return True
-            pos = end_of_line + 1
-            return True
-        else:
-            return False
-
-    def skip_spaces_or_comments():
-        while skip_spaces() or skip_comment():
-            pass
-
-    def skip_char(c):
-        nonlocal pos
-        skip_spaces_or_comments()
-        if not text.startswith(c, pos):
-            return False
-        pos += 1
-        return True
-
-    def parse_test_pattern():
-        nonlocal pos
-        skip_spaces_or_comments()
-        cur_pos = pos
-        while (cur_pos < len(text)) and (text[cur_pos].isalnum() or text[cur_pos] == '_'):
-            cur_pos += 1
-        if cur_pos == pos:
-            raise Exception(f"Couldn't read a test's name or pattern at pos {pos}")
-        pattern = text[pos:cur_pos]
-        pos = cur_pos
-        return pattern
-        
-    def parse_description_comment():
-        nonlocal pos
-        while pos < len(text) and (text[pos] == ' ' or text[pos] == '\t'):
-            pos += 1
-        if not text.startswith('#', pos):
-            return None
-        end_of_line = text.find('\n', pos + 1)
-        if end_of_line == -1:
-            description = text[pos+1:]
-            pos = len(text)
-        else:
-            description = text[pos+1:end_of_line]
-            pos = end_of_line + 1
-        description = description.strip()
-        return description
-
-    patterns = []
-    while not skip_char(')'):
-        pattern = parse_test_pattern()
-        description = parse_description_comment()
-        patterns.append((pattern, description))
-    return {"fasttest": patterns}
-
-
-def load_fasttest_run_sh(path):
-    if not os.path.exists(path):
-        raise Exception(f'File {path} not found')
-    with open(path, 'r') as file:
-        contents = file.read()
-        skip_dict = parse_fasttest_run_sh(contents)
-        return skip_dict
-
-
-def get_comment_sign(filename):
-    if filename.endswith('.disabled'):
-        filename = filename[:-len('.disabled')]
-    if filename.endswith('.sql') or filename.endswith('.sql.j2'):
-        return '--'
-    elif filename.endswith('.sh') or filename.endswith('.py') or filename.endswith('.expect'):
-        return '#'
-    else:
-        raise Exception(f'Unknown file_extension: {filename}')
-
-
-def is_shebang(line):
-    return line.startswith('#!')
-
-
-def parse_tags_from_line(line, comment_sign):
-    if not line.startswith(comment_sign):
-        return None
-    tags_str = line[len(comment_sign):].lstrip()
-    if not tags_str.startswith(TAGS_PREFIX):
-        return None
-    tags_str = tags_str[len(TAGS_PREFIX):]
-    tags = tags_str.split(',')
-    tags = [tag.strip() for tag in tags]
-    return tags
-
-
-def format_tags_to_line(tags, comment_sign):
-    return comment_sign + ' ' + TAGS_PREFIX + ' ' + ', '.join(tags) + '\n'
-
-
-def load_tags_from_file(filepath):
-    with open(filepath, 'r') as file:
-        try:
-            line = file.readline()
-            if is_shebang(line):
-                line = file.readline()
-        except UnicodeDecodeError:
-            return []
-    return parse_tags_from_line(line, get_comment_sign(filepath))
-
-
-def save_tags_to_file(filepath, tags, description = {}):
-    if not tags:
-        return
-    with open(filepath, 'r') as file:
-        contents = file.read()
-
-    # Skip shebang.
-    shebang_line = ''
-    eol = contents.find('\n')
-    if eol != -1 and is_shebang(contents[:eol+1]):
-        shebang_line = contents[:eol+1]
-        contents = contents[eol+1:]
-
-    # Skip tag line with description lines.
-    eol = contents.find('\n')
-    comment_sign = get_comment_sign(filepath)
-    if eol != -1 and parse_tags_from_line(contents[:eol+1], comment_sign):
-        contents = contents[eol+1:]
-        while True:
-            eol = contents.find('\n')
-            if eol == -1 or contents[:eol+1].isspace():
-                break
-            contents = contents[eol+1:]
-
-    # Skip an empty line after tags.
-    eol = contents.find('\n')
-    if eol != -1 and contents[:eol+1].isspace():
-        contents = contents[eol+1:]
-    empty_line = '\n'
-
-    # New tags line.
-    tags_line = format_tags_to_line(tags, comment_sign)
-
-    # New description lines.
-    tags_with_descriptions = []
-    for tag in tags:
-        if description.get(tag):
-            tags_with_descriptions.append(tag)
-    
-    description_lines = ''
-    if tags_with_descriptions:
-        for tag in tags_with_descriptions:
-            description_lines += comment_sign + ' Tag ' + tag + ': ' + description[tag] + '\n'
-
-    contents = shebang_line + tags_line + description_lines + empty_line + contents
-    with open(filepath, 'w') as file:
-        file.write(contents)
-        print(f'Changed {filepath}')
-
-
-def build_flag_to_tag(build_flag):
-    if build_flag == "thread-sanitizer":
-        return "no-tsan"
-    elif build_flag == "address-sanitizer":
-        return "no-asan"
-    elif build_flag == "ub-sanitizer":
-        return "no-ubsan"
-    elif build_flag == "memory-sanitizer":
-        return "no-msan"
-    elif build_flag == "database-replicated":
-        return "no-replicated-database"
-    elif build_flag == "database-ordinary":
-        return "no-ordinary-database"
-    elif build_flag == "debug-build":
-        return "no-debug"
-    elif build_flag == "release-build":
-        return "no-release"
-    elif build_flag == "unbundled-build":
-        return "no-unbundled"
-    else:
-        return "no-" + build_flag
-
-
-def get_tags(test_name, skip_list):
-    tags = []
-    descriptions = {}
-
-    if test_name.endswith('.disabled'):
-        tags.append("disabled")
-
-    if 'deadlock' in test_name:
-        tags.append("deadlock")
-    elif 'race' in test_name:
-        tags.append("race")
-    elif 'long' in test_name:
-        tags.append("long")
-
-    if 'replica' in test_name:
-        tags.append("replica")
-    elif 'zookeeper' in test_name:
-        tags.append("zookeeper")
-
-    if 'distributed' in test_name:
-        tags.append("distributed")
-    elif 'shard' in test_name:
-        tags.append("shard")
-    elif 'global' in test_name:
-        tags.append("global")
-
-    for build_flag, patterns in skip_list.items():
-        for pattern, description in patterns:
-            if pattern in test_name:
-                tag = build_flag_to_tag(build_flag)
-                if not tag in tags:
-                    tags.append(tag)
-                    if description:
-                        descriptions[tag] = description
-
-    return tags, descriptions
-
-
-def load_all_tags(base_dir):
-    def get_comment_sign(filename):
-        if filename.endswith('.sql') or filename.endswith('.sql.j2'):
-            return '--'
-        elif filename.endswith('.sh') or filename.endswith('.py') or filename.endswith('.expect'):
-            return '#'
-        else:
-            raise Exception(f'Unknown file_extension: {filename}')
-
-    def parse_tags_from_line(line, comment_sign):
-        if not line.startswith(comment_sign):
-            return None
-        tags_str = line[len(comment_sign):].lstrip()
-        tags_prefix = "Tags:"
-        if not tags_str.startswith(tags_prefix):
-            return None
-        tags_str = tags_str[len(tags_prefix):]
-        tags = tags_str.split(',')
-        tags = {tag.strip() for tag in tags}
-        return tags
-
-    def is_shebang(line):
-        return line.startswith('#!')
-
-    def load_tags_from_file(filepath):
-        with open(filepath, 'r') as file:
-            try:
-                line = file.readline()
-                if is_shebang(line):
-                    line = file.readline()
-            except UnicodeDecodeError:
-                return []
-        return parse_tags_from_line(line, get_comment_sign(filepath))
-
-    all_tags = {}
-    for suite in os.listdir(base_dir):
-        suite_dir = os.path.join(base_dir, suite)
-        if not os.path.isdir(suite_dir):
-            continue
-        
-        for test_name in os.listdir(suite_dir):
-            test_path = os.path.join(suite_dir, test_name)
-            if not os.path.isfile(test_path) or all(not test_path.endswith(supported_ext) for supported_ext in TEST_FILE_EXTENSIONS):
-                continue
-            tags = load_tags_from_file(test_path)
-            if tags:
-                all_tags[test_path] = tags
-    return all_tags
-
-
-def load_all_tags_timing(base_dir):
-    start_time = time.time()
-    print(type(load_all_tags(base_dir)))
-    print("--- %s seconds ---" % (time.time() - start_time))
-
-
-def main():
-    base_dir = os.path.dirname(__file__)
-    print(f'base_dir={base_dir}')
-
-    #return load_all_tags_timing(base_dir)
-    
-    skip_dict = load_skip_list_json(os.path.join(base_dir, 'skip_list.json'))
-    skip_dict_from_fasttest_run_sh = load_fasttest_run_sh(os.path.join(base_dir, '../../docker/test/fasttest/run.sh'))
-    skip_dict = {**skip_dict, **skip_dict_from_fasttest_run_sh}
-    #print(f'skip_dict={skip_dict}')
-
-    for suite in os.listdir(base_dir):
-        suite_dir = os.path.join(base_dir, suite)
-        if not os.path.isdir(suite_dir):
-            continue
-        
-        for test_name in os.listdir(suite_dir):
-            test_path = os.path.join(suite_dir, test_name)
-            if not os.path.isfile(test_path) or all(not test_path.endswith(supported_ext) for supported_ext in TEST_FILE_EXTENSIONS):
-                continue
-            tags, descriptions = get_tags(test_path, skip_dict)
-            save_tags_to_file(test_path, tags, descriptions)
-
-if __name__ == '__main__':
-    main()

From 1034ab87f2ba941dd51c34e61252499f3ca708e5 Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Sun, 12 Sep 2021 19:36:59 +0300
Subject: [PATCH 223/273] fix -Wreserved-macro-identifier in
 int_hashes_perf.cpp

---
 src/Common/examples/int_hashes_perf.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Common/examples/int_hashes_perf.cpp b/src/Common/examples/int_hashes_perf.cpp
index 8a32f8f536e..c648c7c0cf2 100644
--- a/src/Common/examples/int_hashes_perf.cpp
+++ b/src/Common/examples/int_hashes_perf.cpp
@@ -1,3 +1,7 @@
+#if defined(__clang__) && __clang_major__ >= 13
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #if defined (OS_LINUX)
 #   include <sched.h>
 #endif

From d3b3e8607c410a8ba7127e2abaf7776c1885301a Mon Sep 17 00:00:00 2001
From: Sergei Semin <semin-serg@yandex-team.ru>
Date: Sun, 12 Sep 2021 19:51:47 +0300
Subject: [PATCH 224/273] fix tabs

---
 docker/packager/packager | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/packager/packager b/docker/packager/packager
index 5e3335c73e4..f8e5fd717cf 100755
--- a/docker/packager/packager
+++ b/docker/packager/packager
@@ -205,7 +205,7 @@ if __name__ == "__main__":
     parser.add_argument("--build-type", choices=("debug", ""), default="")
     parser.add_argument("--compiler", choices=("clang-11", "clang-11-darwin", "clang-11-darwin-aarch64", "clang-11-aarch64",
                                                "clang-12", "clang-12-darwin", "clang-12-darwin-aarch64", "clang-12-aarch64",
-                                  						 "clang-13", "clang-13-darwin", "clang-13-darwin-aarch64", "clang-13-aarch64",
+                                               "clang-13", "clang-13-darwin", "clang-13-darwin-aarch64", "clang-13-aarch64",
                                                "clang-11-freebsd", "clang-12-freebsd", "clang-13-freebsd", "gcc-11"), default="clang-13")
     parser.add_argument("--sanitizer", choices=("address", "thread", "memory", "undefined", ""), default="")
     parser.add_argument("--unbundled", action="store_true")

From 147e4133466b6eefdd00a1a3f3d15c881ebe94f3 Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Sun, 12 Sep 2021 13:43:20 +0300
Subject: [PATCH 225/273] Add retries with backoff, better exceptions

---
 src/Disks/DiskWebServer.cpp                   | 30 ++++++------
 src/Disks/DiskWebServer.h                     | 20 ++------
 src/Disks/ReadIndirectBufferFromWebServer.cpp | 48 ++++++++++---------
 src/Disks/ReadIndirectBufferFromWebServer.h   |  3 +-
 4 files changed, 45 insertions(+), 56 deletions(-)

diff --git a/src/Disks/DiskWebServer.cpp b/src/Disks/DiskWebServer.cpp
index 5c20ff6a0b4..93d5593f0f2 100644
--- a/src/Disks/DiskWebServer.cpp
+++ b/src/Disks/DiskWebServer.cpp
@@ -3,8 +3,6 @@
 #include <common/logger_useful.h>
 #include <Common/escapeForFileName.h>
 
-#include <Access/AccessControlManager.h>
-
 #include <Disks/IDiskRemote.h>
 #include <Disks/ReadIndirectBufferFromRemoteFS.h>
 #include <Disks/ReadIndirectBufferFromWebServer.h>
@@ -17,7 +15,6 @@
 #include <Storages/MergeTree/MergeTreeData.h>
 
 #include <Poco/Exception.h>
-#include <re2/re2.h>
 
 
 namespace DB
@@ -115,25 +112,22 @@ public:
             const String & uri_,
             RemoteMetadata metadata_,
             ContextPtr context_,
-            size_t max_read_tries_,
             size_t buf_size_)
         : ReadIndirectBufferFromRemoteFS<ReadIndirectBufferFromWebServer>(metadata_)
         , uri(uri_)
         , context(context_)
-        , max_read_tries(max_read_tries_)
         , buf_size(buf_size_)
     {
     }
 
     std::unique_ptr<ReadIndirectBufferFromWebServer> createReadBuffer(const String & path) override
     {
-        return std::make_unique<ReadIndirectBufferFromWebServer>(fs::path(uri) / path, context, max_read_tries, buf_size);
+        return std::make_unique<ReadIndirectBufferFromWebServer>(fs::path(uri) / path, context, buf_size);
     }
 
 private:
     String uri;
     ContextPtr context;
-    size_t max_read_tries;
     size_t buf_size;
 };
 
@@ -142,12 +136,12 @@ DiskWebServer::DiskWebServer(
             const String & disk_name_,
             const String & url_,
             ContextPtr context_,
-            SettingsPtr settings_)
+            size_t min_bytes_for_seek_)
         : WithContext(context_->getGlobalContext())
         , log(&Poco::Logger::get("DiskWeb"))
         , url(url_)
         , name(disk_name_)
-        , settings(std::move(settings_))
+        , min_bytes_for_seek(min_bytes_for_seek_)
 {
 }
 
@@ -196,8 +190,8 @@ std::unique_ptr<ReadBufferFromFileBase> DiskWebServer::readFile(const String & p
     RemoteMetadata meta(path, remote_path);
     meta.remote_fs_objects.emplace_back(std::make_pair(remote_path, iter->second.size));
 
-    auto reader = std::make_unique<ReadBufferFromWebServer>(url, meta, getContext(), settings->max_read_tries, read_settings.remote_fs_buffer_size);
-    return std::make_unique<SeekAvoidingReadBuffer>(std::move(reader), settings->min_bytes_for_seek);
+    auto reader = std::make_unique<ReadBufferFromWebServer>(url, meta, getContext(), read_settings.remote_fs_buffer_size);
+    return std::make_unique<SeekAvoidingReadBuffer>(std::move(reader), min_bytes_for_seek);
 }
 
 
@@ -275,12 +269,16 @@ void registerDiskWebServer(DiskFactory & factory)
         String uri{config.getString(config_prefix + ".endpoint")};
         if (!uri.ends_with('/'))
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "URI must end with '/', but '{}' doesn't.", uri);
+        try
+        {
+            Poco::URI poco_uri(uri);
+        }
+        catch (const Poco::Exception & e)
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad URI: `{}`. Error: {}", uri, e.what());
+        }
 
-        auto settings = std::make_unique<DiskWebServerSettings>(
-            context->getGlobalContext()->getSettingsRef().http_max_single_read_retries,
-            config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024));
-
-        return std::make_shared<DiskWebServer>(disk_name, uri, context, std::move(settings));
+        return std::make_shared<DiskWebServer>(disk_name, uri, context, config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024));
     };
 
     factory.registerDiskType("web", creator);
diff --git a/src/Disks/DiskWebServer.h b/src/Disks/DiskWebServer.h
index 2ed8e531ede..222a04054e2 100644
--- a/src/Disks/DiskWebServer.h
+++ b/src/Disks/DiskWebServer.h
@@ -13,18 +13,6 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
 }
 
-struct DiskWebServerSettings
-{
-    /// Number of read attempts before throw that network is unreachable.
-    size_t max_read_tries;
-    /// Passed to SeekAvoidingReadBuffer.
-    size_t min_bytes_for_seek;
-
-    DiskWebServerSettings(size_t max_read_tries_, size_t min_bytes_for_seek_)
-        : max_read_tries(max_read_tries_) , min_bytes_for_seek(min_bytes_for_seek_) {}
-};
-
-
 /*
  * Quick ready test: ATTACH TABLE test_hits UUID '1ae36516-d62d-4218-9ae3-6516d62da218' ( WatchID UInt64, JavaEnable UInt8, Title String, GoodEvent Int16, EventTime DateTime, EventDate Date, CounterID UInt32, ClientIP UInt32, ClientIP6 FixedString(16), RegionID UInt32, UserID UInt64, CounterClass Int8, OS UInt8, UserAgent UInt8, URL String, Referer String, URLDomain String, RefererDomain String, Refresh UInt8, IsRobot UInt8, RefererCategories Array(UInt16), URLCategories Array(UInt16), URLRegions Array(UInt32), RefererRegions Array(UInt32), ResolutionWidth UInt16, ResolutionHeight UInt16, ResolutionDepth UInt8, FlashMajor UInt8, FlashMinor UInt8, FlashMinor2 String, NetMajor UInt8, NetMinor UInt8, UserAgentMajor UInt16, UserAgentMinor FixedString(2), CookieEnable UInt8, JavascriptEnable UInt8, IsMobile UInt8, MobilePhone UInt8, MobilePhoneModel String, Params String, IPNetworkID UInt32, TraficSourceID Int8, SearchEngineID UInt16, SearchPhrase String, AdvEngineID UInt8, IsArtifical UInt8, WindowClientWidth UInt16, WindowClientHeight UInt16, ClientTimeZone Int16, ClientEventTime DateTime, SilverlightVersion1 UInt8, SilverlightVersion2 UInt8, SilverlightVersion3 UInt32, SilverlightVersion4 UInt16, PageCharset String, CodeVersion UInt32, IsLink UInt8, IsDownload UInt8, IsNotBounce UInt8, FUniqID UInt64, HID UInt32, IsOldCounter UInt8, IsEvent UInt8, IsParameter UInt8, DontCountHits UInt8, WithHash UInt8, HitColor FixedString(1), UTCEventTime DateTime, Age UInt8, Sex UInt8, Income UInt8, Interests UInt16, Robotness UInt8, GeneralInterests Array(UInt16), RemoteIP UInt32, RemoteIP6 FixedString(16), WindowName Int32, OpenerName Int32, HistoryLength Int16, BrowserLanguage FixedString(2), BrowserCountry FixedString(2), SocialNetwork String, SocialAction String, HTTPError UInt16, SendTiming Int32, DNSTiming Int32, ConnectTiming Int32, ResponseStartTiming Int32, ResponseEndTiming Int32, FetchTiming Int32, RedirectTiming Int32, DOMInteractiveTiming Int32, DOMContentLoadedTiming Int32, DOMCompleteTiming Int32, LoadEventStartTiming Int32, LoadEventEndTiming Int32, NSToDOMContentLoadedTiming Int32, FirstPaintTiming Int32, RedirectCount Int8, SocialSourceNetworkID UInt8, SocialSourcePage String, ParamPrice Int64, ParamOrderID String, ParamCurrency FixedString(3), ParamCurrencyID UInt16, GoalsReached Array(UInt32), OpenstatServiceName String, OpenstatCampaignID String, OpenstatAdID String, OpenstatSourceID String, UTMSource String, UTMMedium String, UTMCampaign String, UTMContent String, UTMTerm String, FromTag String, HasGCLID UInt8, RefererHash UInt64, URLHash UInt64, CLID UInt32, YCLID UInt64, ShareService String, ShareURL String, ShareTitle String, ParsedParams Nested(Key1 String, Key2 String, Key3 String, Key4 String, Key5 String, ValueDouble Float64), IslandID FixedString(16), RequestNum UInt32, RequestTry UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS storage_policy='web';
  *
@@ -46,7 +34,7 @@ struct DiskWebServerSettings
  *       </policies>
  *   </storage_configuration>
  *
- * If query timeouts -- need to adjust settings: http_connection_timeout, http_receive_timeout, http_receive_timeout.
+ * If query fails with `DB:Exception Unreachable URL` -- may help to adjust settings: http_connection_timeout, http_receive_timeout, keep_alive_timeout.
  *
  * To get files for upload run:
  * clickhouse static-files-disk-uploader --metadata-path <path> --output-dir <dir>
@@ -60,13 +48,12 @@ struct DiskWebServerSettings
 **/
 class DiskWebServer : public IDisk, WithContext
 {
-using SettingsPtr = std::unique_ptr<DiskWebServerSettings>;
 
 public:
     DiskWebServer(const String & disk_name_,
                   const String & url_,
                   ContextPtr context,
-                  SettingsPtr settings_);
+                  size_t min_bytes_for_seel_);
 
     bool supportZeroCopyReplication() const override { return false; }
 
@@ -208,7 +195,8 @@ private:
     Poco::Logger * log;
     String url;
     String name;
-    SettingsPtr settings;
+
+    size_t min_bytes_for_seek;
 };
 
 }
diff --git a/src/Disks/ReadIndirectBufferFromWebServer.cpp b/src/Disks/ReadIndirectBufferFromWebServer.cpp
index ec5c236aec4..c80642fbb81 100644
--- a/src/Disks/ReadIndirectBufferFromWebServer.cpp
+++ b/src/Disks/ReadIndirectBufferFromWebServer.cpp
@@ -1,9 +1,12 @@
 #include "ReadIndirectBufferFromWebServer.h"
 
 #include <common/logger_useful.h>
+#include <common/sleep.h>
 #include <Core/Types.h>
 #include <IO/ReadWriteBufferFromHTTP.h>
 #include <IO/ConnectionTimeoutsContext.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/Operators.h>
 #include <thread>
 
 
@@ -17,17 +20,17 @@ namespace ErrorCodes
     extern const int NETWORK_ERROR;
 }
 
+static const auto WAIT_MS = 10;
+static const auto WAIT_THRESHOLD_MS = 10000;
 
 ReadIndirectBufferFromWebServer::ReadIndirectBufferFromWebServer(const String & url_,
                                                                  ContextPtr context_,
-                                                                 size_t max_read_tries_,
                                                                  size_t buf_size_)
     : BufferWithOwnMemory<SeekableReadBuffer>(buf_size_)
     , log(&Poco::Logger::get("ReadIndirectBufferFromWebServer"))
     , context(context_)
     , url(url_)
     , buf_size(buf_size_)
-    , max_read_tries(max_read_tries_)
 {
 }
 
@@ -40,6 +43,8 @@ std::unique_ptr<ReadBuffer> ReadIndirectBufferFromWebServer::initialize()
     headers.emplace_back(std::make_pair("Range", fmt::format("bytes={}-", offset)));
     const auto & settings = context->getSettingsRef();
     LOG_DEBUG(log, "Reading from offset: {}", offset);
+    const auto & config = context->getConfigRef();
+    Poco::Timespan http_keep_alive_timeout{config.getUInt("keep_alive_timeout", 20), 0};
 
     return std::make_unique<ReadWriteBufferFromHTTP>(
         uri,
@@ -49,7 +54,7 @@ std::unique_ptr<ReadBuffer> ReadIndirectBufferFromWebServer::initialize()
                            settings.http_send_timeout,
                            std::max(Poco::Timespan(settings.http_receive_timeout.totalSeconds(), 0), Poco::Timespan(20, 0)),
                            settings.tcp_keep_alive_timeout,
-                           std::max(Poco::Timespan(settings.http_receive_timeout.totalSeconds(), 0), Poco::Timespan(20, 0))),
+                           http_keep_alive_timeout),
         0,
         Poco::Net::HTTPBasicCredentials{},
         buf_size,
@@ -60,6 +65,7 @@ std::unique_ptr<ReadBuffer> ReadIndirectBufferFromWebServer::initialize()
 bool ReadIndirectBufferFromWebServer::nextImpl()
 {
     bool next_result = false, successful_read = false;
+    UInt16 milliseconds_to_wait = WAIT_MS;
 
     if (impl)
     {
@@ -67,40 +73,38 @@ bool ReadIndirectBufferFromWebServer::nextImpl()
         impl->position() = position();
         assert(!impl->hasPendingData());
     }
-    else
+
+    WriteBufferFromOwnString error_msg;
+    while (milliseconds_to_wait < WAIT_THRESHOLD_MS)
     {
         try
         {
-            impl = initialize();
-        }
-        catch (const Poco::Exception & e)
-        {
-            throw Exception(ErrorCodes::NETWORK_ERROR, "Unreachable url: {}. Error: {}", url, e.what());
-        }
+            if (!impl)
+            {
+                impl = initialize();
+                next_result = impl->hasPendingData();
+                if (next_result)
+                    break;
+            }
 
-        next_result = impl->hasPendingData();
-    }
-
-    for (size_t try_num = 0; (try_num < max_read_tries) && !next_result; ++try_num)
-    {
-        try
-        {
             next_result = impl->next();
             successful_read = true;
             break;
         }
-        catch (const Exception & e)
+        catch (const Poco::Exception & e)
         {
-            LOG_WARNING(log, "Read attempt {}/{} failed from {}. ({})", try_num, max_read_tries, url, e.message());
+            LOG_WARNING(log, "Read attempt failed for url: {}. Error: {}", url, e.what());
+            error_msg << fmt::format("Error: {}\n", e.what());
 
+            sleepForMilliseconds(milliseconds_to_wait);
+            milliseconds_to_wait *= 2;
             impl.reset();
-            impl = initialize();
-            next_result = impl->hasPendingData();
         }
     }
 
     if (!successful_read)
-        throw Exception(ErrorCodes::NETWORK_ERROR, "All read attempts ({}) failed for uri: {}", max_read_tries, url);
+        throw Exception(ErrorCodes::NETWORK_ERROR,
+                        "All read attempts failed for url: {}. Reason:\n{}", url, error_msg.str());
 
     if (next_result)
     {
diff --git a/src/Disks/ReadIndirectBufferFromWebServer.h b/src/Disks/ReadIndirectBufferFromWebServer.h
index 9a3dcff52f4..c359fc0673f 100644
--- a/src/Disks/ReadIndirectBufferFromWebServer.h
+++ b/src/Disks/ReadIndirectBufferFromWebServer.h
@@ -18,7 +18,6 @@ class ReadIndirectBufferFromWebServer : public BufferWithOwnMemory<SeekableReadB
 public:
     explicit ReadIndirectBufferFromWebServer(const String & url_,
                                              ContextPtr context_,
-                                             size_t max_read_tries_,
                                              size_t buf_size_ = DBMS_DEFAULT_BUFFER_SIZE);
 
     bool nextImpl() override;
@@ -34,7 +33,7 @@ private:
     ContextPtr context;
 
     const String url;
-    size_t buf_size, max_read_tries;
+    size_t buf_size;
 
     std::unique_ptr<ReadBuffer> impl;
 

From 1d9a753646d3d9108e7a59d3229aeebac75a6eb9 Mon Sep 17 00:00:00 2001
From: olgarev <revolg@yandex.ru>
Date: Mon, 13 Sep 2021 03:10:11 +0000
Subject: [PATCH 226/273] Translation

---
 docs/en/interfaces/third-party/gui.md          | 2 +-
 docs/ru/engines/database-engines/postgresql.md | 3 ++-
 docs/ru/interfaces/third-party/gui.md          | 8 +++++---
 docs/ru/operations/system-tables/replicas.md   | 5 +++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/docs/en/interfaces/third-party/gui.md b/docs/en/interfaces/third-party/gui.md
index f2c6d1ee542..ad39adbd653 100644
--- a/docs/en/interfaces/third-party/gui.md
+++ b/docs/en/interfaces/third-party/gui.md
@@ -84,7 +84,7 @@ Features:
 -   Table data preview.
 -   Full-text search.
 
-By default, DBeaver does not connect using a session (the CLI for example does). If you require session support (for example to set settings for your session), edit the driver connection properties and set session_id to a random string (it uses the http connection under the hood). Then you can use any setting from the query window 
+By default, DBeaver does not connect using a session (the CLI for example does). If you require session support (for example to set settings for your session), edit the driver connection properties and set `session_id` to a random string (it uses the http connection under the hood). Then you can use any setting from the query window.
 
 ### clickhouse-cli {#clickhouse-cli}
 
diff --git a/docs/ru/engines/database-engines/postgresql.md b/docs/ru/engines/database-engines/postgresql.md
index 06e2b35b002..f68570d40eb 100644
--- a/docs/ru/engines/database-engines/postgresql.md
+++ b/docs/ru/engines/database-engines/postgresql.md
@@ -15,7 +15,7 @@ toc_title: PostgreSQL
 
 ``` sql
 CREATE DATABASE test_database
-ENGINE = PostgreSQL('host:port', 'database', 'user', 'password'[, `use_table_cache`]);
+ENGINE = PostgreSQL('host:port', 'database', 'user', 'password'[, `schema`, `use_table_cache`]);
 ```
 
 **Параметры движка**
@@ -24,6 +24,7 @@ ENGINE = PostgreSQL('host:port', 'database', 'user', 'password'[, `use_table_cac
 -   `database` — имя удаленной БД.
 -   `user` — пользователь PostgreSQL.
 -   `password` — пароль пользователя.
+ -  `schema` — схема PostgreSQL.
 -   `use_table_cache` —  определяет кеширование структуры таблиц БД. Необязательный параметр. Значение по умолчанию: `0`.
 
 ## Поддерживаемые типы данных {#data_types-support}
diff --git a/docs/ru/interfaces/third-party/gui.md b/docs/ru/interfaces/third-party/gui.md
index 9cb28a2c9a2..fb14e9f955c 100644
--- a/docs/ru/interfaces/third-party/gui.md
+++ b/docs/ru/interfaces/third-party/gui.md
@@ -75,11 +75,13 @@ toc_title: "Визуальные интерфейсы от сторонних р
 
 Основные возможности:
 
--   Построение запросов с подсветкой синтаксиса;
--   Просмотр таблиц;
--   Автодополнение команд;
+-   Построение запросов с подсветкой синтаксиса.
+-   Просмотр таблиц.
+-   Автодополнение команд.
 -   Полнотекстовый поиск.
 
+По умолчанию DBeaver не использует сессии при подключении (в отличие от CLI, например). Если вам нужна поддержка сессий (например, для установки настроек на сессию), измените настройки подключения драйвера и укажите для настройки `session_id` любое произвольное значение (драйвер использует подключение по http). После этого вы можете использовать любую настройку (setting) в окне запроса. 
+
 ### clickhouse-cli {#clickhouse-cli}
 
 [clickhouse-cli](https://github.com/hatarist/clickhouse-cli) - это альтернативный клиент командной строки для ClickHouse, написанный на Python 3.
diff --git a/docs/ru/operations/system-tables/replicas.md b/docs/ru/operations/system-tables/replicas.md
index 7879ee707a4..ff58355145d 100644
--- a/docs/ru/operations/system-tables/replicas.md
+++ b/docs/ru/operations/system-tables/replicas.md
@@ -78,10 +78,11 @@ active_replicas:            2
 
 -   `log_max_index` (`UInt64`) - максимальный номер записи в общем логе действий.
 -   `log_pointer` (`UInt64`) - максимальный номер записи из общего лога действий, которую реплика скопировала в свою очередь для выполнения, плюс единица. Если log_pointer сильно меньше log_max_index, значит что-то не так.
--   `last_queue_update` (`DateTime`) - When the queue was updated last time.
--   `absolute_delay` (`UInt64`) - How big lag in seconds the current replica has.
+-   `last_queue_update` (`DateTime`) - время последнего обновления запроса.
+-   `absolute_delay` (`UInt64`) - задержка (в секундах) для текущей реплики.
 -   `total_replicas` (`UInt8`) - общее число известных реплик этой таблицы.
 -   `active_replicas` (`UInt8`) - число реплик этой таблицы, имеющих сессию в ZK; то есть, число работающих реплик.
+-   `replica_is_active` ([Map(String, UInt8)](../../sql-reference/data-types/map.md)) — соответствие между именем реплики и признаком активности реплики.
 
 Если запрашивать все столбцы, то таблица может работать слегка медленно, так как на каждую строчку делается несколько чтений из ZK.
 Если не запрашивать последние 4 столбца (log_max_index, log_pointer, total_replicas, active_replicas), то таблица работает быстро.

From 1c18118ee48c2c976c3c3eac04d14c2b492a0467 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Mon, 13 Sep 2021 09:44:14 +0300
Subject: [PATCH 227/273] client/TestTags.cpp: add missing <cstring>

---
 programs/client/TestTags.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/programs/client/TestTags.cpp b/programs/client/TestTags.cpp
index a953df599dd..f3cb49cdabd 100644
--- a/programs/client/TestTags.cpp
+++ b/programs/client/TestTags.cpp
@@ -1,5 +1,6 @@
 #include "TestTags.h"
 
+#include <cstring>
 
 namespace DB
 {

From f8f8d76fcfb3e4ef4beecde286357a2726514a47 Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Mon, 13 Sep 2021 09:53:38 +0300
Subject: [PATCH 228/273] Fix build

---
 .../static-files-disk-uploader/static-files-disk-uploader.cpp   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/programs/static-files-disk-uploader/static-files-disk-uploader.cpp b/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
index 04f46178c84..ad3a3090de6 100644
--- a/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
+++ b/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
@@ -37,7 +37,7 @@ void processFile(const fs::path & file_path, const fs::path & dst_path, bool tes
     RE2::FullMatch(file_path.string(), EXTRACT_PATH_PATTERN, &remote_path);
     bool is_directory = fs::is_directory(file_path);
 
-    writeText(file_path.filename(), metadata_buf);
+    writeText(file_path.filename().string(), metadata_buf);
     writeChar('\t', metadata_buf);
     writeBoolText(is_directory, metadata_buf);
     if (!is_directory)

From dad02452c82de08762aeada6ec426ad0d838dc77 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Mon, 13 Sep 2021 10:01:32 +0300
Subject: [PATCH 229/273] Apply settings from CREATE AS SELECT queries

---
 src/Interpreters/executeQuery.cpp             | 36 +++++++++++++------
 .../02028_create_select_settings.reference    |  0
 .../02028_create_select_settings.sql          |  1 +
 3 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 tests/queries/0_stateless/02028_create_select_settings.reference
 create mode 100644 tests/queries/0_stateless/02028_create_select_settings.sql

diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index 6f8caf74322..0de919ad4ac 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -352,6 +352,22 @@ static void setQuerySpecificSettings(ASTPtr & ast, ContextMutablePtr context)
     }
 }
 
+static void applySettingsFromSelectWithUnion(const ASTSelectWithUnionQuery & select_with_union, ContextMutablePtr context)
+{
+    const ASTs & children = select_with_union.list_of_selects->children;
+    if (children.empty())
+        return;
+
+    // We might have an arbitrarily complex UNION tree, so just give
+    // up if the last first-order child is not a plain SELECT.
+    // It is flattened later, when we process UNION ALL/DISTINCT.
+    const auto * last_select = children.back()->as<ASTSelectQuery>();
+    if (last_select && last_select->settings())
+    {
+        InterpreterSetQuery(last_select->settings(), context).executeForCurrentContext();
+    }
+}
+
 static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
     const char * begin,
     const char * end,
@@ -408,17 +424,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         }
         else if (const auto * select_with_union_query = ast->as<ASTSelectWithUnionQuery>())
         {
-            if (!select_with_union_query->list_of_selects->children.empty())
-            {
-                // We might have an arbitrarily complex UNION tree, so just give
-                // up if the last first-order child is not a plain SELECT.
-                // It is flattened later, when we process UNION ALL/DISTINCT.
-                const auto * last_select = select_with_union_query->list_of_selects->children.back()->as<ASTSelectQuery>();
-                if (last_select && last_select->settings())
-                {
-                    InterpreterSetQuery(last_select->settings(), context).executeForCurrentContext();
-                }
-            }
+            applySettingsFromSelectWithUnion(*select_with_union_query, context);
         }
         else if (const auto * query_with_output = dynamic_cast<const ASTQueryWithOutput *>(ast.get()))
         {
@@ -432,6 +438,14 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             query_table = query_with_table_output->table;
         }
 
+        if (auto * create_query = ast->as<ASTCreateQuery>())
+        {
+            if (create_query->select)
+            {
+                applySettingsFromSelectWithUnion(create_query->select->as<ASTSelectWithUnionQuery &>(), context);
+            }
+        }
+
         auto * insert_query = ast->as<ASTInsertQuery>();
 
         if (insert_query && insert_query->settings_ast)
diff --git a/tests/queries/0_stateless/02028_create_select_settings.reference b/tests/queries/0_stateless/02028_create_select_settings.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02028_create_select_settings.sql b/tests/queries/0_stateless/02028_create_select_settings.sql
new file mode 100644
index 00000000000..5275d335f53
--- /dev/null
+++ b/tests/queries/0_stateless/02028_create_select_settings.sql
@@ -0,0 +1 @@
+create table test_table engine MergeTree order by a as select a_table.a, b_table.b_arr from (select arrayJoin(range(10000)) as a) a_table cross join (select range(10000) as b_arr) b_table settings max_memory_usage = 1; -- { serverError MEMORY_LIMIT_EXCEEDED }

From 2c0f320fe74eabf75d1c417c0f44d6918cddbf5c Mon Sep 17 00:00:00 2001
From: adevyatova <annaconda@bk.ru>
Date: Mon, 13 Sep 2021 07:54:45 +0000
Subject: [PATCH 230/273] Example

---
 docs/en/interfaces/formats.md        |   8 +++++---
 docs/ru/interfaces/formats.md        |   8 +++++---
 docs/tmp_msgpac_test_all_types.msgpk | Bin 200 -> 0 bytes
 docs/tmp_msgpack.msgpk               | Bin 0 -> 24 bytes
 4 files changed, 10 insertions(+), 6 deletions(-)
 delete mode 100644 docs/tmp_msgpac_test_all_types.msgpk
 create mode 100644 docs/tmp_msgpack.msgpk

diff --git a/docs/en/interfaces/formats.md b/docs/en/interfaces/formats.md
index 32170b4aec7..4c86c8f3c39 100644
--- a/docs/en/interfaces/formats.md
+++ b/docs/en/interfaces/formats.md
@@ -1567,8 +1567,10 @@ ClickHouse supports reading and writing [MessagePack](https://msgpack.org/) data
 
 Example:
 
+Writing to a file ".msgpk":
+
 ```sql
-CREATE TABLE msgpack (uint8 UInt8, uint16 UInt16, uint32 UInt32, uint64 UInt64, int8 Int8, int16 Int16, int32 Int32, int64 Int64, float Float32, double Float64, string String, date Date, datetime DateTime, datetime64 DateTime64, array Array(UInt32)) ENGINE = Memory;
-INSERT INTO msgpack VALUES (255, 65535, 4294967295, 100000000000, -128, -32768, -2147483648, -100000000000, 2.02, 10000.0000001, 'String', 18980, 1639872000, 1639872000000, [1,2,3,4,5]), (4, 1234, 3244467295, 500000000000, -1, -256, -14741221, -7000000000, 100.1, 14321.032141201, 'Another string', 20000, 1839882000, 1639872891123, [5,4,3,2,1]),(42, 42, 42, 42, 42, 42, 42, 42, 42.42, 42.42, '42', 42, 42, 42, [42]);
-SELECT * FROM msgpack INTO OUTFILE 'tmp_msgpac_test_all_types.msgpk' FORMAT MsgPack;
+$ clickhouse-client --query="CREATE TABLE msgpack (array Array(UInt8)) ENGINE = Memory;"
+$ clickhouse-client --query="INSERT INTO msgpack VALUES ([0, 1, 2, 3, 42, 253, 254, 255]), ([255, 254, 253, 42, 3, 2, 1, 0])";
+$ clickhouse-client --query="SELECT * FROM msgpack FORMAT MsgPack" > tmp_msgpack.msgpk;
 ```
\ No newline at end of file
diff --git a/docs/ru/interfaces/formats.md b/docs/ru/interfaces/formats.md
index ea57b3ded13..ce014997034 100644
--- a/docs/ru/interfaces/formats.md
+++ b/docs/ru/interfaces/formats.md
@@ -1481,8 +1481,10 @@ ClickHouse поддерживает запись и чтение из файло
 
 Пример:
 
+Запись в файл ".msgpk":
+
 ```sql
-CREATE TABLE msgpack (uint8 UInt8, uint16 UInt16, uint32 UInt32, uint64 UInt64, int8 Int8, int16 Int16, int32 Int32, int64 Int64, float Float32, double Float64, string String, date Date, datetime DateTime, datetime64 DateTime64, array Array(UInt32)) ENGINE = Memory;
-INSERT INTO msgpack VALUES (255, 65535, 4294967295, 100000000000, -128, -32768, -2147483648, -100000000000, 2.02, 10000.0000001, 'String', 18980, 1639872000, 1639872000000, [1,2,3,4,5]), (4, 1234, 3244467295, 500000000000, -1, -256, -14741221, -7000000000, 100.1, 14321.032141201, 'Another string', 20000, 1839882000, 1639872891123, [5,4,3,2,1]),(42, 42, 42, 42, 42, 42, 42, 42, 42.42, 42.42, '42', 42, 42, 42, [42]);
-SELECT * FROM msgpack INTO OUTFILE 'tmp_msgpac_test_all_types.msgpk' FORMAT MsgPack;
+$ clickhouse-client --query="CREATE TABLE msgpack (array Array(UInt8)) ENGINE = Memory;"
+$ clickhouse-client --query="INSERT INTO msgpack VALUES ([0, 1, 2, 3, 42, 253, 254, 255]), ([255, 254, 253, 42, 3, 2, 1, 0])";
+$ clickhouse-client --query="SELECT * FROM msgpack FORMAT MsgPack" > tmp_msgpack.msgpk;
 ```
\ No newline at end of file
diff --git a/docs/tmp_msgpac_test_all_types.msgpk b/docs/tmp_msgpac_test_all_types.msgpk
deleted file mode 100644
index efefdf32a55f96112d8952e725c2023f9687cde3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 200
zcmX@}|Lp(&=l%o1c?JdsagVYW3>O+MHZWXj0CFz_g<ov%lwdgJ!05j2w8P;Jpy0Iw
z%YsXaGV{{Uda0aC+*if`)W}$S{?7-7sf<j_EUYYNSuUMBn6xAwWMD~FPzS^Ri~kue
z{g)S%2ATIS?no8GDW?<0#-|-l|7ejlem{AgV_tqqMrx5lF~nRyg>$*9;swCwUf}BZ
jJe8G&nTb&g3Qjp`t`j-!;A(oPKStx*A`>H^_(UxL8(vuZ

diff --git a/docs/tmp_msgpack.msgpk b/docs/tmp_msgpack.msgpk
new file mode 100644
index 0000000000000000000000000000000000000000..294ca9e3b4a3e666d2c23156faf421d8de4995e3
GIT binary patch
literal 24
fcmbQiz{td`b>{Dxe`o&BIP)J!{ncV-Vq^dSnlcPc

literal 0
HcmV?d00001


From c23fe5baf683f097b7123c9d32b668f6eaa015b5 Mon Sep 17 00:00:00 2001
From: Filatenkov Artur <58165623+FArthur-cmd@users.noreply.github.com>
Date: Mon, 13 Sep 2021 11:25:36 +0300
Subject: [PATCH 231/273] Improve codec for encr 19896 (#27476)

* change syntax of encrypted command

* commit all encrypted changes

* correct encryption

* correct config for test

* add tests and correct code style and typos

* correct test

* fix unbundled build

* add log warning messages

* improve code according to review comments

* correct nonce

* correct errors found by fuzzing

* improve codec AES_128_GCM_SIV. Add AES_256_GCM_SIV. Add sections for last in tests. Improve documentation

* Update CompressionCodecEncrypted.h

* Update 01683_codec_encrypted.sql

* correct compression factory after changes in master

* correct behavior with wrong key in data

* correct fuzzer

* add connection for fuzzer with fix for compression_encrypted

* refactor code

* add load from config with throwing errors on server start

* fix typos and check style

* Update Server.cpp

* correct loading and reading

* refactor code. fix uninitialized value

* refactor code

* move defines from server to cpp file

* correct build

* remove repeated code

* correct namespace

* fix code style
---
 .../settings.md                               |  78 +-
 programs/server/Server.cpp                    |  44 +-
 programs/server/config.xml                    |  26 +-
 src/Compression/CompressionCodecEncrypted.cpp | 664 +++++++++++++-----
 src/Compression/CompressionCodecEncrypted.h   | 201 +++---
 .../CompressionFactoryAdditions.cpp           |  20 +-
 src/Compression/CompressionInfo.h             |  19 +-
 src/Compression/ICompressionCodec.h           |   2 +-
 .../fuzzers/encrypted_decompress_fuzzer.cpp   | 298 +++++++-
 src/Compression/ya.make                       |   5 +
 tests/config/config.d/encryption.xml          |  12 +-
 .../test_codec_encrypted/__init__.py          |   0
 .../integration/test_codec_encrypted/test.py  |  73 ++
 .../01683_codec_encrypted.reference           |   1 +
 .../0_stateless/01683_codec_encrypted.sql     |   9 +-
 15 files changed, 1102 insertions(+), 350 deletions(-)
 create mode 100644 tests/integration/test_codec_encrypted/__init__.py
 create mode 100644 tests/integration/test_codec_encrypted/test.py

diff --git a/docs/en/operations/server-configuration-parameters/settings.md b/docs/en/operations/server-configuration-parameters/settings.md
index be19f476978..8ad450738b7 100644
--- a/docs/en/operations/server-configuration-parameters/settings.md
+++ b/docs/en/operations/server-configuration-parameters/settings.md
@@ -69,29 +69,85 @@ If no conditions met for a data part, ClickHouse uses the `lz4` compression.
 </compression>
 ```
 
-<!--
 ## encryption {#server-settings-encryption}
 
-Configures a command to obtain a key to be used by [encryption codecs](../../sql-reference/statements/create/table.md#create-query-encryption-codecs). The command, or a shell script, is expected to write a Base64-encoded key of any length to the stdout.
+Configures a command to obtain a key to be used by [encryption codecs](../../sql-reference/statements/create/table.md#create-query-encryption-codecs). Key (or keys) should be written in enviroment variables or be set in configuration file.
+
+Keys can be hex or string. Their length must be equal to 16.
 
 **Example**
 
-For Linux with systemd:
+Load from config:
 
 ```xml
-<encryption>
-    <key_command>/usr/bin/systemd-ask-password --id="clickhouse-server" --timeout=0 "Enter the ClickHouse encryption passphrase:" | base64</key_command>
-</encryption>
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <key>12345567812345678</key>
+    </aes_128_gcm_siv>
+</encryption_codecs>
 ```
 
-For other systems:
+!!! note "NOTE"
+    Storing keys in configuration file is not recommended. It isn't secure. You can move the keys into a separate config file on a secure disk and put a symlink to that config file to `config.d/` folder.
+
+Load from config, when key is in hex:
 
 ```xml
-<encryption>
-    <key_command><![CDATA[IFS=; echo -n >/dev/tty "Enter the ClickHouse encryption passphrase: "; stty=`stty -F /dev/tty -g`; stty -F /dev/tty -echo; read k </dev/tty; stty -F /dev/tty "$stty"; echo -n $k | base64]]></key_command>
-</encryption>
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <key_hex>00112233445566778899aabbccddeeff</key_hex>
+    </aes_128_gcm_siv>
+</encryption_codecs>
 ```
--->
+
+Load key from environment variable:
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <key_hex from_env="KEY"></key_hex>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Where current_key_id sets the current key for encryption, and all specified keys can be used for decryption.
+
+All this methods can be applied for multiple keys:
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <key_hex id="0">00112233445566778899aabbccddeeff</key_hex>
+        <key_hex id="1" from_env=".."></key_hex>
+        <current_key_id>1</current_key_id>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Where `current_key_id` shows current key for encryption.
+
+Also user can add nonce that must be 12 bytes long (by default encryption and decryption will use nonce consisting of zero bytes):
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <nonce>0123456789101</nonce>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Or it can be set in hex:
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <nonce_hex>abcdefabcdef</nonce_hex>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Everything above can be applied for `aes_256_gcm_siv` (but key must be 32 bytes length).
+
 ## custom_settings_prefixes {#custom_settings_prefixes}
 
 List of prefixes for [custom settings](../../operations/settings/index.md#custom_settings). The prefixes must be separated with commas.
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index 0c834174519..2d09495c338 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -79,6 +79,7 @@
 #include <Server/ProtocolServerAdapter.h>
 #include <Server/HTTP/HTTPServer.h>
 #include <filesystem>
+#include <Compression/CompressionCodecEncrypted.h>
 
 #if !defined(ARCADIA_BUILD)
 #   include "config_core.h"
@@ -251,7 +252,6 @@ namespace ErrorCodes
     extern const int SUPPORT_IS_DISABLED;
     extern const int ARGUMENT_OUT_OF_BOUND;
     extern const int EXCESSIVE_ELEMENT_IN_CONFIG;
-    extern const int INCORRECT_DATA;
     extern const int INVALID_CONFIG_PARAMETER;
     extern const int SYSTEM_ERROR;
     extern const int FAILED_TO_GETPWUID;
@@ -456,40 +456,6 @@ void checkForUsersNotInMainConfig(
     }
 }
 
-static void loadEncryptionKey(const std::string & key_command [[maybe_unused]], Poco::Logger * log)
-{
-#if USE_BASE64 && USE_SSL && USE_INTERNAL_SSL_LIBRARY
-
-    auto process = ShellCommand::execute(key_command);
-
-    std::string b64_key;
-    readStringUntilEOF(b64_key, process->out);
-    process->wait();
-
-    // turbob64 doesn't like whitespace characters in input. Strip
-    // them before decoding.
-    std::erase_if(b64_key, [](char c)
-    {
-        return c == ' ' || c == '\t' || c == '\r' || c == '\n';
-    });
-
-    std::vector<char> buf(b64_key.size());
-    const size_t key_size = tb64dec(reinterpret_cast<const unsigned char *>(b64_key.data()), b64_key.size(),
-                                    reinterpret_cast<unsigned char *>(buf.data()));
-    if (!key_size)
-        throw Exception("Failed to decode encryption key", ErrorCodes::INCORRECT_DATA);
-    else if (key_size < 16)
-        LOG_WARNING(log, "The encryption key should be at least 16 octets long.");
-
-    const std::string_view key = std::string_view(buf.data(), key_size);
-    CompressionCodecEncrypted::setMasterKey(key);
-
-#else
-    LOG_WARNING(log, "Server was built without Base64 or SSL support. Encryption is disabled.");
-#endif
-}
-
-
 [[noreturn]] void forceShutdown()
 {
 #if defined(THREAD_SANITIZER) && defined(OS_LINUX)
@@ -904,6 +870,8 @@ if (ThreadFuzzer::instance().isEffective())
 
             global_context->updateStorageConfiguration(*config);
             global_context->updateInterserverCredentials(*config);
+
+            CompressionCodecEncrypted::Configuration::instance().tryLoad(*config, "encryption_codecs");
         },
         /* already_loaded = */ false);  /// Reload it right now (initial loading)
 
@@ -976,9 +944,9 @@ if (ThreadFuzzer::instance().isEffective())
     global_context->getMergeTreeSettings().sanityCheck(settings);
     global_context->getReplicatedMergeTreeSettings().sanityCheck(settings);
 
-    /// Set up encryption.
-    if (config().has("encryption.key_command"))
-        loadEncryptionKey(config().getString("encryption.key_command"), log);
+
+    /// try set up encryption. There are some errors in config, error will be printed and server wouldn't start.
+    CompressionCodecEncrypted::Configuration::instance().load(config(), "encryption_codecs");
 
     Poco::Timespan keep_alive_timeout(config().getUInt("keep_alive_timeout", 10), 0);
 
diff --git a/programs/server/config.xml b/programs/server/config.xml
index b8ef17458be..6c98ac740fe 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -1026,10 +1026,28 @@
          defined, or encryption codecs will be disabled otherwise. The
          command is executed through /bin/sh and is expected to write
          a Base64-encoded key to the stdout. -->
-    <encryption>
-        <!-- <key_command>/usr/bin/systemd-ask-password &#45;&#45;id="clickhouse-server" &#45;&#45;timeout=0 "Enter the ClickHouse encryption passphrase:" | base64</key_command> -->
-        <!-- <key_command><![CDATA[IFS=; echo -n >/dev/tty "Enter the ClickHouse encryption passphrase: "; stty=`stty -F /dev/tty -g`; stty -F /dev/tty -echo; read k </dev/tty; stty -F /dev/tty "$stty"; echo -n $k | base64]]></key_command> -->
-    </encryption>
+    <encryption_codecs>
+        <!-- aes_128_gcm_siv -->
+            <!-- Example of getting hex key from env -->
+            <!-- the code should use this key and throw an exception if its length is not 16 bytes -->
+            <!--key_hex from_env="..."></key_hex -->
+
+            <!-- Example of multiple hex keys. They can be imported from env or be written down in config-->
+            <!-- the code should use these keys and throw an exception if their length is not 16 bytes -->
+            <!-- key_hex id="0">...</key_hex -->
+            <!-- key_hex id="1" from_env=".."></key_hex -->
+            <!-- key_hex id="2">...</key_hex -->
+            <!-- current_key_id>2</current_key_id -->
+
+            <!-- Example of getting hex key from config -->
+            <!-- the code should use this key and throw an exception if its length is not 16 bytes -->
+            <!-- key>...</key -->
+
+            <!-- example of adding nonce -->
+            <!-- nonce>...</nonce -->
+
+        <!-- /aes_128_gcm_siv -->
+    </encryption_codecs>
 
     <!-- Allow to execute distributed DDL queries (CREATE, DROP, ALTER, RENAME) on cluster.
          Works only if ZooKeeper is enabled. Comment it if such functionality isn't required. -->
diff --git a/src/Compression/CompressionCodecEncrypted.cpp b/src/Compression/CompressionCodecEncrypted.cpp
index 7d667fbc1b7..d35411d6266 100644
--- a/src/Compression/CompressionCodecEncrypted.cpp
+++ b/src/Compression/CompressionCodecEncrypted.cpp
@@ -1,215 +1,553 @@
 #if !defined(ARCADIA_BUILD)
 #    include <Common/config.h>
 #endif
+#include "Common/Exception.h"
+#include "common/types.h"
+#include "IO/VarInt.h"
 #include <Compression/CompressionFactory.h>
-#if USE_SSL && USE_INTERNAL_SSL_LIBRARY
-
 #include <Compression/CompressionCodecEncrypted.h>
+#include <Poco/Logger.h>
+#include <common/logger_useful.h>
+#include <Common/ErrorCodes.h>
+
+// This depends on BoringSSL-specific API, notably <openssl/aead.h>.
+#if USE_SSL && USE_INTERNAL_SSL_LIBRARY
 #include <Parsers/ASTLiteral.h>
-#include <cassert>
 #include <openssl/digest.h> // Y_IGNORE
 #include <openssl/err.h>
-#include <openssl/hkdf.h> // Y_IGNORE
-#include <string_view>
+#include <boost/algorithm/hex.hpp>
+#include <openssl/aead.h> // Y_IGNORE
+#endif
 
+// Common part for both parts (with SSL and without)
 namespace DB
 {
-    namespace ErrorCodes
+
+namespace ErrorCodes
+{
+    extern const int OPENSSL_ERROR;
+}
+
+namespace
+{
+
+/// Get string name for method. Return empty string for undefined Method
+String getMethodName(EncryptionMethod Method)
+{
+    if (Method == AES_128_GCM_SIV)
     {
-        extern const int ILLEGAL_CODEC_PARAMETER;
-        extern const int ILLEGAL_SYNTAX_FOR_CODEC_TYPE;
-        extern const int NO_ELEMENTS_IN_CONFIG;
-        extern const int OPENSSL_ERROR;
+        return "AES_128_GCM_SIV";
     }
-
-    void CompressionCodecEncrypted::setMasterKey(const std::string_view & master_key)
+    else if (Method == AES_256_GCM_SIV)
     {
-        keys.emplace(master_key);
+        return "AES_256_GCM_SIV";
     }
-
-    CompressionCodecEncrypted::KeyHolder::KeyHolder(const std::string_view & master_key)
+    else
     {
-        // Derive a key from it.
-        keygen_key = deriveKey(master_key);
-
-        // EVP_AEAD_CTX is not stateful so we can create an
-        // instance now.
-        EVP_AEAD_CTX_zero(&ctx);
-        const int ok = EVP_AEAD_CTX_init(&ctx, EVP_aead_aes_128_gcm(),
-                                         reinterpret_cast<const uint8_t*>(keygen_key.data()), keygen_key.size(),
-                                         16 /* tag size */, nullptr);
-        if (!ok)
-            throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
+        return "";
     }
+}
 
-    CompressionCodecEncrypted::KeyHolder::~KeyHolder()
+/// Get method code (used for codec, to understand which one we are using)
+uint8_t getMethodCode(EncryptionMethod Method)
+{
+    if (Method == AES_128_GCM_SIV)
     {
-        EVP_AEAD_CTX_cleanup(&ctx);
+        return uint8_t(CompressionMethodByte::AES_128_GCM_SIV);
     }
-
-    const CompressionCodecEncrypted::KeyHolder & CompressionCodecEncrypted::getKeys()
+    else if (Method == AES_256_GCM_SIV)
     {
-        if (keys)
-            return *keys;
-        else
-            throw Exception("There is no configuration for encryption in the server config",
-                            ErrorCodes::NO_ELEMENTS_IN_CONFIG);
+        return uint8_t(CompressionMethodByte::AES_256_GCM_SIV);
     }
-
-    CompressionCodecEncrypted::CompressionCodecEncrypted(const std::string_view & cipher)
+    else
     {
-        setCodecDescription("Encrypted", {std::make_shared<ASTLiteral>(cipher)});
+        throw Exception("Wrong encryption Method. Got " + getMethodName(Method), ErrorCodes::BAD_ARGUMENTS);
     }
+}
 
-    uint8_t CompressionCodecEncrypted::getMethodByte() const
+} // end of namespace
+
+} // end of namespace DB
+
+#if USE_SSL && USE_INTERNAL_SSL_LIBRARY
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_SYNTAX_FOR_CODEC_TYPE;
+    extern const int LOGICAL_ERROR;
+    extern const int BAD_ARGUMENTS;
+    extern const int INCORRECT_DATA;
+}
+
+namespace
+{
+constexpr size_t tag_size        = 16;   /// AES-GCM-SIV always uses a tag of 16 bytes length
+constexpr size_t key_id_max_size = 8;    /// Max size of varint.
+constexpr size_t nonce_max_size  = 13;   /// Nonce size and one byte to show if nonce in in text
+
+/// Get encryption/decryption algorithms.
+auto getMethod(EncryptionMethod Method)
+{
+    if (Method == AES_128_GCM_SIV)
     {
-        return static_cast<uint8_t>(CompressionMethodByte::Encrypted);
+        return EVP_aead_aes_128_gcm_siv;
     }
-
-    void CompressionCodecEncrypted::updateHash(SipHash & hash) const
+    else if (Method == AES_256_GCM_SIV)
     {
-        getCodecDesc()->updateTreeHash(hash);
+        return EVP_aead_aes_256_gcm_siv;
     }
-
-    UInt32 CompressionCodecEncrypted::getMaxCompressedDataSize(UInt32 uncompressed_size) const
+    else
     {
-        // The GCM mode is a stream cipher. No paddings are
-        // involved. There will be a tag at the end of ciphertext (16
-        // octets).
-        return uncompressed_size + 16;
+        throw Exception("Wrong encryption Method. Got " + getMethodName(Method), ErrorCodes::BAD_ARGUMENTS);
     }
+}
 
-    UInt32 CompressionCodecEncrypted::doCompressData(const char * source, UInt32 source_size, char * dest) const
+/// Find out key size for each algorithm
+UInt64 methodKeySize(EncryptionMethod Method)
+{
+    if (Method == AES_128_GCM_SIV)
     {
-        // Generate an IV out of the data block and the key-generation
-        // key. It is completely deterministic, but does not leak any
-        // information about the data block except for equivalence of
-        // identical blocks (under the same master key). The IV will
-        // be used as an authentication tag. The ciphertext and the
-        // tag will be written directly in the dest buffer.
-        const std::string_view plaintext = std::string_view(source, source_size);
-
-        encrypt(plaintext, dest);
-        return source_size + 16;
+        return 16;
     }
-
-    void CompressionCodecEncrypted::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size [[maybe_unused]]) const
+    else if (Method == AES_256_GCM_SIV)
     {
-        // Extract the IV from the encrypted data block. Decrypt the
-        // block with the extracted IV, and compare the tag. Throw an
-        // exception if tags don't match.
-        const std::string_view ciphertext_and_tag = std::string_view(source, source_size);
-        assert(ciphertext_and_tag.size() == uncompressed_size + 16);
-
-        decrypt(ciphertext_and_tag, dest);
+        return 32;
     }
-
-    std::string CompressionCodecEncrypted::lastErrorString()
+    else
     {
-        std::array<char, 1024> buffer{};
-        ERR_error_string_n(ERR_get_error(), buffer.data(), buffer.size());
-        return std::string(buffer.data());
+        throw Exception("Wrong encryption Method. Got " + getMethodName(Method), ErrorCodes::BAD_ARGUMENTS);
     }
+}
 
-    std::string CompressionCodecEncrypted::deriveKey(const std::string_view & master_key)
+std::string lastErrorString()
+{
+    std::array<char, 1024> buffer;
+    ERR_error_string_n(ERR_get_error(), buffer.data(), buffer.size());
+    return std::string(buffer.data());
+}
+
+/// Encrypt plaintext with particular algorithm and put result into ciphertext_and_tag.
+/// This function get key and nonce and encrypt text with their help.
+/// If something went wrong (can't init context or can't encrypt data) it throws exception.
+/// It returns length of encrypted text.
+size_t encrypt(const std::string_view & plaintext, char * ciphertext_and_tag, EncryptionMethod method, const String & key, const String & nonce)
+{
+    /// Init context for encryption, using key.
+    EVP_AEAD_CTX encrypt_ctx;
+    EVP_AEAD_CTX_zero(&encrypt_ctx);
+    const int ok_init = EVP_AEAD_CTX_init(&encrypt_ctx, getMethod(method)(),
+                                            reinterpret_cast<const uint8_t*>(key.data()), key.size(),
+                                            16 /* tag size */, nullptr);
+    if (!ok_init)
+        throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
+
+    /// encrypt data using context and given nonce.
+    size_t out_len;
+    const int ok_open = EVP_AEAD_CTX_seal(&encrypt_ctx,
+                                            reinterpret_cast<uint8_t *>(ciphertext_and_tag),
+                                            &out_len, plaintext.size() + 16,
+                                            reinterpret_cast<const uint8_t *>(nonce.data()), nonce.size(),
+                                            reinterpret_cast<const uint8_t *>(plaintext.data()), plaintext.size(),
+                                            nullptr, 0);
+    if (!ok_open)
+        throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
+
+    return out_len;
+}
+
+/// Encrypt plaintext with particular algorithm and put result into ciphertext_and_tag.
+/// This function get key and nonce and encrypt text with their help.
+/// If something went wrong (can't init context or can't encrypt data) it throws exception.
+/// It returns length of encrypted text.
+size_t decrypt(const std::string_view & ciphertext, char * plaintext, EncryptionMethod method, const String & key, const String & nonce)
+{
+    /// Init context for decryption with given key.
+    EVP_AEAD_CTX decrypt_ctx;
+    EVP_AEAD_CTX_zero(&decrypt_ctx);
+
+    const int ok_init = EVP_AEAD_CTX_init(&decrypt_ctx, getMethod(method)(),
+                                          reinterpret_cast<const uint8_t*>(key.data()), key.size(),
+                                          16 /* tag size */, nullptr);
+    if (!ok_init)
+        throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
+
+    /// decrypt data using given nonce
+    size_t out_len;
+    const int ok_open = EVP_AEAD_CTX_open(&decrypt_ctx,
+                                          reinterpret_cast<uint8_t *>(plaintext),
+                                          &out_len, ciphertext.size(),
+                                          reinterpret_cast<const uint8_t *>(nonce.data()), nonce.size(),
+                                          reinterpret_cast<const uint8_t *>(ciphertext.data()), ciphertext.size(),
+                                          nullptr, 0);
+    if (!ok_open)
+        throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
+
+    return out_len;
+}
+
+/// Register codec in factory
+void registerEncryptionCodec(CompressionCodecFactory & factory, EncryptionMethod Method)
+{
+    const auto method_code = getMethodCode(Method); /// Codec need to know its code
+    factory.registerCompressionCodec(getMethodName(Method), method_code, [&, Method](const ASTPtr & arguments) -> CompressionCodecPtr
     {
-        /// No salt: derive keys in a deterministic manner.
-        std::string_view salt(""); // NOLINT
-        std::string_view info("Codec Encrypted('AES-128-GCM-SIV') key generation key");
-        std::array<char, 32> result;
-
-        const int ok = HKDF(reinterpret_cast<uint8_t *>(result.data()), result.size(),
-                            EVP_sha256(),
-                            reinterpret_cast<const uint8_t *>(master_key.data()), master_key.size(),
-                            reinterpret_cast<const uint8_t *>(salt.data()), salt.size(),
-                            reinterpret_cast<const uint8_t *>(info.data()), info.size());
-        if (!ok)
-            throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
-
-        return std::string(result.data(), 16);
-    }
-
-    void CompressionCodecEncrypted::encrypt(const std::string_view & plaintext, char * ciphertext_and_tag)
-    {
-        // Fixed nonce. Yes this is unrecommended, but we have to live
-        // with it.
-        std::string_view nonce("\0\0\0\0\0\0\0\0\0\0\0\0", 12);
-
-        size_t out_len;
-        const int ok = EVP_AEAD_CTX_seal(&getKeys().ctx,
-                                         reinterpret_cast<uint8_t *>(ciphertext_and_tag),
-                                         &out_len, plaintext.size() + 16,
-                                         reinterpret_cast<const uint8_t *>(nonce.data()), nonce.size(),
-                                         reinterpret_cast<const uint8_t *>(plaintext.data()), plaintext.size(),
-                                         nullptr, 0);
-        if (!ok)
-            throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
-
-        assert(out_len == plaintext.size() + 16);
-    }
-
-    void CompressionCodecEncrypted::decrypt(const std::string_view & ciphertext, char * plaintext)
-    {
-        std::string_view nonce("\0\0\0\0\0\0\0\0\0\0\0\0", 12);
-
-        size_t out_len;
-        const int ok = EVP_AEAD_CTX_open(&getKeys().ctx,
-                                         reinterpret_cast<uint8_t *>(plaintext),
-                                         &out_len, ciphertext.size(),
-                                         reinterpret_cast<const uint8_t *>(nonce.data()), nonce.size(),
-                                         reinterpret_cast<const uint8_t *>(ciphertext.data()), ciphertext.size(),
-                                         nullptr, 0);
-        if (!ok)
-            throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
-
-        assert(out_len == ciphertext.size() - 16);
-    }
-
-    void registerCodecEncrypted(CompressionCodecFactory & factory)
-    {
-        const auto method_code = uint8_t(CompressionMethodByte::Encrypted);
-        factory.registerCompressionCodec("Encrypted", method_code, [&](const ASTPtr & arguments) -> CompressionCodecPtr
+        if (arguments)
         {
-            if (arguments)
-            {
-                if (arguments->children.size() != 1)
-                    throw Exception("Codec Encrypted() must have 1 parameter, given " +
-                                    std::to_string(arguments->children.size()),
-                                    ErrorCodes::ILLEGAL_SYNTAX_FOR_CODEC_TYPE);
+            if (!arguments->children.empty())
+                throw Exception("Codec " + getMethodName(Method) + " must not have parameters, given " +
+                                std::to_string(arguments->children.size()),
+                                ErrorCodes::ILLEGAL_SYNTAX_FOR_CODEC_TYPE);
+        }
+        return std::make_shared<CompressionCodecEncrypted>(Method);
+    });
+}
 
-                const auto children = arguments->children;
-                const auto * literal = children[0]->as<ASTLiteral>();
-                if (!literal)
-                    throw Exception("Wrong argument for codec Encrypted(). Expected a string literal",
-                                    ErrorCodes::ILLEGAL_SYNTAX_FOR_CODEC_TYPE);
-
-                const String cipher = literal->value.safeGet<String>();
-                if (cipher == "AES-128-GCM-SIV")
-                    return std::make_shared<CompressionCodecEncrypted>(cipher);
-                else
-                    throw Exception("Cipher '" + cipher + "' is not supported",
-                                    ErrorCodes::ILLEGAL_CODEC_PARAMETER);
-            }
-            else
-            {
-                /* The factory is asking us to construct the codec
-                 * only from the method code. How can that be
-                 * possible? For now we only support a single cipher
-                 * so it's not really a problem, but if we were to
-                 * support more ciphers it would be catastrophic. */
-                return std::make_shared<CompressionCodecEncrypted>("AES-128-GCM-SIV");
-            }
-        });
+String unhexKey(const String & hex)
+{
+    try
+    {
+        return boost::algorithm::unhex(hex);
     }
+    catch (const std::exception &)
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot read key_hex, check for valid characters [0-9a-fA-F] and length");
+    }
+}
+
+/// Firstly, write a byte, which shows if the nonce will be put in text (if it was defined in config)
+/// Secondly, write nonce in text (this step depends from first step)
+/// return new position to write
+inline char* writeNonce(const String& nonce, char* dest)
+{
+    /// If nonce consists of nul bytes, it shouldn't be in dest. Zero byte is the only byte that should be written.
+    /// Otherwise, 1 is written and data from nonce is copied
+    if (nonce != String("\0\0\0\0\0\0\0\0\0\0\0\0", 12))
+    {
+        *dest = 1;
+        ++dest;
+        size_t copied_symbols = nonce.copy(dest, nonce.size());
+        if (copied_symbols != nonce.size())
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Can't copy nonce into destination. Count of copied symbols {}, need to copy {}", copied_symbols, nonce.size());
+        dest += copied_symbols;
+        return dest;
+    }
+    else
+    {
+        *dest = 0;
+        return ++dest;
+    }
+}
+
+/// Firstly, read a byte, which shows if the nonce will be put in text (if it was defined in config)
+/// Secondly, read nonce in text (this step depends from first step)
+/// return new position to read
+inline const char* readNonce(String& nonce, const char* source)
+{
+    /// If first is zero byte: move source and set zero-bytes nonce
+    if (!*source)
+    {
+        nonce = {"\0\0\0\0\0\0\0\0\0\0\0\0", 12};
+        return ++source;
+    }
+    /// Move to next byte. Nonce will begin from there
+    ++source;
+
+    /// Otherwise, use data from source in nonce
+    nonce = {source, 12};
+    source += 12;
+    return source;
+}
+
+}
+
+CompressionCodecEncrypted::Configuration & CompressionCodecEncrypted::Configuration::instance()
+{
+    static CompressionCodecEncrypted::Configuration ret;
+    return ret;
+}
+
+void CompressionCodecEncrypted::Configuration::loadImpl(
+    const Poco::Util::AbstractConfiguration & config, const String & config_prefix, EncryptionMethod method, std::unique_ptr<Params> & new_params)
+{
+    // if method is not smaller than MAX_ENCRYPTION_METHOD it is incorrect
+    if (method >= MAX_ENCRYPTION_METHOD)
+        throw Exception("Wrong argument for loading configurations.", ErrorCodes::BAD_ARGUMENTS);
+
+    /// Scan all keys in config and add them into storage. If key is in hex, transform it.
+    /// Remember key ID for each key, because it will be used in encryption/decryption
+    Strings config_keys;
+    config.keys(config_prefix, config_keys);
+    for (const std::string & config_key : config_keys)
+    {
+        String key;
+        UInt64 key_id;
+
+        if ((config_key == "key") || config_key.starts_with("key["))
+        {
+            key = config.getString(config_prefix + "." + config_key, "");
+            key_id = config.getUInt64(config_prefix + "." + config_key + "[@id]", 0);
+        }
+        else if ((config_key == "key_hex") || config_key.starts_with("key_hex["))
+        {
+            key = unhexKey(config.getString(config_prefix + "." + config_key, ""));
+            key_id = config.getUInt64(config_prefix + "." + config_key + "[@id]", 0);
+        }
+        else
+            continue;
+
+        /// For each key its id should be unique.
+        if (new_params->keys_storage[method].contains(key_id))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Multiple keys have the same ID {}", key_id);
+
+        /// Check size of key. Its length depends on encryption algorithm.
+        if (key.size() != methodKeySize(method))
+            throw Exception(
+                ErrorCodes::BAD_ARGUMENTS,
+                "Got an encryption key with unexpected size {}, the size should be {}",
+                key.size(), methodKeySize(method));
+
+        new_params->keys_storage[method][key_id] = key;
+    }
+
+    /// Check that we have at least one key for this method (otherwise it is incorrect to use it).
+    if (new_params->keys_storage[method].empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "No keys, an encryption needs keys to work");
+
+    /// Try to find which key will be used for encryption. If there is no current_key,
+    /// first key will be used for encryption (its index equals to zero).
+    new_params->current_key_id[method] = config.getUInt64(config_prefix + ".current_key_id", 0);
+
+    /// Check that we have current key. Otherwise config is incorrect.
+    if (!new_params->keys_storage[method].contains(new_params->current_key_id[method]))
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Not found a key with the current ID {}", new_params->current_key_id[method]);
+
+    /// Read nonce (in hex or in string). Its length should be 12 bytes.
+    if (config.has(config_prefix + ".nonce_hex"))
+        new_params->nonce[method] = unhexKey(config.getString(config_prefix + ".nonce_hex"));
+    else
+        new_params->nonce[method] = config.getString(config_prefix + ".nonce", "");
+
+    if (new_params->nonce[method].size() != 12 && !new_params->nonce[method].empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Got nonce with unexpected size {}, the size should be 12", new_params->nonce[method].size());
+}
+
+bool CompressionCodecEncrypted::Configuration::tryLoad(const Poco::Util::AbstractConfiguration & config, const String & config_prefix)
+{
+    /// Try to create new parameters and fill them from config.
+    /// If there will be some errors, print their message to notify user that
+    /// something went wrong and new parameters are not available
+    try
+    {
+        load(config, config_prefix);
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+        return false;
+    }
+    return true;
+}
+
+void CompressionCodecEncrypted::Configuration::load(const Poco::Util::AbstractConfiguration & config, const String & config_prefix)
+{
+    /// Try to create new parameters and fill them from config.
+    /// If there will be some errors, throw error
+    std::unique_ptr<Params> new_params(new Params);
+    if (config.has(config_prefix + ".aes_128_gcm_siv"))
+    {
+        loadImpl(config, config_prefix + ".aes_128_gcm_siv", AES_128_GCM_SIV, new_params);
+    }
+    if (config.has(config_prefix + ".aes_256_gcm_siv"))
+    {
+        loadImpl(config, config_prefix + ".aes_256_gcm_siv", AES_256_GCM_SIV, new_params);
+    }
+
+    params.set(std::move(new_params));
+}
+
+void CompressionCodecEncrypted::Configuration::getCurrentKeyAndNonce(EncryptionMethod method, UInt64 & current_key_id, String &current_key, String & nonce) const
+{
+    /// It parameters were not set, throw exception
+    if (!params.get())
+        throw Exception("Empty params in CompressionCodecEncrypted configuration", ErrorCodes::BAD_ARGUMENTS);
+
+    /// Save parameters in variable, because they can always change.
+    /// As this function not atomic, we should be certain that we get information from one particular version for correct work.
+    const auto current_params = params.get();
+    current_key_id = current_params->current_key_id[method];
+
+    /// As parameters can be created empty, we need to check that this key is available.
+    if (current_params->keys_storage[method].contains(current_key_id))
+        current_key = current_params->keys_storage[method].at(current_key_id);
+    else
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no current_key {} in config. Please, put it in config and reload.", current_key_id);
+
+    /// If there is no nonce in config, we need to generate particular one,
+    /// because all encryptions should have nonce and random nonce generation will lead to cases
+    /// when nonce after config reload (nonce is not defined in config) will differ from previously generated one.
+    /// This will lead to data loss.
+    nonce = current_params->nonce[method];
+    if (nonce.empty())
+        nonce = {"\0\0\0\0\0\0\0\0\0\0\0\0", 12};
+}
+
+String CompressionCodecEncrypted::Configuration::getKey(EncryptionMethod method, const UInt64 & key_id) const
+{
+    String key;
+    /// See description of previous finction, logic is the same.
+    if (!params.get())
+        throw Exception("Empty params in CompressionCodecEncrypted configuration", ErrorCodes::BAD_ARGUMENTS);
+
+    const auto current_params = params.get();
+
+    /// check if there is current key in storage
+    if (current_params->keys_storage[method].contains(key_id))
+        key = current_params->keys_storage[method].at(key_id);
+    else
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no key {} in config", key_id);
+
+    return key;
+}
+
+
+CompressionCodecEncrypted::CompressionCodecEncrypted(EncryptionMethod Method): encryption_method(Method)
+{
+    setCodecDescription(getMethodName(encryption_method));
+}
+
+uint8_t CompressionCodecEncrypted::getMethodByte() const
+{
+    return getMethodCode(encryption_method);
+}
+
+void CompressionCodecEncrypted::updateHash(SipHash & hash) const
+{
+    getCodecDesc()->updateTreeHash(hash);
+}
+
+UInt32 CompressionCodecEncrypted::getMaxCompressedDataSize(UInt32 uncompressed_size) const
+{
+    // The GCM mode is a stream cipher. No paddings are
+    // involved. There will be a tag at the end of ciphertext (16
+    // octets). Also it has not more than 8 bytes for key_id in the beginning
+    // KeyID is followed by byte, that shows if nonce was set in config (and also will be put into data)
+    // and 12 bytes nonce or this byte will be equal to zero and no nonce will follow it.
+    return uncompressed_size + tag_size + key_id_max_size + nonce_max_size;
+}
+
+UInt32 CompressionCodecEncrypted::doCompressData(const char * source, UInt32 source_size, char * dest) const
+{
+    // Generate an IV out of the data block and the key-generation
+    // key. It is completely deterministic, but does not leak any
+    // information about the data block except for equivalence of
+    // identical blocks (under the same key).
+
+    const std::string_view plaintext = std::string_view(source, source_size);
+
+    /// Get key and nonce for encryption
+    UInt64 current_key_id;
+    String current_key, nonce;
+    Configuration::instance().getCurrentKeyAndNonce(encryption_method, current_key_id, current_key, nonce);
+
+    /// Write current key id to support multiple keys.
+    /// (key id in the beginning will help to decrypt data after changing current key)
+    char* ciphertext_with_nonce = writeVarUInt(current_key_id, dest);
+    size_t keyid_size = ciphertext_with_nonce - dest;
+
+    /// write nonce in data. This will help to read data even after changing nonce in config
+    /// If there were no nonce in data, one zero byte will be written
+    char* ciphertext = writeNonce(nonce, ciphertext_with_nonce);
+    UInt64 nonce_size = ciphertext - ciphertext_with_nonce;
+
+    // The IV will be used as an authentication tag. The ciphertext and the
+    // tag will be written directly in the dest buffer.
+    size_t out_len = encrypt(plaintext, ciphertext, encryption_method, current_key, nonce);
+
+    /// Length of encrypted text should be equal to text length plus tag_size (which was added by algorithm).
+    if (out_len != source_size + tag_size)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't encrypt data, length after encryption {} is wrong, expected {}", out_len, source_size + tag_size);
+
+    return out_len + keyid_size + nonce_size;
+}
+
+void CompressionCodecEncrypted::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
+{
+    /// The key is needed for decrypting. That's why it is read at the beginning of process.
+    UInt64 key_id;
+    const char * ciphertext_with_nonce = readVarUInt(key_id, source, source_size);
+
+    /// Size of text should be decreased by key_size, because key_size bytes were not participating in encryption process.
+    size_t keyid_size = ciphertext_with_nonce - source;
+    String nonce;
+    String key = Configuration::instance().getKey(encryption_method, key_id);
+
+    /// try to read nonce from file (if it was set while encrypting)
+    const char * ciphertext = readNonce(nonce, ciphertext_with_nonce);
+
+    /// Size of text should be decreased by nonce_size, because nonce_size bytes were not participating in encryption process.
+    UInt64 nonce_size = ciphertext - ciphertext_with_nonce;
+
+    /// Count text size (nonce and key_id was read from source)
+    size_t ciphertext_size = source_size - keyid_size - nonce_size;
+    if (ciphertext_size != uncompressed_size + tag_size)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't decrypt data, uncompressed_size {} is wrong, expected {}", uncompressed_size, ciphertext_size - tag_size);
+
+
+    size_t out_len = decrypt({ciphertext, ciphertext_size}, dest, encryption_method, key, nonce);
+    if (out_len != ciphertext_size - tag_size)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't decrypt data, out length after decryption {} is wrong, expected {}", out_len, ciphertext_size - tag_size);
+}
+
 }
 
 #else /* USE_SSL && USE_INTERNAL_SSL_LIBRARY */
 
 namespace DB
 {
-    void registerCodecEncrypted(CompressionCodecFactory &)
-    {
-    }
+
+namespace
+{
+
+/// Register codec in factory
+void registerEncryptionCodec(CompressionCodecFactory & factory, EncryptionMethod Method)
+{
+    auto throw_no_ssl = [](const ASTPtr &) -> CompressionCodecPtr { throw Exception(ErrorCodes::OPENSSL_ERROR, "Server was built without SSL support. Encryption is disabled."); };
+    const auto method_code = getMethodCode(Method); /// Codec need to know its code
+    factory.registerCompressionCodec(getMethodName(Method), method_code, throw_no_ssl);
+}
+
+}
+
+CompressionCodecEncrypted::Configuration & CompressionCodecEncrypted::Configuration::instance()
+{
+    static CompressionCodecEncrypted::Configuration ret;
+    return ret;
+}
+
+/// if encryption is disabled.
+bool CompressionCodecEncrypted::Configuration::tryLoad(const Poco::Util::AbstractConfiguration & config [[maybe_unused]], const String & config_prefix [[maybe_unused]])
+{
+    return false;
+}
+
+/// if encryption is disabled, print warning about this.
+void CompressionCodecEncrypted::Configuration::load(const Poco::Util::AbstractConfiguration & config [[maybe_unused]], const String & config_prefix [[maybe_unused]])
+{
+    LOG_WARNING(&Poco::Logger::get("CompressionCodecEncrypted"), "Server was built without SSL support. Encryption is disabled.");
+}
+
 }
 
 #endif /* USE_SSL && USE_INTERNAL_SSL_LIBRARY */
+
+namespace DB
+{
+/// Register codecs for all algorithms
+void registerCodecEncrypted(CompressionCodecFactory & factory)
+{
+    registerEncryptionCodec(factory, AES_128_GCM_SIV);
+    registerEncryptionCodec(factory, AES_256_GCM_SIV);
+}
+}
diff --git a/src/Compression/CompressionCodecEncrypted.h b/src/Compression/CompressionCodecEncrypted.h
index cef9b2e6072..7869e4d7194 100644
--- a/src/Compression/CompressionCodecEncrypted.h
+++ b/src/Compression/CompressionCodecEncrypted.h
@@ -1,109 +1,138 @@
 #pragma once
 
-// This depends on BoringSSL-specific API, notably <openssl/aead.h>.
-#include <Common/config.h>
-#if USE_SSL && USE_INTERNAL_SSL_LIBRARY && !defined(ARCADIA_BUILD)
-
+#if !defined(ARCADIA_BUILD)
+#include <string_view>
+#include <unordered_map>
+#include <common/types.h>
 #include <Compression/ICompressionCodec.h>
-#include <boost/noncopyable.hpp>
-#include <openssl/aead.h> // Y_IGNORE
-#include <optional>
+#include <Poco/Util/LayeredConfiguration.h>
+#include <Common/MultiVersion.h>
 
 namespace DB
 {
-    /** This codec encrypts and decrypts blocks with AES-128 in
-      * GCM-SIV mode (RFC-8452), which is the only cipher currently
-      * supported. Although it is implemented as a compression codec
-      * it doesn't actually compress data. In fact encrypted data will
-      * no longer be compressible in any meaningful way. This means if
-      * you want to apply both compression and encryption to your
-      * columns, you need to put this codec at the end of the chain
-      * like "column Int32 Codec(Delta, LZ4,
-      * Encrypted('AES-128-GCM-SIV'))".
-      *
-      * The key is obtained by executing a command specified in the
-      * configuration file at startup, and if it doesn't specify a
-      * command the codec refuses to process any data. The command is
-      * expected to write a Base64-encoded key of any length, and we
-      * apply HKDF-SHA-256 to derive a 128-bit key-generation key
-      * (only the first half of the result is used). We then encrypt
-      * blocks in AES-128-GCM-SIV with a universally fixed nonce (12
-      * repeated NUL characters).
-      *
-      * This construct has a weakness due to the nonce being fixed at
-      * all times: when the same data block is encrypted twice, the
-      * resulting ciphertext will be exactly the same. We have to live
-      * with this weakness because ciphertext must be deterministic,
-      * as otherwise our engines like ReplicatedMergeTree cannot
-      * deduplicate data blocks.
-      */
-    class CompressionCodecEncrypted : public ICompressionCodec
+
+/// Now we have two algorithms.
+enum EncryptionMethod
+{
+    AES_128_GCM_SIV,
+    AES_256_GCM_SIV,
+    MAX_ENCRYPTION_METHOD
+};
+
+/** This codec encrypts and decrypts blocks with AES-128 in
+    * GCM-SIV mode (RFC-8452), which is the only cipher currently
+    * supported. Although it is implemented as a compression codec
+    * it doesn't actually compress data. In fact encrypted data will
+    * no longer be compressible in any meaningful way. This means if
+    * you want to apply both compression and encryption to your
+    * columns, you need to put this codec at the end of the chain
+    * like "column Int32 Codec(Delta, LZ4,
+    * AES_128_GCM_SIV)".
+    *
+    * The key is obtained by executing a command specified in the
+    * configuration file at startup, and if it doesn't specify a
+    * command the codec refuses to process any data. The command is
+    * expected to write a Base64-encoded key of any length, and we
+    * apply HKDF-SHA-256 to derive a 128-bit key-generation key
+    * (only the first half of the result is used). We then encrypt
+    * blocks in AES-128-GCM-SIV with a universally fixed nonce (12
+    * repeated NUL characters).
+    *
+    * This construct has a weakness due to the nonce being fixed at
+    * all times: when the same data block is encrypted twice, the
+    * resulting ciphertext will be exactly the same. We have to live
+    * with this weakness because ciphertext must be deterministic,
+    * as otherwise our engines like ReplicatedMergeTree cannot
+    * deduplicate data blocks.
+    */
+class CompressionCodecEncrypted : public ICompressionCodec
+{
+public:
+    /** If a key is available, the server is supposed to
+        * invoke this static method at the startup. The codec will
+        * refuse to compress or decompress any data until that. The
+        * key can be an arbitrary octet string, but it is
+        * recommended that the key is at least 16 octets long.
+        *
+        * Note that the key is currently not guarded by a
+        * mutex. This method should be invoked no more than once.
+        */
+    explicit CompressionCodecEncrypted(EncryptionMethod Method);
+
+    /**
+        * This is utility class. It holds information about encryption configuration.
+        */
+    class Configuration
     {
     public:
-        /** If a master key is available, the server is supposed to
-          * invoke this static method at the startup. The codec will
-          * refuse to compress or decompress any data until that. The
-          * key can be an arbitrary octet string, but it is
-          * recommended that the key is at least 16 octets long.
-          *
-          * Note that the master key is currently not guarded by a
-          * mutex. This method should be invoked no more than once.
-          */
-        static void setMasterKey(const std::string_view & master_key);
+        /// Configuration should be singleton. Instance method
+        static Configuration & instance();
 
-        explicit CompressionCodecEncrypted(const std::string_view & cipher);
+        /// Try to load data from config.
+        bool tryLoad(const Poco::Util::AbstractConfiguration & config, const String & config_prefix);
 
-        uint8_t getMethodByte() const override;
-        void updateHash(SipHash & hash) const override;
+        /// Load data and throw exception if something went wrong.
+        void load(const Poco::Util::AbstractConfiguration & config, const String & config_prefix);
 
-        bool isCompression() const override
-        {
-            return false;
-        }
-
-        bool isGenericCompression() const override
-        {
-            return false;
-        }
-
-        bool isPostProcessing() const override
-        {
-            return true;
-        }
-
-    protected:
-        UInt32 getMaxCompressedDataSize(UInt32 uncompressed_size) const override;
-
-        UInt32 doCompressData(const char * source, UInt32 source_size, char * dest) const override;
-        void doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
+        /// Get current key and nonce (they will be set in variables, which are pass in this function).
+        /// All data sets at the same time to prevent situations,
+        /// when config changes and key and nonce are read from different versions
+        /// If nonce is empty, it will return 12 null bytes.
+        void getCurrentKeyAndNonce(EncryptionMethod method, UInt64 & current_key_id, String & current_key, String & nonce) const;
 
+        /// Same as getCurrentKeyAndNonce. It is used to get key. (need for correct decryption, that is why nonce is not necessary)
+        String getKey(EncryptionMethod method, const UInt64 & key_id) const;
     private:
-        static std::string lastErrorString();
-        static std::string deriveKey(const std::string_view & master_key);
-        static void encrypt(const std::string_view & plaintext, char * ciphertext_and_tag);
-        static void decrypt(const std::string_view & ciphertext_and_tag, char * plaintext);
-
-        /** A private class that holds keys derived from the master
-          * key.
-          */
-        struct KeyHolder : private boost::noncopyable
+        /// struct Params consists of:
+        /// 1) hash-table of keys and their ids
+        /// 2) current key for encryption
+        /// 3) nonce for encryption
+        /// All this parameters have MAX_ENCRYPTION_METHOD count of versions,
+        /// because all algorithms can be described in config and used for different tables.
+        struct Params
         {
-            explicit KeyHolder(const std::string_view & master_key);
-            ~KeyHolder();
-
-            std::string keygen_key;
-            EVP_AEAD_CTX ctx;
+            std::unordered_map<UInt64, String> keys_storage[MAX_ENCRYPTION_METHOD];
+            UInt64 current_key_id[MAX_ENCRYPTION_METHOD] = {0, 0};
+            String nonce[MAX_ENCRYPTION_METHOD];
         };
 
-        static const KeyHolder & getKeys();
+        // used to read data from config and create Params
+        static void loadImpl(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, EncryptionMethod method, std::unique_ptr<Params>& new_params);
 
-        static inline std::optional<KeyHolder> keys;
+        MultiVersion<Params> params;
     };
 
-    inline CompressionCodecPtr getCompressionCodecEncrypted(const std::string_view & master_key)
+    uint8_t getMethodByte() const override;
+    void updateHash(SipHash & hash) const override;
+
+    bool isCompression() const override
     {
-        return std::make_shared<CompressionCodecEncrypted>(master_key);
+        return false;
     }
+
+    bool isGenericCompression() const override
+    {
+        return false;
+    }
+
+    bool isEncryption() const override
+    {
+        return true;
+    }
+protected:
+    UInt32 getMaxCompressedDataSize(UInt32 uncompressed_size) const override;
+
+    /// Encrypt data with chosen method.
+    /// Throws exception if encryption is impossible or size of encrypted text is incorrect
+    UInt32 doCompressData(const char * source, UInt32 source_size, char * dest) const override;
+
+    /// Decrypt data with chosen method
+    /// Throws exception if decryption is impossible or size of decrypted text is incorrect
+    void doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
+private:
+    EncryptionMethod encryption_method;
+};
+
 }
 
-#endif /* USE_SSL && USE_INTERNAL_SSL_LIBRARY */
+#endif /* NOT Arcadia_build */
diff --git a/src/Compression/CompressionFactoryAdditions.cpp b/src/Compression/CompressionFactoryAdditions.cpp
index bff294d1ea5..9e0353e6711 100644
--- a/src/Compression/CompressionFactoryAdditions.cpp
+++ b/src/Compression/CompressionFactoryAdditions.cpp
@@ -62,7 +62,7 @@ ASTPtr CompressionCodecFactory::validateCodecAndGetPreprocessedAST(
         bool is_compression = false;
         bool has_none = false;
         std::optional<size_t> generic_compression_codec_pos;
-        std::set<size_t> post_processing_codecs;
+        std::set<size_t> encryption_codecs;
 
         bool can_substitute_codec_arguments = true;
         for (size_t i = 0, size = func->arguments->children.size(); i < size; ++i)
@@ -141,8 +141,8 @@ ASTPtr CompressionCodecFactory::validateCodecAndGetPreprocessedAST(
             if (!generic_compression_codec_pos && result_codec->isGenericCompression())
                 generic_compression_codec_pos = i;
 
-            if (result_codec->isPostProcessing())
-                post_processing_codecs.insert(i);
+            if (result_codec->isEncryption())
+                encryption_codecs.insert(i);
         }
 
         String codec_description = queryToString(codecs_descriptions);
@@ -157,8 +157,8 @@ ASTPtr CompressionCodecFactory::validateCodecAndGetPreprocessedAST(
 
             /// Allow to explicitly specify single NONE codec if user don't want any compression.
             /// But applying other transformations solely without compression (e.g. Delta) does not make sense.
-            /// It's okay to apply post-processing codecs solely without anything else.
-            if (!is_compression && !has_none && post_processing_codecs.size() != codecs_descriptions->children.size())
+            /// It's okay to apply encryption codecs solely without anything else.
+            if (!is_compression && !has_none && encryption_codecs.size() != codecs_descriptions->children.size())
                 throw Exception(
                     "Compression codec " + codec_description
                         + " does not compress anything."
@@ -168,10 +168,10 @@ ASTPtr CompressionCodecFactory::validateCodecAndGetPreprocessedAST(
                           " (Note: you can enable setting 'allow_suspicious_codecs' to skip this check).",
                     ErrorCodes::BAD_ARGUMENTS);
 
-            /// It does not make sense to apply any non-post-processing codecs
-            /// after post-processing one.
-            if (!post_processing_codecs.empty() &&
-                *post_processing_codecs.begin() != codecs_descriptions->children.size() - post_processing_codecs.size())
+            /// It does not make sense to apply any non-encryption codecs
+            /// after encryption one.
+            if (!encryption_codecs.empty() &&
+                *encryption_codecs.begin() != codecs_descriptions->children.size() - encryption_codecs.size())
                 throw Exception("The combination of compression codecs " + codec_description + " is meaningless,"
                                 " because it does not make sense to apply any non-post-processing codecs after"
                                 " post-processing ones. (Note: you can enable setting 'allow_suspicious_codecs'"
@@ -180,7 +180,7 @@ ASTPtr CompressionCodecFactory::validateCodecAndGetPreprocessedAST(
             /// It does not make sense to apply any transformations after generic compression algorithm
             /// So, generic compression can be only one and only at the end.
             if (generic_compression_codec_pos &&
-                *generic_compression_codec_pos != codecs_descriptions->children.size() - 1 - post_processing_codecs.size())
+                *generic_compression_codec_pos != codecs_descriptions->children.size() - 1 - encryption_codecs.size())
                 throw Exception("The combination of compression codecs " + codec_description + " is meaningless,"
                     " because it does not make sense to apply any transformations after generic compression algorithm."
                     " (Note: you can enable setting 'allow_suspicious_codecs' to skip this check).", ErrorCodes::BAD_ARGUMENTS);
diff --git a/src/Compression/CompressionInfo.h b/src/Compression/CompressionInfo.h
index 869c7110d62..bbe8315f3ea 100644
--- a/src/Compression/CompressionInfo.h
+++ b/src/Compression/CompressionInfo.h
@@ -35,15 +35,16 @@ namespace DB
 
 enum class CompressionMethodByte : uint8_t
 {
-    NONE     = 0x02,
-    LZ4      = 0x82,
-    ZSTD     = 0x90,
-    Multiple = 0x91,
-    Delta    = 0x92,
-    T64      = 0x93,
-    DoubleDelta = 0x94,
-    Gorilla     = 0x95,
-    Encrypted   = 0x96,
+    NONE            = 0x02,
+    LZ4             = 0x82,
+    ZSTD            = 0x90,
+    Multiple        = 0x91,
+    Delta           = 0x92,
+    T64             = 0x93,
+    DoubleDelta     = 0x94,
+    Gorilla         = 0x95,
+    AES_128_GCM_SIV = 0x96,
+    AES_256_GCM_SIV = 0x97
 };
 
 }
diff --git a/src/Compression/ICompressionCodec.h b/src/Compression/ICompressionCodec.h
index 3f603087f2b..7a401186be3 100644
--- a/src/Compression/ICompressionCodec.h
+++ b/src/Compression/ICompressionCodec.h
@@ -76,7 +76,7 @@ public:
     virtual bool isGenericCompression() const = 0;
 
     /// If it is a post-processing codec such as encryption. Usually it does not make sense to apply non-post-processing codecs after this.
-    virtual bool isPostProcessing() const { return false; }
+    virtual bool isEncryption() const { return false; }
 
     /// It is a codec available only for evaluation purposes and not meant to be used in production.
     /// It will not be allowed to use unless the user will turn off the safety switch.
diff --git a/src/Compression/fuzzers/encrypted_decompress_fuzzer.cpp b/src/Compression/fuzzers/encrypted_decompress_fuzzer.cpp
index 6211fd4b9cc..9e4d4a3241f 100644
--- a/src/Compression/fuzzers/encrypted_decompress_fuzzer.cpp
+++ b/src/Compression/fuzzers/encrypted_decompress_fuzzer.cpp
@@ -1,49 +1,301 @@
+#include <cstddef>
+#include <cstdint>
 #include <iostream>
+#include <memory>
 #include <string>
 
 #include <Compression/ICompressionCodec.h>
 #include <Compression/CompressionCodecEncrypted.h>
 #include <IO/BufferWithOwnMemory.h>
+#include <Poco/DOM/AutoPtr.h>
+#include <Poco/DOM/Document.h>
+#include <Poco/DOM/Element.h>
+#include <Poco/DOM/Text.h>
+#include <Poco/NumericString.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Poco/Util/XMLConfiguration.h>
+#include "Common/Exception.h"
 
-namespace DB
+inline DB::CompressionCodecPtr getCompressionCodecEncrypted(DB::EncryptionMethod Method)
 {
-    CompressionCodecPtr getCompressionCodecEncrypted(const std::string_view & master_key);
+    return std::make_shared<DB::CompressionCodecEncrypted>(Method);
 }
 
-constexpr size_t key_size = 20;
-
-struct AuxiliaryRandomData
+namespace
 {
-    char key[key_size];
-    size_t decompressed_size;
+
+using namespace Poco;
+using namespace Poco::XML;
+
+/*
+Fuzzing data consists of:
+    first byte:
+        1) length of nonce is in data (for correct work with wrong data from user)
+        2) length of key is in data (for correct work with wrong data from user)
+        3) is 128 turn on
+        4) multiple keys for 128
+        5) is 256 turn on
+        6) multiple keys for 256
+        7) nonce is set
+        8) current_key is set
+
+    read_key() will cosist of following steps:
+        if (2):
+            read 4 byte to know size
+            if multiple_keys:
+                read id
+        else:
+            size is chosen correctly according to algorithm
+
+        read size_bytes as a key
+
+    next bytes will have information in this order:
+        if (3):
+            if (4):
+                read count
+                for i in range(count):
+                    read_key()
+            else:
+                read_key()
+            if (7):
+                read_nonce (simillar to read_key)
+            if (8):
+                set current_key
+
+        same for AES_256_GCM_SIV with (5) and (6) instead of (3) and (4)
+
+    This class read data and generate xml documentation.
+*/
+class XMLGenerator
+{
+public:
+    XMLGenerator(const uint8_t * data, size_t& size);
+
+    /// Try to generate config from input data using algorithm, which is described before class declaration
+    void generate();
+
+    /// Size of part, which was used on generating config
+    size_t keySize() const;
+
+    /// Get config
+    const Poco::AutoPtr<Poco::Util::XMLConfiguration>& getResult() const;
+
+    /// If something happened in generator, it will be true
+    bool hasError() const;
+private:
+    /// generate algorithm section with key and nonce
+    bool generateAlgorithmKeys(AutoPtr<Poco::XML::Element>& document_root, std::string name,
+                               uint8_t mask_for_algo, uint8_t mask_for_multiple_keys);
+
+    /// move on count bytes stream and increase counter
+    /// returns false if some errors occuried
+    bool next(ssize_t count=1);
+
+    /// Create a key from data
+    ssize_t generateKey(std::string name, bool multiple=false);
+
+    const uint8_t * data;
+
+    size_t start_size;
+    size_t keys_size;
+
+    AutoPtr<Poco::XML::Document> xml_document;
+    AutoPtr<Poco::XML::Element> algo;
+    AutoPtr<Poco::Util::XMLConfiguration> conf;
+
+    uint8_t first_byte;
+
+    bool error;
 };
 
+XMLGenerator::XMLGenerator(const uint8_t * Data, size_t& Size): data(Data), start_size(Size),
+                          conf(new Poco::Util::XMLConfiguration()), error(false) {}
+
+size_t XMLGenerator::keySize() const { return keys_size; }
+
+const Poco::AutoPtr<Poco::Util::XMLConfiguration>& XMLGenerator::getResult() const { return conf; }
+
+bool XMLGenerator::hasError() const { return error; }
+
+bool XMLGenerator::next(ssize_t count)
+{
+    /// If negative step - something went wrong
+    if (count == -1)
+    {
+        error = true;
+        return false;
+    }
+
+    /// move data and increase counter
+    keys_size += count;
+
+    /// If get after eof
+    if (keys_size >= start_size)
+    {
+        error = true;
+        return false;
+    }
+    data += count;
+
+    return true;
+}
+
+/*
+<Key>key</key>
+or
+<key id=..>key</key>
+*/
+ssize_t XMLGenerator::generateKey(std::string name, bool multiple)
+{
+    /// set traditional key size for algorithms
+    uint64_t size = 0;
+    if (name == "aes_128_gcm_siv")
+        size = 16;
+    if (name == "aes_256_gcm_siv")
+        size = 32;
+
+    /// try to read size from data
+    if (first_byte & 0x40)
+    {
+        size = *(reinterpret_cast<const uint64_t*>(data));
+        if (!next(8))
+            return -1;
+    }
+    /// if it is not defined, leave
+    if (!size)
+        return -1;
+
+    AutoPtr<Poco::XML::Element> key_holder;
+    if (multiple)
+    {
+        /// multiple keys have ids.
+        uint64_t id = *(reinterpret_cast<const uint64_t*>(data));
+        if (!next(8))
+            return -1;
+
+        key_holder = xml_document->createElement("key[id=" + std::to_string(id) + "]");
+
+    }
+    else
+    {
+        key_holder = xml_document->createElement("key");
+    }
+    AutoPtr<Text> key(xml_document->createTextNode(std::string(data, data + size)));
+    key_holder->appendChild(key);
+    algo->appendChild(key_holder);
+
+    if (!next(size))
+        return -1;
+    return size;
+}
+
+bool XMLGenerator::generateAlgorithmKeys(
+    AutoPtr<Poco::XML::Element>& document_root, std::string name, uint8_t mask_for_algo, uint8_t mask_for_multiple_keys)
+{
+    /// check if algorithm is enabled, then add multiple keys or single key
+    if (first_byte & mask_for_algo)
+    {
+        algo = xml_document->createElement(name);
+        document_root->appendChild(algo);
+
+        if (first_byte & mask_for_multiple_keys)
+        {
+            uint64_t count = *(reinterpret_cast<const uint64_t*>(data));
+            if (!next(8))
+                return false;
+
+            for (size_t i = 0; i < count; ++i)
+            {
+                if (!next(generateKey(name)))
+                    return false;
+            }
+        }
+        else
+        {
+            if (!next(generateKey(name)))
+                return false;
+        }
+    }
+
+    /// add nonce
+    if (first_byte & 0x02)
+    {
+        uint64_t nonce_size = 12;
+        if (first_byte & 0x80)
+        {
+            nonce_size = *(reinterpret_cast<const uint64_t*>(data));
+            if (!next(8))
+                return false;
+        }
+
+        AutoPtr<Poco::XML::Element> nonce_holder(xml_document->createElement("nonce"));
+        AutoPtr<Text> nonce(xml_document->createTextNode(std::string(data, data + nonce_size)));
+        nonce_holder->appendChild(nonce);
+        algo->appendChild(nonce_holder);
+    }
+
+    /// add current key id
+    if (first_byte & 0x01)
+    {
+        uint64_t current_key = *(reinterpret_cast<const uint64_t*>(data));
+        if (!next(8))
+            return false;
+
+        AutoPtr<Poco::XML::Element> cur_key_holder(xml_document->createElement("nonce"));
+        AutoPtr<Text> cur_key(xml_document->createTextNode(std::to_string(current_key)));
+        cur_key_holder->appendChild(cur_key);
+        algo->appendChild(cur_key_holder);
+    }
+
+    return true;
+}
+
+void XMLGenerator::generate()
+{
+    AutoPtr<Poco::XML::Element> document_root(xml_document->createElement("encryption_codecs"));
+    xml_document->appendChild(document_root);
+
+    /// read first byte for parsing
+    first_byte = *data;
+    if (!next())
+        return;
+
+    if (!generateAlgorithmKeys(document_root, "aes_128_gmc_siv", 0x20, 0x10))
+        return;
+    if (!generateAlgorithmKeys(document_root, "aes_256_gmc_siv", 0x08, 0x04))
+        return;
+
+    conf->load(xml_document);
+}
+
+}
+
+
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
 try
 {
-    if (size < sizeof(AuxiliaryRandomData))
+    XMLGenerator generator(data, size);
+
+    generator.generate();
+    if (generator.hasError())
         return 0;
 
-    const auto * p = reinterpret_cast<const AuxiliaryRandomData *>(data);
+    auto config = generator.getResult();
+    auto codec_128 = getCompressionCodecEncrypted(DB::AES_128_GCM_SIV);
+    auto codec_256 = getCompressionCodecEncrypted(DB::AES_256_GCM_SIV);
+    DB::CompressionCodecEncrypted::Configuration::instance().tryLoad(*config, "");
 
-    std::string key = std::string(p->key, key_size);
-    auto codec = DB::getCompressionCodecEncrypted(key);
+    size_t data_size = size - generator.keySize();
 
-    size_t output_buffer_size = p->decompressed_size % 65536;
-    size -= sizeof(AuxiliaryRandomData);
-    data += sizeof(AuxiliaryRandomData) / sizeof(uint8_t);
-
-    std::string input = std::string(reinterpret_cast<const char*>(data), size);
-    fmt::print(stderr, "Using input {} of size {}, output size is {}. \n", input, size, output_buffer_size);
-
-    if (output_buffer_size < size)
-        return 0;
+    std::string input = std::string(reinterpret_cast<const char*>(data), data_size);
+    fmt::print(stderr, "Using input {} of size {}, output size is {}. \n", input, data_size, input.size() - 31);
 
     DB::Memory<> memory;
-    memory.resize(output_buffer_size + codec->getAdditionalSizeAtTheEndOfBuffer());
-
-    codec->doDecompressData(reinterpret_cast<const char *>(data), size, memory.data(), output_buffer_size);
+    memory.resize(input.size() + codec_128->getAdditionalSizeAtTheEndOfBuffer());
+    codec_128->doDecompressData(input.data(), input.size(), memory.data(), input.size() - 31);
 
+    memory.resize(input.size() + codec_128->getAdditionalSizeAtTheEndOfBuffer());
+    codec_256->doDecompressData(input.data(), input.size(), memory.data(), input.size() - 31);
     return 0;
 }
 catch (...)
diff --git a/src/Compression/ya.make b/src/Compression/ya.make
index 8ba48696225..420ada412e0 100644
--- a/src/Compression/ya.make
+++ b/src/Compression/ya.make
@@ -35,6 +35,11 @@ SRCS(
     CompressionFactoryAdditions.cpp
     ICompressionCodec.cpp
     LZ4_decompress_faster.cpp
+    fuzzers/compressed_buffer_fuzzer.cpp
+    fuzzers/delta_decompress_fuzzer.cpp
+    fuzzers/double_delta_decompress_fuzzer.cpp
+    fuzzers/encrypted_decompress_fuzzer.cpp
+    fuzzers/lz4_decompress_fuzzer.cpp
     getCompressionCodecForFile.cpp
 
 )
diff --git a/tests/config/config.d/encryption.xml b/tests/config/config.d/encryption.xml
index 216021ae744..b1b84cf46c8 100644
--- a/tests/config/config.d/encryption.xml
+++ b/tests/config/config.d/encryption.xml
@@ -1,6 +1,10 @@
 <yandex>
-    <encryption>
-        <!-- "Some fixed key that is at least 16 bytes long" in Base64 -->
-        <key_command>echo "U29tZSBmaXhlZCBrZXkgdGhhdCBpcyBhdCBsZWFzdCAxNiBieXRlcyBsb25n"</key_command>
-    </encryption>
+    <encryption_codecs>
+        <aes_128_gcm_siv>
+            <key_hex>a32902703dab1cedd7ff7287067787ca</key_hex>
+        </aes_128_gcm_siv>
+        <aes_256_gcm_siv>
+            <key_hex>a32902703dab1cedd7ff7287067787caa32902703dab1cedd7ff7287067787ca</key_hex>
+        </aes_256_gcm_siv>
+    </encryption_codecs>
 </yandex>
diff --git a/tests/integration/test_codec_encrypted/__init__.py b/tests/integration/test_codec_encrypted/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_codec_encrypted/test.py b/tests/integration/test_codec_encrypted/test.py
new file mode 100644
index 00000000000..5d47948ac3c
--- /dev/null
+++ b/tests/integration/test_codec_encrypted/test.py
@@ -0,0 +1,73 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.client import QueryRuntimeException
+from helpers.test_tools import assert_eq_with_retry
+
+cluster = ClickHouseCluster(__file__)
+
+node = cluster.add_instance('node')
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+def make_storage_with_key(id):
+        node.exec_in_container(["bash", "-c" , """cat > /etc/clickhouse-server/config.d/storage_keys_config.xml << EOF
+<?xml version="1.0"?>
+<yandex>
+    <encryption_codecs>
+        <aes_128_gcm_siv>
+            <key_hex id="0">83e84e9a4eb11535c0670dc62d808ee0</key_hex>
+            <key id="1">abcdefghijklmnop</key>
+            <current_key_id>{cur_id}</current_key_id>
+        </aes_128_gcm_siv>
+        <aes_256_gcm_siv>
+            <key_hex id="0">83e84e9a4eb11535c0670dc62d808ee083e84e9a4eb11535c0670dc62d808ee0</key_hex>
+            <key id="1">abcdefghijklmnopabcdefghijklmnop</key>
+            <current_key_id>{cur_id}</current_key_id>
+        </aes_256_gcm_siv>
+    </encryption_codecs>
+</yandex>
+EOF""".format(cur_id=id)])
+        node.query("SYSTEM RELOAD CONFIG")
+
+def test_different_keys(start_cluster):
+    make_storage_with_key(0)
+    node.query("""
+        CREATE TABLE encrypted_test_128 (
+            id Int64,
+            data String Codec(AES_128_GCM_SIV)
+        ) ENGINE=MergeTree()
+        ORDER BY id
+        """)
+
+    node.query("""
+        CREATE TABLE encrypted_test_256 (
+            id Int64,
+            data String Codec(AES_256_GCM_SIV)
+        ) ENGINE=MergeTree()
+        ORDER BY id
+        """)
+    
+    node.query("INSERT INTO encrypted_test_128 VALUES (0,'data'),(1,'data')")
+    select_query = "SELECT * FROM encrypted_test_128 ORDER BY id FORMAT Values"
+    assert node.query(select_query) == "(0,'data'),(1,'data')"
+
+    make_storage_with_key(1)
+    node.query("INSERT INTO encrypted_test_128 VALUES (3,'text'),(4,'text')")
+    select_query = "SELECT * FROM encrypted_test_128 ORDER BY id FORMAT Values"
+    assert node.query(select_query) == "(0,'data'),(1,'data'),(3,'text'),(4,'text')"
+
+    node.query("INSERT INTO encrypted_test_256 VALUES (0,'data'),(1,'data')")
+    select_query = "SELECT * FROM encrypted_test_256 ORDER BY id FORMAT Values"
+    assert node.query(select_query) == "(0,'data'),(1,'data')"
+
+    make_storage_with_key(1)
+    node.query("INSERT INTO encrypted_test_256 VALUES (3,'text'),(4,'text')")
+    select_query = "SELECT * FROM encrypted_test_256 ORDER BY id FORMAT Values"
+    assert node.query(select_query) == "(0,'data'),(1,'data'),(3,'text'),(4,'text')"
diff --git a/tests/queries/0_stateless/01683_codec_encrypted.reference b/tests/queries/0_stateless/01683_codec_encrypted.reference
index 0d30be781e5..4bed8ab92b8 100644
--- a/tests/queries/0_stateless/01683_codec_encrypted.reference
+++ b/tests/queries/0_stateless/01683_codec_encrypted.reference
@@ -1 +1,2 @@
 1	Some plaintext
+1	Some plaintext
diff --git a/tests/queries/0_stateless/01683_codec_encrypted.sql b/tests/queries/0_stateless/01683_codec_encrypted.sql
index e780819ebd3..d3ba1bb5e69 100644
--- a/tests/queries/0_stateless/01683_codec_encrypted.sql
+++ b/tests/queries/0_stateless/01683_codec_encrypted.sql
@@ -2,7 +2,14 @@
 -- Tag no-fasttest: Depends on OpenSSL
 
 DROP TABLE IF EXISTS encryption_test;
-CREATE TABLE encryption_test (i Int, s String Codec(Encrypted('AES-128-GCM-SIV'))) ENGINE = MergeTree ORDER BY i;
+CREATE TABLE encryption_test (i Int, s String Codec(AES_128_GCM_SIV)) ENGINE = MergeTree ORDER BY i;
+
+INSERT INTO encryption_test VALUES (1, 'Some plaintext');
+SELECT * FROM encryption_test;
+
+DROP TABLE encryption_test;
+
+CREATE TABLE encryption_test (i Int, s String Codec(AES_256_GCM_SIV)) ENGINE = MergeTree ORDER BY i;
 
 INSERT INTO encryption_test VALUES (1, 'Some plaintext');
 SELECT * FROM encryption_test;

From 9ebef6e3cffda34096c321872dd0d3f42cc90e40 Mon Sep 17 00:00:00 2001
From: vdimir <vdimir@yandex-team.ru>
Date: Mon, 13 Sep 2021 13:06:38 +0300
Subject: [PATCH 232/273] Remove explicit DB in 01115_join_with_dictionary

---
 .../0_stateless/01115_join_with_dictionary.sql  | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/tests/queries/0_stateless/01115_join_with_dictionary.sql b/tests/queries/0_stateless/01115_join_with_dictionary.sql
index e0f281503d4..0c84d372f6d 100644
--- a/tests/queries/0_stateless/01115_join_with_dictionary.sql
+++ b/tests/queries/0_stateless/01115_join_with_dictionary.sql
@@ -1,12 +1,5 @@
--- Tags: no-parallel
-
 SET send_logs_level = 'fatal';
 
-DROP DATABASE IF EXISTS db_01115;
-CREATE DATABASE db_01115;
-
-USE db_01115;
-
 DROP DICTIONARY IF EXISTS dict_flat;
 DROP DICTIONARY IF EXISTS dict_hashed;
 DROP DICTIONARY IF EXISTS dict_complex_cache;
@@ -16,19 +9,19 @@ INSERT INTO t1 SELECT number, number, toString(number), number from numbers(4);
 
 CREATE DICTIONARY dict_flat (key UInt64 DEFAULT 0, a UInt8 DEFAULT 42, b String DEFAULT 'x', c Float64 DEFAULT 42.0)
 PRIMARY KEY key
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 't1' PASSWORD '' DB 'db_01115'))
+SOURCE(CLICKHOUSE(TABLE 't1'))
 LIFETIME(MIN 1 MAX 10)
 LAYOUT(FLAT());
 
-CREATE DICTIONARY db_01115.dict_hashed (key UInt64 DEFAULT 0, a UInt8 DEFAULT 42, b String DEFAULT 'x', c Float64 DEFAULT 42.0)
+CREATE DICTIONARY dict_hashed (key UInt64 DEFAULT 0, a UInt8 DEFAULT 42, b String DEFAULT 'x', c Float64 DEFAULT 42.0)
 PRIMARY KEY key
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 't1' DB 'db_01115'))
+SOURCE(CLICKHOUSE(TABLE 't1'))
 LIFETIME(MIN 1 MAX 10)
 LAYOUT(HASHED());
 
 CREATE DICTIONARY dict_complex_cache (key UInt64 DEFAULT 0, a UInt8 DEFAULT 42, b String DEFAULT 'x', c Float64 DEFAULT 42.0)
 PRIMARY KEY key, b
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 't1' DB 'db_01115'))
+SOURCE(CLICKHOUSE(TABLE 't1'))
 LIFETIME(MIN 1 MAX 10)
 LAYOUT(COMPLEX_KEY_CACHE(SIZE_IN_CELLS 1));
 
@@ -104,10 +97,8 @@ SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 ANY LEFT JOIN dict_flat
 SELECT '-';
 SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 RIGHT JOIN dict_flat d ON s1.key = d.key ORDER BY d.key;
 
-
 DROP DICTIONARY dict_flat;
 DROP DICTIONARY dict_hashed;
 DROP DICTIONARY dict_complex_cache;
 
 DROP TABLE t1;
-DROP DATABASE IF EXISTS db_01115;

From 0a8560c0e2d3059c1e43ab8d9852ff163df04a65 Mon Sep 17 00:00:00 2001
From: adevyatova <annaconda@bk.ru>
Date: Mon, 13 Sep 2021 12:05:13 +0000
Subject: [PATCH 233/273] Delete msgpack file

---
 docs/tmp_msgpack.msgpk | Bin 24 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 docs/tmp_msgpack.msgpk

diff --git a/docs/tmp_msgpack.msgpk b/docs/tmp_msgpack.msgpk
deleted file mode 100644
index 294ca9e3b4a3e666d2c23156faf421d8de4995e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24
fcmbQiz{td`b>{Dxe`o&BIP)J!{ncV-Vq^dSnlcPc


From ef6ba90be1ff2e6fa119a186909d7f2404e1891c Mon Sep 17 00:00:00 2001
From: Kseniia Sumarokova <54203879+kssenii@users.noreply.github.com>
Date: Mon, 13 Sep 2021 20:00:18 +0300
Subject: [PATCH 234/273] Update DiskWebServer.h

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

diff --git a/src/Disks/DiskWebServer.h b/src/Disks/DiskWebServer.h
index 222a04054e2..d3e16e487ea 100644
--- a/src/Disks/DiskWebServer.h
+++ b/src/Disks/DiskWebServer.h
@@ -53,7 +53,7 @@ public:
     DiskWebServer(const String & disk_name_,
                   const String & url_,
                   ContextPtr context,
-                  size_t min_bytes_for_seel_);
+                  size_t min_bytes_for_seek_);
 
     bool supportZeroCopyReplication() const override { return false; }
 

From f51206c9e9d5d9cda056589d07f77872888a7c7d Mon Sep 17 00:00:00 2001
From: Evgenia Sudarikova <56156889+otrazhenia@users.noreply.github.com>
Date: Mon, 13 Sep 2021 20:19:52 +0300
Subject: [PATCH 235/273] Update docs/ru/operations/clickhouse-keeper.md

Co-authored-by: alesapin <alesapin@gmail.com>
---
 docs/ru/operations/clickhouse-keeper.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index da5ea837214..13eabbdc7ca 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -8,7 +8,7 @@ toc_title: ClickHouse Keeper
 Сервер ClickHouse использует сервис координации [ZooKeeper](https://zookeeper.apache.org/) для [репликации](../engines/table-engines/mergetree-family/replication.md) данных и выполнения [распределенных DDL запросов](../sql-reference/distributed-ddl.md). ClickHouse Keeper — это альтернативный сервис координации, совместимый с ZooKeeper.
 
 !!! warning "Предупреждение"
-    Эта функция находится в стадии пре-продакшн и тестируется в непрерывной интеграции (CI) на нескольких внутренних установках.
+    ClickHouse Keeper находится в стадии пре-продакшн и тестируется в CI ClickHouse и на нескольких внутренних инсталляциях.
 
 ## Детали реализации
 

From 97deb4b27d6897a19f62b4baef04aeaac71220d3 Mon Sep 17 00:00:00 2001
From: Evgenia Sudarikova <56156889+otrazhenia@users.noreply.github.com>
Date: Mon, 13 Sep 2021 20:20:19 +0300
Subject: [PATCH 236/273] Update docs/ru/operations/clickhouse-keeper.md

Co-authored-by: alesapin <alesapin@gmail.com>
---
 docs/ru/operations/clickhouse-keeper.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index 13eabbdc7ca..4d9c7454f30 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -12,7 +12,7 @@ toc_title: ClickHouse Keeper
 
 ## Детали реализации
 
-ZooKeeper — один из первых широко известных сервисов координации с открытым исходным кодом. Он реализован на Java, имеет достаточно простую и мощную модель данных. Алгоритм координации Zookeeper называется ZAB (ZooKeeper Atomic Broadcast). Он не гарантирует линеаризуемость операций чтения, поскольку каждый узел ZooKeeper обслуживает чтения локально. В отличие от ZooKeeper, ClickHouse Keeper реализован на C++ и использует алгоритм [RAFT](https://raft.github.io/), [реализация](https://github.com/eBay/NuRaft). Этот алгоритм обеспечивает линеаризуемость чтения и записи, имеет несколько реализаций с открытым исходным кодом на разных языках.
+ZooKeeper — один из первых широко известных сервисов координации с открытым исходным кодом. Он реализован на языке программирования Java, имеет достаточно простую и мощную модель данных. Алгоритм координации Zookeeper называется ZAB (ZooKeeper Atomic Broadcast). Он не гарантирует линеаризуемость операций чтения, поскольку каждый узел ZooKeeper обслуживает чтения локально. В отличие от ZooKeeper, ClickHouse Keeper реализован на C++ и использует алгоритм [RAFT](https://raft.github.io/), [реализация](https://github.com/eBay/NuRaft). Этот алгоритм позволяет достичь линеаризуемости чтения и записи, имеет несколько реализаций с открытым исходным кодом на разных языках.
 
 По умолчанию ClickHouse Keeper предоставляет те же гарантии, что и ZooKeeper (линеаризуемость записи, нелинеаризуемость чтения). У него есть совместимый протокол клиент-сервер, поэтому любой стандартный клиент ZooKeeper может использоваться для взаимодействия с ClickHouse Keeper. Снэпшоты и журналы имеют несовместимый с ZooKeeper формат, однако можно конвертировать данные Zookeeper в снэпшот ClickHouse Keeper с помощью `clickhouse-keeper-converter`. Межсерверный протокол ClickHouse Keeper также несовместим с ZooKeeper, поэтому создание смешанного кластера ZooKeeper / ClickHouse Keeper невозможно.
 

From 394a6f9898584595c49e10b92ce2f3bbfb107e40 Mon Sep 17 00:00:00 2001
From: Evgenia Sudarikova <56156889+otrazhenia@users.noreply.github.com>
Date: Mon, 13 Sep 2021 20:20:40 +0300
Subject: [PATCH 237/273] Update docs/ru/operations/clickhouse-keeper.md

Co-authored-by: alesapin <alesapin@gmail.com>
---
 docs/ru/operations/clickhouse-keeper.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index 4d9c7454f30..d4252184035 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -14,7 +14,7 @@ toc_title: ClickHouse Keeper
 
 ZooKeeper — один из первых широко известных сервисов координации с открытым исходным кодом. Он реализован на языке программирования Java, имеет достаточно простую и мощную модель данных. Алгоритм координации Zookeeper называется ZAB (ZooKeeper Atomic Broadcast). Он не гарантирует линеаризуемость операций чтения, поскольку каждый узел ZooKeeper обслуживает чтения локально. В отличие от ZooKeeper, ClickHouse Keeper реализован на C++ и использует алгоритм [RAFT](https://raft.github.io/), [реализация](https://github.com/eBay/NuRaft). Этот алгоритм позволяет достичь линеаризуемости чтения и записи, имеет несколько реализаций с открытым исходным кодом на разных языках.
 
-По умолчанию ClickHouse Keeper предоставляет те же гарантии, что и ZooKeeper (линеаризуемость записи, нелинеаризуемость чтения). У него есть совместимый протокол клиент-сервер, поэтому любой стандартный клиент ZooKeeper может использоваться для взаимодействия с ClickHouse Keeper. Снэпшоты и журналы имеют несовместимый с ZooKeeper формат, однако можно конвертировать данные Zookeeper в снэпшот ClickHouse Keeper с помощью `clickhouse-keeper-converter`. Межсерверный протокол ClickHouse Keeper также несовместим с ZooKeeper, поэтому создание смешанного кластера ZooKeeper / ClickHouse Keeper невозможно.
+По умолчанию ClickHouse Keeper предоставляет те же гарантии, что и ZooKeeper (линеаризуемость записей, последовательная согласованность чтений). У него есть совместимый клиент-серверный протокол, поэтому любой стандартный клиент ZooKeeper может использоваться для взаимодействия с ClickHouse Keeper. Снэпшоты и журналы имеют несовместимый с ZooKeeper формат, однако можно конвертировать данные Zookeeper в снэпшот ClickHouse Keeper с помощью `clickhouse-keeper-converter`. Межсерверный протокол ClickHouse Keeper также несовместим с ZooKeeper, поэтому создание смешанного кластера ZooKeeper / ClickHouse Keeper невозможно.
 
 ## Конфигурация
 

From 2386890b891fb425cb13a9ef6e1482512a57d08d Mon Sep 17 00:00:00 2001
From: Evgenia Sudarikova <56156889+otrazhenia@users.noreply.github.com>
Date: Mon, 13 Sep 2021 20:20:59 +0300
Subject: [PATCH 238/273] Update docs/ru/operations/clickhouse-keeper.md

Co-authored-by: alesapin <alesapin@gmail.com>
---
 docs/ru/operations/clickhouse-keeper.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index d4252184035..4be8d49bd80 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -30,7 +30,7 @@ ClickHouse Keeper может использоваться как равноце
 
 Настройки внутренней координации находятся в `<keeper_server>.<coordination_settings>`:
 
--    `operation_timeout_ms` — время ожидания для одной клиентской операции в миллисекундах (по умолчанию: 10000).
+-    `operation_timeout_ms` — максимальное время ожидания для одной клиентской операции в миллисекундах (по умолчанию: 10000).
 -    `session_timeout_ms` — время ожидания для клиентской сессии в миллисекундах (по умолчанию: 30000).
 -    `dead_session_check_period_ms` — частота, с которой ClickHouse Keeper проверяет мертвые сессии и удаляет их, в миллисекундах (по умолчанию: 500).
 -    `heart_beat_interval_ms` — частота, с которой узел-лидер ClickHouse Keeper отправляет сердцебиение узлам-последователям, в миллисекундах (по умолчанию: 500).

From 82d19deece0b0098d9127f58b8c17d41ae406dea Mon Sep 17 00:00:00 2001
From: Evgenia Sudarikova <56156889+otrazhenia@users.noreply.github.com>
Date: Mon, 13 Sep 2021 20:21:12 +0300
Subject: [PATCH 239/273] Update docs/ru/operations/clickhouse-keeper.md

Co-authored-by: alesapin <alesapin@gmail.com>
---
 docs/ru/operations/clickhouse-keeper.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index 4be8d49bd80..8fc3c6af1b6 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -31,7 +31,7 @@ ClickHouse Keeper может использоваться как равноце
 Настройки внутренней координации находятся в `<keeper_server>.<coordination_settings>`:
 
 -    `operation_timeout_ms` — максимальное время ожидания для одной клиентской операции в миллисекундах (по умолчанию: 10000).
--    `session_timeout_ms` — время ожидания для клиентской сессии в миллисекундах (по умолчанию: 30000).
+-    `session_timeout_ms` — максимальное время ожидания для клиентской сессии в миллисекундах (по умолчанию: 30000).
 -    `dead_session_check_period_ms` — частота, с которой ClickHouse Keeper проверяет мертвые сессии и удаляет их, в миллисекундах (по умолчанию: 500).
 -    `heart_beat_interval_ms` — частота, с которой узел-лидер ClickHouse Keeper отправляет сердцебиение узлам-последователям, в миллисекундах (по умолчанию: 500).
 -    `election_timeout_lower_bound_ms` — время, после которого последователь может инициировать выборы лидера, если не получил от него сердцебиения (по умолчанию: 1000).

From 1637b8cc0e461873b6a3c3545596aeff32af2413 Mon Sep 17 00:00:00 2001
From: Evgenia Sudarikova <56156889+otrazhenia@users.noreply.github.com>
Date: Mon, 13 Sep 2021 20:21:24 +0300
Subject: [PATCH 240/273] Update docs/ru/operations/clickhouse-keeper.md

Co-authored-by: alesapin <alesapin@gmail.com>
---
 docs/ru/operations/clickhouse-keeper.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index 8fc3c6af1b6..ccdf9572737 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -54,7 +54,7 @@ ClickHouse Keeper может использоваться как равноце
 
 -    `id` — идентификатор сервера в кворуме.
 -    `hostname` — имя хоста, на котором размещен сервер.
--    `port` — порт, на котором серверу доступны соединения.
+-    `port` — порт, на котором серверу доступны соединения для внутренней коммуникации.
 
 
 Примеры конфигурации кворума с тремя узлами можно найти в [интеграционных тестах](https://github.com/ClickHouse/ClickHouse/tree/master/tests/integration) с префиксом `test_keeper_`. Пример конфигурации для сервера №1:

From 9304c3549baaf40cae0658abbe75d7d68ca65daf Mon Sep 17 00:00:00 2001
From: Evgenia Sudarikova <56156889+otrazhenia@users.noreply.github.com>
Date: Mon, 13 Sep 2021 20:21:35 +0300
Subject: [PATCH 241/273] Update docs/ru/operations/clickhouse-keeper.md

Co-authored-by: alesapin <alesapin@gmail.com>
---
 docs/ru/operations/clickhouse-keeper.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index ccdf9572737..fa279b22313 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -94,7 +94,7 @@ ClickHouse Keeper может использоваться как равноце
 
 ## Как запустить
 
-ClickHouse Keeper входит в пакет сервера ClickHouse, просто добавьте кофигурацию `<keeper_server>` и запустите сервер ClickHouse как обычно. Если вы хотите запустить ClickHouse Keeper автономно, сделайте это аналогичным способом:
+ClickHouse Keeper входит в пакет` clickhouse-server`, просто добавьте кофигурацию `<keeper_server>` и запустите сервер ClickHouse как обычно. Если вы хотите запустить ClickHouse Keeper автономно, сделайте это аналогичным способом:
 
 ```bash
 clickhouse-keeper --config /etc/your_path_to_config/config.xml --daemon

From 51ac71c83d1c337a0a42d7d2e76945eed3395beb Mon Sep 17 00:00:00 2001
From: Evgenia Sudarikova <56156889+otrazhenia@users.noreply.github.com>
Date: Mon, 13 Sep 2021 20:21:47 +0300
Subject: [PATCH 242/273] Update docs/ru/operations/clickhouse-keeper.md

Co-authored-by: alesapin <alesapin@gmail.com>
---
 docs/ru/operations/clickhouse-keeper.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index fa279b22313..8e2c6482612 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -102,7 +102,7 @@ clickhouse-keeper --config /etc/your_path_to_config/config.xml --daemon
 
 ## [экспериментально] Переход с ZooKeeper
 
-Плавный переход с ZooKeeper на ClickHouse Keeper невозможен, необходимо остановить кластер ZooKeeper, преобразовать данные и запустить ClickHouse Keeper. `clickhouse-keeper-converter` конвертирует журналы и снэпшоты ZooKeeper в снэпшот ClickHouse Keeper. Это работает только для версии ZooKeeper выше 3.4. Для перехода выполните следующие шаги:
+Плавный переход с ZooKeeper на ClickHouse Keeper невозможен, необходимо остановить кластер ZooKeeper, преобразовать данные и запустить ClickHouse Keeper. Утилита `clickhouse-keeper-converter` конвертирует журналы и снэпшоты ZooKeeper в снэпшот ClickHouse Keeper. Работа утилиты проверена только для версий ZooKeeper выше 3.4. Для миграции необходимо выполнить следующие шаги:
 
 1. Остановите все узлы ZooKeeper.
 

From cc3d3cc91e0b2e9af2135a8f878ed4a9c5d75848 Mon Sep 17 00:00:00 2001
From: Evgenia Sudarikova <56156889+otrazhenia@users.noreply.github.com>
Date: Mon, 13 Sep 2021 20:21:55 +0300
Subject: [PATCH 243/273] Update docs/ru/operations/clickhouse-keeper.md

Co-authored-by: alesapin <alesapin@gmail.com>
---
 docs/ru/operations/clickhouse-keeper.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index 8e2c6482612..876a79282cc 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -106,7 +106,7 @@ clickhouse-keeper --config /etc/your_path_to_config/config.xml --daemon
 
 1. Остановите все узлы ZooKeeper.
 
-2. Необязательно, но рекомендуется: найдите лидер, запустите и снова остановите его. Это заставит ZooKeeper создать согласованный снэпшот.
+2. Необязательно, но рекомендуется: найдите узел-лидер ZooKeeper, запустите и снова остановите его. Это заставит ZooKeeper создать консистентный снэпшот.
 
 3. Запустите `clickhouse-keeper-converter` на лидере, например:
 

From 305eb4d85f265956202f938c24b09a1b22c75f75 Mon Sep 17 00:00:00 2001
From: Evgenia Sudarikova <56156889+otrazhenia@users.noreply.github.com>
Date: Mon, 13 Sep 2021 20:22:05 +0300
Subject: [PATCH 244/273] Update docs/ru/operations/clickhouse-keeper.md

Co-authored-by: alesapin <alesapin@gmail.com>
---
 docs/ru/operations/clickhouse-keeper.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index 876a79282cc..96520342590 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -114,6 +114,6 @@ clickhouse-keeper --config /etc/your_path_to_config/config.xml --daemon
 clickhouse-keeper-converter --zookeeper-logs-dir /var/lib/zookeeper/version-2 --zookeeper-snapshots-dir /var/lib/zookeeper/version-2 --output-dir /path/to/clickhouse/keeper/snapshots
 ```
 
-4. Скопируйте снэпшот на узлы сервера ClickHouse с настроенным `keeper` или запустите ClickHouse Keeper вместо ZooKeeper. Снэпшот должен сохраняться на всех узлах: в противном случае пустые узлы будут быстрее, и один из них может стать лидером.
+4. Скопируйте снэпшот на узлы сервера ClickHouse с настроенным `keeper` или запустите ClickHouse Keeper вместо ZooKeeper. Снэпшот должен сохраняться на всех узлах: в противном случае пустые узлы могут захватить лидерство и сконвертированные данные могут быть отброшены на старте.
 
 [Original article](https://clickhouse.tech/docs/en/operations/clickhouse-keeper/) <!--hide-->
\ No newline at end of file

From 36f6e90fba23aa60aacd2de5e5622a65ecd329a5 Mon Sep 17 00:00:00 2001
From: Evgenia Sudarikova <56156889+otrazhenia@users.noreply.github.com>
Date: Mon, 13 Sep 2021 20:24:50 +0300
Subject: [PATCH 245/273] Update docs/ru/operations/clickhouse-keeper.md

Co-authored-by: alesapin <alesapin@gmail.com>
---
 docs/ru/operations/clickhouse-keeper.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index 96520342590..48b75d797b4 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -33,7 +33,7 @@ ClickHouse Keeper может использоваться как равноце
 -    `operation_timeout_ms` — максимальное время ожидания для одной клиентской операции в миллисекундах (по умолчанию: 10000).
 -    `session_timeout_ms` — максимальное время ожидания для клиентской сессии в миллисекундах (по умолчанию: 30000).
 -    `dead_session_check_period_ms` — частота, с которой ClickHouse Keeper проверяет мертвые сессии и удаляет их, в миллисекундах (по умолчанию: 500).
--    `heart_beat_interval_ms` — частота, с которой узел-лидер ClickHouse Keeper отправляет сердцебиение узлам-последователям, в миллисекундах (по умолчанию: 500).
+-    `heart_beat_interval_ms` — частота, с которой узел-лидер ClickHouse Keeper отправляет хартбиты узлам-последователям, в миллисекундах (по умолчанию: 500).
 -    `election_timeout_lower_bound_ms` — время, после которого последователь может инициировать выборы лидера, если не получил от него сердцебиения (по умолчанию: 1000).
 -    `election_timeout_upper_bound_ms` — время, после которого последователь должен инициировать выборы лидера, если не получил от него сердцебиения (по умолчанию: 2000).
 -    `rotate_log_storage_interval` — количество записей журнала для хранения в одном файле (по умолчанию: 100000).

From 4a83bfdeaac2fb8d8adb4ff92f6df4682bec2936 Mon Sep 17 00:00:00 2001
From: Evgenia Sudarikova <56156889+otrazhenia@users.noreply.github.com>
Date: Mon, 13 Sep 2021 20:25:33 +0300
Subject: [PATCH 246/273] Update docs/ru/operations/clickhouse-keeper.md

Co-authored-by: alesapin <alesapin@gmail.com>
---
 docs/ru/operations/clickhouse-keeper.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index 48b75d797b4..ce5a4cd5f34 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -36,7 +36,7 @@ ClickHouse Keeper может использоваться как равноце
 -    `heart_beat_interval_ms` — частота, с которой узел-лидер ClickHouse Keeper отправляет хартбиты узлам-последователям, в миллисекундах (по умолчанию: 500).
 -    `election_timeout_lower_bound_ms` — время, после которого последователь может инициировать выборы лидера, если не получил от него сердцебиения (по умолчанию: 1000).
 -    `election_timeout_upper_bound_ms` — время, после которого последователь должен инициировать выборы лидера, если не получил от него сердцебиения (по умолчанию: 2000).
--    `rotate_log_storage_interval` — количество записей журнала для хранения в одном файле (по умолчанию: 100000).
+-    `rotate_log_storage_interval` — количество записей в журнале  координации для хранения в одном файле (по умолчанию: 100000).
 -    `reserved_log_items` — количество записей журнала координации для хранения перед сжатием (по умолчанию: 100000).
 -    `snapshot_distance` — частота, с которой ClickHouse Keeper делает новые снэпшоты (по количеству записей в журналах), в миллисекундах (по умолчанию: 100000).
 -    `snapshots_to_keep` — количество снэпшотов для сохранения (по умолчанию: 3).

From 105e0a0187645878dd7eb856e9550075f07eb2ce Mon Sep 17 00:00:00 2001
From: Evgenia Sudarikova <56156889+otrazhenia@users.noreply.github.com>
Date: Mon, 13 Sep 2021 20:25:50 +0300
Subject: [PATCH 247/273] Update docs/ru/operations/clickhouse-keeper.md

Co-authored-by: alesapin <alesapin@gmail.com>
---
 docs/ru/operations/clickhouse-keeper.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index ce5a4cd5f34..28ae80871af 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -37,7 +37,7 @@ ClickHouse Keeper может использоваться как равноце
 -    `election_timeout_lower_bound_ms` — время, после которого последователь может инициировать выборы лидера, если не получил от него сердцебиения (по умолчанию: 1000).
 -    `election_timeout_upper_bound_ms` — время, после которого последователь должен инициировать выборы лидера, если не получил от него сердцебиения (по умолчанию: 2000).
 -    `rotate_log_storage_interval` — количество записей в журнале  координации для хранения в одном файле (по умолчанию: 100000).
--    `reserved_log_items` — количество записей журнала координации для хранения перед сжатием (по умолчанию: 100000).
+-    `reserved_log_items` — минимальное количество записей в журнале координации которые нужно сохранять после снятия снепшота (по умолчанию: 100000).
 -    `snapshot_distance` — частота, с которой ClickHouse Keeper делает новые снэпшоты (по количеству записей в журналах), в миллисекундах (по умолчанию: 100000).
 -    `snapshots_to_keep` — количество снэпшотов для сохранения (по умолчанию: 3).
 -    `stale_log_gap` — время, после которого лидер считает последователя устаревшим и отправляет ему снэпшот вместо журналов (по умолчанию: 10000).

From 3d8c8bdf0ded96be5b031106627815807dbd5b27 Mon Sep 17 00:00:00 2001
From: Evgenia Sudarikova <56156889+otrazhenia@users.noreply.github.com>
Date: Mon, 13 Sep 2021 20:26:16 +0300
Subject: [PATCH 248/273] Update docs/ru/operations/clickhouse-keeper.md

Co-authored-by: alesapin <alesapin@gmail.com>
---
 docs/ru/operations/clickhouse-keeper.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index 28ae80871af..45a7d10d4a1 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -41,7 +41,7 @@ ClickHouse Keeper может использоваться как равноце
 -    `snapshot_distance` — частота, с которой ClickHouse Keeper делает новые снэпшоты (по количеству записей в журналах), в миллисекундах (по умолчанию: 100000).
 -    `snapshots_to_keep` — количество снэпшотов для сохранения (по умолчанию: 3).
 -    `stale_log_gap` — время, после которого лидер считает последователя устаревшим и отправляет ему снэпшот вместо журналов (по умолчанию: 10000).
--    `fresh_log_gap` — время обновления узла (по умолчанию: 200).
+-    `fresh_log_gap` — максимальное отставание от лидера в количестве записей журнала после которого последователь считает себя не отстающим (по умолчанию: 200).
 -    `max_requests_batch_size` — максимальный размер пакета в серии запросов, прежде чем он будет отправлен в RAFT (по умолчанию: 100).
 -    `force_sync` — вызывать `fsync` при каждой записи в журнал координации (по умолчанию: true).
 -    `quorum_reads` — выполнять запросы чтения аналогично запросам записи через весь консенсус RAFT с одинаковой скоростью (по умолчанию: false).

From 56f8197c72d12acfe965029537f9c3421bde6ae2 Mon Sep 17 00:00:00 2001
From: Evgenia Sudarikova <56156889+otrazhenia@users.noreply.github.com>
Date: Mon, 13 Sep 2021 20:26:33 +0300
Subject: [PATCH 249/273] Update docs/ru/operations/clickhouse-keeper.md

Co-authored-by: alesapin <alesapin@gmail.com>
---
 docs/ru/operations/clickhouse-keeper.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index 45a7d10d4a1..6f2ff15c484 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -42,7 +42,7 @@ ClickHouse Keeper может использоваться как равноце
 -    `snapshots_to_keep` — количество снэпшотов для сохранения (по умолчанию: 3).
 -    `stale_log_gap` — время, после которого лидер считает последователя устаревшим и отправляет ему снэпшот вместо журналов (по умолчанию: 10000).
 -    `fresh_log_gap` — максимальное отставание от лидера в количестве записей журнала после которого последователь считает себя не отстающим (по умолчанию: 200).
--    `max_requests_batch_size` — максимальный размер пакета в серии запросов, прежде чем он будет отправлен в RAFT (по умолчанию: 100).
+-    `max_requests_batch_size` — количество запросов на запись, которые будут сгруппированы в один перед отправкой через RAFT (по умолчанию: 100).
 -    `force_sync` — вызывать `fsync` при каждой записи в журнал координации (по умолчанию: true).
 -    `quorum_reads` — выполнять запросы чтения аналогично запросам записи через весь консенсус RAFT с одинаковой скоростью (по умолчанию: false).
 -    `raft_logs_level` — уровень, на котором ведется текстовый журнал координации (трассировка, отладка и т. д.) (по умолчанию: значение системы по умолчанию).

From fcbbd3f19ac2e8580bc5a4768078d40fab90bd1d Mon Sep 17 00:00:00 2001
From: Evgenia Sudarikova <56156889+otrazhenia@users.noreply.github.com>
Date: Mon, 13 Sep 2021 20:27:10 +0300
Subject: [PATCH 250/273] Update docs/ru/operations/clickhouse-keeper.md

Co-authored-by: alesapin <alesapin@gmail.com>
---
 docs/ru/operations/clickhouse-keeper.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index 6f2ff15c484..58947275b7a 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -44,7 +44,7 @@ ClickHouse Keeper может использоваться как равноце
 -    `fresh_log_gap` — максимальное отставание от лидера в количестве записей журнала после которого последователь считает себя не отстающим (по умолчанию: 200).
 -    `max_requests_batch_size` — количество запросов на запись, которые будут сгруппированы в один перед отправкой через RAFT (по умолчанию: 100).
 -    `force_sync` — вызывать `fsync` при каждой записи в журнал координации (по умолчанию: true).
--    `quorum_reads` — выполнять запросы чтения аналогично запросам записи через весь консенсус RAFT с одинаковой скоростью (по умолчанию: false).
+-    `quorum_reads` — выполнять запросы чтения аналогично запросам записи через весь консенсус RAFT с негативным эффектом на производительность и размер журналов (по умолчанию: false).
 -    `raft_logs_level` — уровень, на котором ведется текстовый журнал координации (трассировка, отладка и т. д.) (по умолчанию: значение системы по умолчанию).
 -    `auto_forwarding` — разрешить пересылку запросов на запись от последователей лидеру (по умолчанию: true).
 -    `shutdown_timeout` — время ожидания завершения внутренних подключений и выключения, в миллисекундах (по умолчанию: 5000).

From c66774efe409f99399ba8699ea9cfdaeba2e7c67 Mon Sep 17 00:00:00 2001
From: Evgenia Sudarikova <56156889+otrazhenia@users.noreply.github.com>
Date: Mon, 13 Sep 2021 20:27:35 +0300
Subject: [PATCH 251/273] Update docs/ru/operations/clickhouse-keeper.md

Co-authored-by: alesapin <alesapin@gmail.com>
---
 docs/ru/operations/clickhouse-keeper.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index 58947275b7a..352a5fe3037 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -45,7 +45,7 @@ ClickHouse Keeper может использоваться как равноце
 -    `max_requests_batch_size` — количество запросов на запись, которые будут сгруппированы в один перед отправкой через RAFT (по умолчанию: 100).
 -    `force_sync` — вызывать `fsync` при каждой записи в журнал координации (по умолчанию: true).
 -    `quorum_reads` — выполнять запросы чтения аналогично запросам записи через весь консенсус RAFT с негативным эффектом на производительность и размер журналов (по умолчанию: false).
--    `raft_logs_level` — уровень, на котором ведется текстовый журнал координации (трассировка, отладка и т. д.) (по умолчанию: значение системы по умолчанию).
+-    `raft_logs_level` — уровень логгирования сообщений в текстовый лог  (trace, debug и т. д.) (по умолчанию: information).
 -    `auto_forwarding` — разрешить пересылку запросов на запись от последователей лидеру (по умолчанию: true).
 -    `shutdown_timeout` — время ожидания завершения внутренних подключений и выключения, в миллисекундах (по умолчанию: 5000).
 -    `startup_timeout` — время отключения сервера, если он не подключается к другим участникам кворума, в миллисекундах (по умолчанию: 30000).

From a7e003ad5ca38e7d2c39e2e711a3e32972cf7813 Mon Sep 17 00:00:00 2001
From: Evgenia Sudarikova <56156889+otrazhenia@users.noreply.github.com>
Date: Mon, 13 Sep 2021 20:27:54 +0300
Subject: [PATCH 252/273] Update docs/ru/operations/clickhouse-keeper.md

Co-authored-by: alesapin <alesapin@gmail.com>
---
 docs/ru/operations/clickhouse-keeper.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index 352a5fe3037..5c8661398b5 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -50,7 +50,7 @@ ClickHouse Keeper может использоваться как равноце
 -    `shutdown_timeout` — время ожидания завершения внутренних подключений и выключения, в миллисекундах (по умолчанию: 5000).
 -    `startup_timeout` — время отключения сервера, если он не подключается к другим участникам кворума, в миллисекундах (по умолчанию: 30000).
 
-Конфигурация кворума находится в `<keeper_server>.<raft_configuration>` и содержит описание серверов. Единственный параметр для всего кворума — `secure`, который разрешает зашифрованное соединение для связи между участниками кворума. Параметры для каждого `<server>`:
+Конфигурация кворума находится в `<keeper_server>.<raft_configuration>` и содержит описание серверов. Единственный параметр для всего кворума — `secure`, который включает зашифрованное соединение для связи между участниками кворума. Параметры для каждого `<server>`:
 
 -    `id` — идентификатор сервера в кворуме.
 -    `hostname` — имя хоста, на котором размещен сервер.

From 671f98506ac3dc9401fee49cf370f685a9f6293f Mon Sep 17 00:00:00 2001
From: Anton Popov <pad11rus@gmail.com>
Date: Mon, 13 Sep 2021 20:34:36 +0300
Subject: [PATCH 253/273] fix build

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

diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index 0cf704622b3..5b780e4de56 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -582,7 +582,7 @@ class FunctionBinaryArithmetic : public IFunction
             DataTypeInt8, DataTypeInt16, DataTypeInt32, DataTypeInt64, DataTypeInt128, DataTypeInt256,
             DataTypeDecimal32, DataTypeDecimal64, DataTypeDecimal128, DataTypeDecimal256,
             DataTypeDate, DataTypeDateTime,
-            DataTypeFixedString, String>;
+            DataTypeFixedString, DataTypeString>;
 
         using Floats = TypeList<DataTypeFloat32, DataTypeFloat64>;
 

From 2b49f42bca5702285c4fe9e94de5344fc7ef33b8 Mon Sep 17 00:00:00 2001
From: Anton Popov <pad11rus@gmail.com>
Date: Mon, 13 Sep 2021 20:37:35 +0300
Subject: [PATCH 254/273] fix build

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

diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index 5b780e4de56..21c5cc8440d 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -575,7 +575,7 @@ class FunctionBinaryArithmetic : public IFunction
     ContextPtr context;
     bool check_decimal_overflow = true;
 
-    static bool (const IDataType * type, auto && f)
+    static bool castType(const IDataType * type, auto && f)
     {
         using Types = TypeList<
             DataTypeUInt8, DataTypeUInt16, DataTypeUInt32, DataTypeUInt64, DataTypeUInt128, DataTypeUInt256,

From 68bf657c292177e253bed87e41df920de7d83731 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Mon, 13 Sep 2021 20:53:09 +0300
Subject: [PATCH 255/273] Fix the number of threads used in GLOBAL IN.

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

diff --git a/src/Interpreters/GlobalSubqueriesVisitor.h b/src/Interpreters/GlobalSubqueriesVisitor.h
index 6a87527dc9c..99197e81f80 100644
--- a/src/Interpreters/GlobalSubqueriesVisitor.h
+++ b/src/Interpreters/GlobalSubqueriesVisitor.h
@@ -164,7 +164,7 @@ public:
                     return table_out;
                 });
                 auto executor = io.pipeline.execute();
-                executor->execute(io.pipeline.getNumStreams());
+                executor->execute(io.pipeline.getNumThreads());
             }
             else
             {

From e8bc0287ffe0c6ab1b1349d09275af8235d388f6 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nik-kochetov@yandex-team.ru>
Date: Mon, 13 Sep 2021 20:53:31 +0300
Subject: [PATCH 256/273] Add test.

---
 .../queries/0_stateless/2015_global_in_threads.reference | 2 ++
 tests/queries/0_stateless/2015_global_in_threads.sh      | 9 +++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 tests/queries/0_stateless/2015_global_in_threads.reference
 create mode 100755 tests/queries/0_stateless/2015_global_in_threads.sh

diff --git a/tests/queries/0_stateless/2015_global_in_threads.reference b/tests/queries/0_stateless/2015_global_in_threads.reference
new file mode 100644
index 00000000000..af81158ecae
--- /dev/null
+++ b/tests/queries/0_stateless/2015_global_in_threads.reference
@@ -0,0 +1,2 @@
+10
+1
diff --git a/tests/queries/0_stateless/2015_global_in_threads.sh b/tests/queries/0_stateless/2015_global_in_threads.sh
new file mode 100755
index 00000000000..d17173aeb61
--- /dev/null
+++ b/tests/queries/0_stateless/2015_global_in_threads.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_CLIENT} --log_queries=1 --max_threads=32 --query_id "2015_${CLICKHOUSE_DATABASE}_query" -q "select count() from remote('127.0.0.{2,3}', numbers(10)) where number global in (select number % 5 from numbers_mt(1000000))"
+${CLICKHOUSE_CLIENT} -q "system flush logs"
+${CLICKHOUSE_CLIENT} -q "select length(thread_ids) >= 32 from system.query_log where event_date = today() and query_id = '2015_${CLICKHOUSE_DATABASE}_query' and type = 'QueryFinish'"

From 1792b23a2c2fd9cc73bb86e48a58cd0cacefcd91 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Tue, 14 Sep 2021 00:28:02 +0300
Subject: [PATCH 257/273] Fix 01150_ddl_guard_rwr test

CI report [1]:

    2021-09-13 09:55:27 Code: 219. DB::Exception: Received from localhost:9000. DB::Exception: New table appeared in database being dropped or detached. Try again.. (DATABASE_NOT_EMPTY)
    2021-09-13 09:55:27 Code: 82. DB::Exception: Received from localhost:9000. DB::Exception: Database test_01150 already exists.. (DATABASE_ALREADY_EXISTS)

  [1]: https://clickhouse-test-reports.s3.yandex.net/0/abe314feecd1647d7c2b952a25da7abf5c19f352/functional_stateless_tests_(release,_databaseordinary)/test_run.txt.out.log
---
 tests/queries/0_stateless/01150_ddl_guard_rwr.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/queries/0_stateless/01150_ddl_guard_rwr.sh b/tests/queries/0_stateless/01150_ddl_guard_rwr.sh
index c18c1cdced6..50e6f91b49b 100755
--- a/tests/queries/0_stateless/01150_ddl_guard_rwr.sh
+++ b/tests/queries/0_stateless/01150_ddl_guard_rwr.sh
@@ -15,9 +15,9 @@ $CLICKHOUSE_CLIENT --query "CREATE TABLE test_01150.t2 (x UInt64, s Array(Nullab
 
 function thread_detach_attach {
     while true; do
-        $CLICKHOUSE_CLIENT --query "DETACH DATABASE test_01150" 2>&1 | grep -v -F -e 'Received exception from server' -e 'Code: (219)' -e '(query: '
+        $CLICKHOUSE_CLIENT --query "DETACH DATABASE test_01150" 2>&1 | grep -v -F -e 'Received exception from server' -e 'Code: 219' -e '(query: '
         sleep 0.0$RANDOM
-        $CLICKHOUSE_CLIENT --query "ATTACH DATABASE test_01150" 2>&1 | grep -v -F -e 'Received exception from server' -e 'Code: (219)' -e '(query: '
+        $CLICKHOUSE_CLIENT --query "ATTACH DATABASE test_01150" 2>&1 | grep -v -F -e 'Received exception from server' -e 'Code: 82' -e '(query: '
         sleep 0.0$RANDOM
     done
 }

From 10723160b392c5c9b54718ed7c4f354dd4ffda16 Mon Sep 17 00:00:00 2001
From: Denny Crane <deniszhuravlov@gmail.com>
Date: Tue, 14 Sep 2021 00:13:54 -0300
Subject: [PATCH 258/273] Update rounding-functions.md

---
 .../functions/rounding-functions.md           | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/docs/ru/sql-reference/functions/rounding-functions.md b/docs/ru/sql-reference/functions/rounding-functions.md
index 276f85bf6b7..1eede1ea57c 100644
--- a/docs/ru/sql-reference/functions/rounding-functions.md
+++ b/docs/ru/sql-reference/functions/rounding-functions.md
@@ -27,7 +27,7 @@ N может быть отрицательным.
 
 Округляет значение до указанного десятичного разряда.
 
-Функция возвращает ближайшее значение указанного порядка. В случае, когда заданное число равноудалено от чисел необходимого порядка, функция возвращает то из них, которое имеет ближайшую чётную цифру (банковское округление).
+Функция возвращает ближайшее значение указанного порядка. В случае, когда заданное число равноудалено от чисел необходимого порядка, для типов с плавающей точкой (Float32/64) функция возвращает то из них, которое имеет ближайшую чётную цифру (банковское округление), для типов с фиксированной точкой (Decimal) функция использует округление в бо́льшую по модулю сторону (математическое округление).
 
 ``` sql
 round(expression [, decimal_places])
@@ -47,7 +47,7 @@ round(expression [, decimal_places])
 
 ### Примеры {#primery}
 
-**Пример использования**
+**Пример использования с Float**
 
 ``` sql
 SELECT number / 2 AS x, round(x) FROM system.numbers LIMIT 3
@@ -61,6 +61,21 @@ SELECT number / 2 AS x, round(x) FROM system.numbers LIMIT 3
 └─────┴──────────────────────────┘
 ```
 
+**Пример использования с Decimal**
+
+
+``` sql
+SELECT cast(number / 2 AS  Decimal(10,4)) AS x, round(x) FROM system.numbers LIMIT 3
+```
+
+``` text
+┌──────x─┬─round(CAST(divide(number, 2), 'Decimal(10, 4)'))─┐
+│ 0.0000 │                                           0.0000 │
+│ 0.5000 │                                           1.0000 │
+│ 1.0000 │                                           1.0000 │
+└────────┴──────────────────────────────────────────────────┘
+```
+
 **Примеры округления**
 
 Округление до ближайшего числа.

From efd4ac381b010f42d0e0194d82c7f788aef7c04a Mon Sep 17 00:00:00 2001
From: Denny Crane <deniszhuravlov@gmail.com>
Date: Tue, 14 Sep 2021 00:19:17 -0300
Subject: [PATCH 259/273] Update rounding-functions.md

---
 .../functions/rounding-functions.md            | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/docs/en/sql-reference/functions/rounding-functions.md b/docs/en/sql-reference/functions/rounding-functions.md
index 5f74c6329d1..f564f15659c 100644
--- a/docs/en/sql-reference/functions/rounding-functions.md
+++ b/docs/en/sql-reference/functions/rounding-functions.md
@@ -29,7 +29,7 @@ Returns the round number with largest absolute value that has an absolute value
 
 Rounds a value to a specified number of decimal places.
 
-The function returns the nearest number of the specified order. In case when given number has equal distance to surrounding numbers, the function uses banker’s rounding for float number types and rounds away from zero for the other number types.
+The function returns the nearest number of the specified order. In case when given number has equal distance to surrounding numbers, the function uses banker’s rounding for float number types and rounds away from zero for the other number types (Decimal).
 
 ``` sql
 round(expression [, decimal_places])
@@ -49,7 +49,7 @@ The rounded number of the same type as the input number.
 
 ### Examples {#examples}
 
-**Example of use**
+**Example of use with Float**
 
 ``` sql
 SELECT number / 2 AS x, round(x) FROM system.numbers LIMIT 3
@@ -63,6 +63,20 @@ SELECT number / 2 AS x, round(x) FROM system.numbers LIMIT 3
 └─────┴──────────────────────────┘
 ```
 
+**Example of use with Decimal**
+
+``` sql
+SELECT cast(number / 2 AS  Decimal(10,4)) AS x, round(x) FROM system.numbers LIMIT 3
+```
+
+``` text
+┌──────x─┬─round(CAST(divide(number, 2), 'Decimal(10, 4)'))─┐
+│ 0.0000 │                                           0.0000 │
+│ 0.5000 │                                           1.0000 │
+│ 1.0000 │                                           1.0000 │
+└────────┴──────────────────────────────────────────────────┘
+```
+
 **Examples of rounding**
 
 Rounding to the nearest number.

From 9416c5e74d24af764101caae4e82746347ad3e36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=B7=AF?= <821008736@qq.com>
Date: Tue, 14 Sep 2021 11:22:34 +0800
Subject: [PATCH 260/273] Remove outdated comment.

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

diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index 21c5cc8440d..69f9f212334 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -245,7 +245,7 @@ struct StringIntegerOperationImpl
         }
     }
 
-    /// if is_fixed_string n_or_in_offsets is n, otherwise n_or_in_offsets is in_offsets
+
     template <OpCase op_case>
     static void NO_INLINE processString(const UInt8 * __restrict in_vec, const UInt64 * __restrict in_offsets, const B * __restrict b, ColumnString::Chars & out_vec, ColumnString::Offsets & out_offsets, size_t size)
     {

From e687b3b60035458bbe6762319b6aa1c8f7e8aacf Mon Sep 17 00:00:00 2001
From: alexey-milovidov <milovidov@yandex-team.ru>
Date: Tue, 14 Sep 2021 09:52:02 +0300
Subject: [PATCH 261/273] Update int-uint.md

---
 docs/en/sql-reference/data-types/int-uint.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/en/sql-reference/data-types/int-uint.md b/docs/en/sql-reference/data-types/int-uint.md
index 95d1120ed3d..b6fff135b78 100644
--- a/docs/en/sql-reference/data-types/int-uint.md
+++ b/docs/en/sql-reference/data-types/int-uint.md
@@ -25,14 +25,13 @@ Aliases:
 -   `Int32` — `INT`, `INT4`, `INTEGER`.
 -   `Int64` — `BIGINT`.
 
-## Uint Ranges {#uint-ranges}
+## UInt Ranges {#uint-ranges}
 
 -   `UInt8` — \[0 : 255\]
 -   `UInt16` — \[0 : 65535\]
 -   `UInt32` — \[0 : 4294967295\]
 -   `UInt64` — \[0 : 18446744073709551615\]
+-   `UInt128` — \[0 : 340282366920938463463374607431768211455\]
 -   `UInt256` — \[0 : 115792089237316195423570985008687907853269984665640564039457584007913129639935\]
 
-`UInt128` is not supported yet.
-
 [Original article](https://clickhouse.tech/docs/en/data_types/int_uint/) <!--hide-->

From 1b89719462e87e4a2978c3878608a7555c458677 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <KochetovNicolai@users.noreply.github.com>
Date: Tue, 14 Sep 2021 11:53:53 +0300
Subject: [PATCH 262/273] Update 2015_global_in_threads.sh

---
 tests/queries/0_stateless/2015_global_in_threads.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/queries/0_stateless/2015_global_in_threads.sh b/tests/queries/0_stateless/2015_global_in_threads.sh
index d17173aeb61..c112e47fe92 100755
--- a/tests/queries/0_stateless/2015_global_in_threads.sh
+++ b/tests/queries/0_stateless/2015_global_in_threads.sh
@@ -6,4 +6,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 ${CLICKHOUSE_CLIENT} --log_queries=1 --max_threads=32 --query_id "2015_${CLICKHOUSE_DATABASE}_query" -q "select count() from remote('127.0.0.{2,3}', numbers(10)) where number global in (select number % 5 from numbers_mt(1000000))"
 ${CLICKHOUSE_CLIENT} -q "system flush logs"
-${CLICKHOUSE_CLIENT} -q "select length(thread_ids) >= 32 from system.query_log where event_date = today() and query_id = '2015_${CLICKHOUSE_DATABASE}_query' and type = 'QueryFinish'"
+${CLICKHOUSE_CLIENT} -q "select length(thread_ids) >= 32 from system.query_log where event_date = today() and query_id = '2015_${CLICKHOUSE_DATABASE}_query' and type = 'QueryFinish' and current_database = currentDatabase()"

From 76b8d9d85ffd1c04e7591e2e989c906c2c25a74c Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Tue, 14 Sep 2021 13:57:05 +0300
Subject: [PATCH 263/273] Better error message on concurrent alters

---
 src/Storages/StorageReplicatedMergeTree.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index 8e23787ce73..c1655e2377e 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -4996,7 +4996,8 @@ void StorageReplicatedMergeTree::alter(
         else if (rc == Coordination::Error::ZBADVERSION)
         {
             if (results[0]->error != Coordination::Error::ZOK)
-                throw Exception("Metadata on replica is not up to date with common metadata in Zookeeper. Cannot alter",
+                throw Exception("Metadata on replica is not up to date with common metadata in Zookeeper. It means that this replica still not applied some of previous alters.
+                                " Probably too many alters executing concurrently (highly not recommended). You can retry this error",
                     ErrorCodes::CANNOT_ASSIGN_ALTER);
 
             /// Cannot retry automatically, because some zookeeper ops were lost on the first attempt. Will retry on DDLWorker-level.

From 797df22418ef021de0be18f5733e3ac76196b5f9 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Tue, 14 Sep 2021 14:45:33 +0300
Subject: [PATCH 264/273] Fix build

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

diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index c1655e2377e..5ea29f6680f 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -4996,7 +4996,7 @@ void StorageReplicatedMergeTree::alter(
         else if (rc == Coordination::Error::ZBADVERSION)
         {
             if (results[0]->error != Coordination::Error::ZOK)
-                throw Exception("Metadata on replica is not up to date with common metadata in Zookeeper. It means that this replica still not applied some of previous alters.
+                throw Exception("Metadata on replica is not up to date with common metadata in Zookeeper. It means that this replica still not applied some of previous alters."
                                 " Probably too many alters executing concurrently (highly not recommended). You can retry this error",
                     ErrorCodes::CANNOT_ASSIGN_ALTER);
 

From 58f2504a56b6538472baf677f027da8d30b7e394 Mon Sep 17 00:00:00 2001
From: Nikita Mikhaylov <mikhaylovnikitka@gmail.com>
Date: Tue, 14 Sep 2021 12:00:32 +0000
Subject: [PATCH 265/273] Update ya.make

---
 src/AggregateFunctions/ya.make | 1 +
 src/Common/ya.make             | 1 -
 src/Compression/ya.make        | 5 -----
 src/IO/ya.make                 | 1 -
 src/Interpreters/ya.make       | 1 +
 src/Storages/ya.make           | 2 +-
 6 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/AggregateFunctions/ya.make b/src/AggregateFunctions/ya.make
index f0374fb69bc..e18ec35c540 100644
--- a/src/AggregateFunctions/ya.make
+++ b/src/AggregateFunctions/ya.make
@@ -49,6 +49,7 @@ SRCS(
     AggregateFunctionSimpleLinearRegression.cpp
     AggregateFunctionSimpleState.cpp
     AggregateFunctionSingleValueOrNull.cpp
+    AggregateFunctionSparkbar.cpp
     AggregateFunctionState.cpp
     AggregateFunctionStatistics.cpp
     AggregateFunctionStatisticsSimple.cpp
diff --git a/src/Common/ya.make b/src/Common/ya.make
index bf9d3627661..e130fc7ebea 100644
--- a/src/Common/ya.make
+++ b/src/Common/ya.make
@@ -43,7 +43,6 @@ SRCS(
     Epoll.cpp
     ErrorCodes.cpp
     Exception.cpp
-    ExternalLoaderStatus.cpp
     FieldVisitorDump.cpp
     FieldVisitorHash.cpp
     FieldVisitorSum.cpp
diff --git a/src/Compression/ya.make b/src/Compression/ya.make
index 420ada412e0..8ba48696225 100644
--- a/src/Compression/ya.make
+++ b/src/Compression/ya.make
@@ -35,11 +35,6 @@ SRCS(
     CompressionFactoryAdditions.cpp
     ICompressionCodec.cpp
     LZ4_decompress_faster.cpp
-    fuzzers/compressed_buffer_fuzzer.cpp
-    fuzzers/delta_decompress_fuzzer.cpp
-    fuzzers/double_delta_decompress_fuzzer.cpp
-    fuzzers/encrypted_decompress_fuzzer.cpp
-    fuzzers/lz4_decompress_fuzzer.cpp
     getCompressionCodecForFile.cpp
 
 )
diff --git a/src/IO/ya.make b/src/IO/ya.make
index cc24a690308..6857a0ccdf4 100644
--- a/src/IO/ya.make
+++ b/src/IO/ya.make
@@ -61,7 +61,6 @@ SRCS(
     ReadBufferFromMemory.cpp
     ReadBufferFromPocoSocket.cpp
     ReadHelpers.cpp
-    ReadSettings.cpp
     SeekAvoidingReadBuffer.cpp
     SynchronousReader.cpp
     ThreadPoolReader.cpp
diff --git a/src/Interpreters/ya.make b/src/Interpreters/ya.make
index 0bc7cb11cf0..ed9e28b5a11 100644
--- a/src/Interpreters/ya.make
+++ b/src/Interpreters/ya.make
@@ -48,6 +48,7 @@ SRCS(
     DatabaseAndTableWithAlias.cpp
     DatabaseCatalog.cpp
     DictionaryReader.cpp
+    DuplicateOrderByVisitor.cpp
     EmbeddedDictionaries.cpp
     ExecuteScalarSubqueriesVisitor.cpp
     ExpressionActions.cpp
diff --git a/src/Storages/ya.make b/src/Storages/ya.make
index c85a0dbd902..2821f0d3791 100644
--- a/src/Storages/ya.make
+++ b/src/Storages/ya.make
@@ -18,7 +18,7 @@ SRCS(
     Distributed/DirectoryMonitor.cpp
     Distributed/DistributedSettings.cpp
     Distributed/DistributedSink.cpp
-    ExecutablePoolSettings.cpp
+    ExecutableSettings.cpp
     IStorage.cpp
     IndicesDescription.cpp
     JoinSettings.cpp

From 32e8c11cab7ec5c222073a767d65cceffbd0d3b4 Mon Sep 17 00:00:00 2001
From: vdimir <vdimir@yandex-team.ru>
Date: Tue, 14 Sep 2021 15:04:45 +0300
Subject: [PATCH 266/273] Check left join strictness in tryInitDictJoin

---
 src/Interpreters/TableJoin.cpp                         | 10 +++++++++-
 .../0_stateless/01115_join_with_dictionary.reference   |  6 ++++++
 .../queries/0_stateless/01115_join_with_dictionary.sql |  2 ++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/Interpreters/TableJoin.cpp b/src/Interpreters/TableJoin.cpp
index 9194de3073a..b0c89adee45 100644
--- a/src/Interpreters/TableJoin.cpp
+++ b/src/Interpreters/TableJoin.cpp
@@ -339,8 +339,16 @@ static std::optional<String> getDictKeyName(const String & dict_name , ContextPt
 
 bool TableJoin::tryInitDictJoin(const Block & sample_block, ContextPtr context)
 {
+    using Strictness = ASTTableJoin::Strictness;
+
+    bool allowed_inner = isInner(kind()) && strictness() == Strictness::All;
+    bool allowed_left = isLeft(kind()) && (strictness() == Strictness::Any ||
+                                           strictness() == Strictness::All ||
+                                           strictness() == Strictness::Semi ||
+                                           strictness() == Strictness::Anti);
+
     /// Support ALL INNER, [ANY | ALL | SEMI | ANTI] LEFT
-    if (!isLeft(kind()) && !(isInner(kind()) && strictness() == ASTTableJoin::Strictness::All))
+    if (!allowed_inner && !allowed_left)
         return false;
 
     const Names & right_keys = keyNamesRight();
diff --git a/tests/queries/0_stateless/01115_join_with_dictionary.reference b/tests/queries/0_stateless/01115_join_with_dictionary.reference
index 77f7ba193c0..76337bdfc0b 100644
--- a/tests/queries/0_stateless/01115_join_with_dictionary.reference
+++ b/tests/queries/0_stateless/01115_join_with_dictionary.reference
@@ -16,6 +16,12 @@ flat: any left
 2	2	2	2
 3	3	3	3
 4	0		0
+flat: any left + any_join_distinct_right_table_keys
+0	0	0	0
+1	1	1	1
+2	2	2	2
+3	3	3	3
+4	0		0
 flat: semi left
 0	0	0	0
 1	1	1	1
diff --git a/tests/queries/0_stateless/01115_join_with_dictionary.sql b/tests/queries/0_stateless/01115_join_with_dictionary.sql
index 0c84d372f6d..8d8589d6085 100644
--- a/tests/queries/0_stateless/01115_join_with_dictionary.sql
+++ b/tests/queries/0_stateless/01115_join_with_dictionary.sql
@@ -33,6 +33,8 @@ SELECT 'flat: left';
 SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 LEFT JOIN dict_flat d USING(key) ORDER BY key;
 SELECT 'flat: any left';
 SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 ANY LEFT JOIN dict_flat d USING(key) ORDER BY key;
+SELECT 'flat: any left + any_join_distinct_right_table_keys'; -- falls back to regular join
+SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 ANY LEFT JOIN dict_flat d USING(key) ORDER BY key SETTINGS any_join_distinct_right_table_keys = '1';
 SELECT 'flat: semi left';
 SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 SEMI JOIN dict_flat d USING(key) ORDER BY key;
 SELECT 'flat: anti left';

From 2aef13e8027d1434f02cc8b60cb29605657bec9b Mon Sep 17 00:00:00 2001
From: vdimir <vdimir@yandex-team.ru>
Date: Tue, 14 Sep 2021 15:05:09 +0300
Subject: [PATCH 267/273] Update error messages for logical errors in HashJoin

---
 src/Interpreters/HashJoin.cpp        | 10 +++++-----
 src/Parsers/ASTTablesInSelectQuery.h |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Interpreters/HashJoin.cpp b/src/Interpreters/HashJoin.cpp
index 1c450d531d6..2ea9369f476 100644
--- a/src/Interpreters/HashJoin.cpp
+++ b/src/Interpreters/HashJoin.cpp
@@ -1095,7 +1095,7 @@ IColumn::Filter dictionaryJoinRightColumns(const TableJoin & table_join, AddedCo
                 std::move(key_getter), nullptr, added_columns, null_map, flags);
     }
 
-    throw Exception("Logical error: wrong JOIN combination", ErrorCodes::LOGICAL_ERROR);
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong JOIN combination: {} {}", STRICTNESS, KIND);
 }
 
 } /// nameless
@@ -1414,13 +1414,13 @@ void HashJoin::joinBlock(Block & block, ExtraBlockPtr & not_processed)
                     joinBlockImpl<Kind::Left, Strictness::Anti>(block, key_names_left, sample_block_with_columns_to_add, map);
                     break;
                 default:
-                    throw Exception("Logical error: wrong JOIN combination", ErrorCodes::LOGICAL_ERROR);
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong JOIN combination: dictionary + {} {}", strictness, kind);
             }
         }
         else if (kind == Kind::Inner && strictness == Strictness::All)
             joinBlockImpl<Kind::Left, Strictness::Semi>(block, key_names_left, sample_block_with_columns_to_add, map);
         else
-            throw Exception("Logical error: wrong JOIN combination", ErrorCodes::LOGICAL_ERROR);
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong JOIN combination: dictionary + {} {}", strictness, kind);
     }
     else if (joinDispatch(kind, strictness, data->maps, [&](auto kind_, auto strictness_, auto & map)
         {
@@ -1432,7 +1432,7 @@ void HashJoin::joinBlock(Block & block, ExtraBlockPtr & not_processed)
     else if (kind == ASTTableJoin::Kind::Cross)
         joinBlockImplCross(block, not_processed);
     else
-        throw Exception("Logical error: unknown combination of JOIN", ErrorCodes::LOGICAL_ERROR);
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong JOIN combination: {} {}", strictness, kind);
 }
 
 template <typename Mapped>
@@ -1494,7 +1494,7 @@ public:
         };
 
         if (!joinDispatch(parent.kind, parent.strictness, parent.data->maps, fill_callback))
-            throw Exception("Logical error: unknown JOIN strictness (must be on of: ANY, ALL, ASOF)", ErrorCodes::LOGICAL_ERROR);
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown JOIN strictness '{}' (must be on of: ANY, ALL, ASOF)", parent.strictness);
 
         fillNullsFromBlocks(columns_right, rows_added);
         return rows_added;
diff --git a/src/Parsers/ASTTablesInSelectQuery.h b/src/Parsers/ASTTablesInSelectQuery.h
index 8b489974804..9d31ca6f653 100644
--- a/src/Parsers/ASTTablesInSelectQuery.h
+++ b/src/Parsers/ASTTablesInSelectQuery.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Parsers/IAST.h>
+#include <common/EnumReflection.h>
 
 
 namespace DB

From a416fd52d85ad10353012c276b3b1f21ec7d0030 Mon Sep 17 00:00:00 2001
From: Vitaly Stoyan <vitst@yandex.ru>
Date: Tue, 14 Sep 2021 21:22:18 +0300
Subject: [PATCH 268/273] initial commit

---
 src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
index 2da4d7d298d..0536e034fbf 100644
--- a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
+++ b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
@@ -367,15 +367,10 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
         }
         case arrow::Type::TIMESTAMP:
             return readColumnWithTimestampData(arrow_column, column_name);
-#if defined(ARCADIA_BUILD)
-            case arrow::Type::DECIMAL:
-                return readColumnWithDecimalData<Decimal128, arrow::Decimal128Array>(arrow_column, column_name);
-#else
         case arrow::Type::DECIMAL128:
             return readColumnWithDecimalData<Decimal128, arrow::Decimal128Array>(arrow_column, column_name);
         case arrow::Type::DECIMAL256:
             return readColumnWithDecimalData<Decimal256, arrow::Decimal256Array>(arrow_column, column_name);
-#endif
         case arrow::Type::MAP:
         {
             auto arrow_nested_column = getNestedArrowColumn(arrow_column);

From e56ae86f0b1012e528d8d3ca6d8c96fc2a79298d Mon Sep 17 00:00:00 2001
From: sdk2 <469656392@qq.com>
Date: Wed, 15 Sep 2021 11:57:27 +0800
Subject: [PATCH 269/273] fix clang flag use-ctor-homing

---
 CMakeLists.txt          | 9 +++++----
 cmake/check_flags.cmake | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 897111e66bf..3625db4a2d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,9 @@ endforeach()
 
 project(ClickHouse)
 
+# Check if needed compiler flags are supported
+include (cmake/check_flags.cmake)
+
 # If turned off: e.g. when ENABLE_FOO is ON, but FOO tool was not found, the CMake will continue.
 option(FAIL_ON_UNSUPPORTED_OPTIONS_COMBINATION
    "Stop/Fail CMake configuration if some ENABLE_XXX option is defined (either ON or OFF)
@@ -166,7 +169,8 @@ if (COMPILER_CLANG)
         set(COMPILER_FLAGS "${COMPILER_FLAGS} -gdwarf-aranges")
     endif ()
 
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12.0.0)
+    message(STATUS "HAS_USE_CTOR_HOMING: ${HAS_USE_CTOR_HOMING}")
+    if (HAS_USE_CTOR_HOMING AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12.0.0)
 		if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO")
             set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xclang -fuse-ctor-homing")
             set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Xclang -fuse-ctor-homing")
@@ -629,9 +633,6 @@ include_directories(${ConfigIncludePath})
 # Add as many warnings as possible for our own code.
 include (cmake/warnings.cmake)
 
-# Check if needed compiler flags are supported
-include (cmake/check_flags.cmake)
-
 add_subdirectory (base)
 add_subdirectory (src)
 add_subdirectory (programs)
diff --git a/cmake/check_flags.cmake b/cmake/check_flags.cmake
index 5a4ff472868..58605543dff 100644
--- a/cmake/check_flags.cmake
+++ b/cmake/check_flags.cmake
@@ -4,3 +4,4 @@ include (CheckCCompilerFlag)
 check_cxx_compiler_flag("-Wsuggest-destructor-override" HAS_SUGGEST_DESTRUCTOR_OVERRIDE)
 check_cxx_compiler_flag("-Wshadow" HAS_SHADOW)
 check_cxx_compiler_flag("-Wsuggest-override" HAS_SUGGEST_OVERRIDE)
+check_cxx_compiler_flag("-Xclang -fuse-ctor-homing" HAS_USE_CTOR_HOMING)

From 9117c88a924712b0c83ea7e1e8a0d34622b05555 Mon Sep 17 00:00:00 2001
From: sdk2 <469656392@qq.com>
Date: Wed, 15 Sep 2021 12:26:27 +0800
Subject: [PATCH 270/273] better flag check

---
 CMakeLists.txt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3625db4a2d7..9c8903d853c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,9 +28,6 @@ endforeach()
 
 project(ClickHouse)
 
-# Check if needed compiler flags are supported
-include (cmake/check_flags.cmake)
-
 # If turned off: e.g. when ENABLE_FOO is ON, but FOO tool was not found, the CMake will continue.
 option(FAIL_ON_UNSUPPORTED_OPTIONS_COMBINATION
    "Stop/Fail CMake configuration if some ENABLE_XXX option is defined (either ON or OFF)
@@ -155,6 +152,7 @@ if (CMAKE_GENERATOR STREQUAL "Ninja" AND NOT DISABLE_COLORED_BUILD)
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-color=always")
 endif ()
 
+include (cmake/check_flags.cmake)
 include (cmake/add_warning.cmake)
 
 if (NOT MSVC)
@@ -169,8 +167,8 @@ if (COMPILER_CLANG)
         set(COMPILER_FLAGS "${COMPILER_FLAGS} -gdwarf-aranges")
     endif ()
 
-    message(STATUS "HAS_USE_CTOR_HOMING: ${HAS_USE_CTOR_HOMING}")
-    if (HAS_USE_CTOR_HOMING AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12.0.0)
+    if (HAS_USE_CTOR_HOMING)
+        # For more info see https://blog.llvm.org/posts/2021-04-05-constructor-homing-for-debug-info/
 		if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO")
             set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xclang -fuse-ctor-homing")
             set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Xclang -fuse-ctor-homing")

From 48f3f40ffc6d9d885295fbab50dbe1e3bc4ffddd Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Wed, 15 Sep 2021 10:44:19 +0300
Subject: [PATCH 271/273] Update clickhouse-keeper.md

---
 docs/en/operations/clickhouse-keeper.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/operations/clickhouse-keeper.md b/docs/en/operations/clickhouse-keeper.md
index 8e2ee9ab098..0961b525813 100644
--- a/docs/en/operations/clickhouse-keeper.md
+++ b/docs/en/operations/clickhouse-keeper.md
@@ -52,7 +52,7 @@ Internal coordination settings are located in `<keeper_server>.<coordination_set
 
 Quorum configuration is located in `<keeper_server>.<raft_configuration>` section and contain servers description. The only parameter for the whole quorum is `secure`, which enables encrypted connection for communication between quorum participants. The main parameters for each `<server>` are:
 
--    `id` — Server_id in a quorum.
+-    `id` — server identifier in a quorum.
 -    `hostname` — Hostname where this server is placed.
 -    `port` — Port where this server listens for connections.
 
@@ -116,4 +116,4 @@ clickhouse-keeper-converter --zookeeper-logs-dir /var/lib/zookeeper/version-2 --
 
 4. Copy snapshot to ClickHouse server nodes with a configured `keeper` or start ClickHouse Keeper instead of ZooKeeper. The snapshot must persist on all nodes, otherwise, empty nodes can be faster and one of them can become a leader.
 
-[Original article](https://clickhouse.tech/docs/en/operations/clickhouse-keeper/) <!--hide-->
\ No newline at end of file
+[Original article](https://clickhouse.tech/docs/en/operations/clickhouse-keeper/) <!--hide-->

From 45a18d7717d3d47d8683945f69dd1726a375f7aa Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Wed, 15 Sep 2021 10:45:02 +0300
Subject: [PATCH 272/273] Update clickhouse-keeper.md

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

diff --git a/docs/en/operations/clickhouse-keeper.md b/docs/en/operations/clickhouse-keeper.md
index 0961b525813..228a7c3666e 100644
--- a/docs/en/operations/clickhouse-keeper.md
+++ b/docs/en/operations/clickhouse-keeper.md
@@ -52,7 +52,7 @@ Internal coordination settings are located in `<keeper_server>.<coordination_set
 
 Quorum configuration is located in `<keeper_server>.<raft_configuration>` section and contain servers description. The only parameter for the whole quorum is `secure`, which enables encrypted connection for communication between quorum participants. The main parameters for each `<server>` are:
 
--    `id` — server identifier in a quorum.
+-    `id` — Server identifier in a quorum.
 -    `hostname` — Hostname where this server is placed.
 -    `port` — Port where this server listens for connections.
 

From 7246825d8d2b39cc30d6f3f904e433a19820ff2c Mon Sep 17 00:00:00 2001
From: kirillikoff <kirillikoff@yandex.ru>
Date: Wed, 15 Sep 2021 12:16:05 +0300
Subject: [PATCH 273/273] =?UTF-8?q?DOCSUP-14089:=20Document=20the=20max=5F?=
 =?UTF-8?q?hyperscan=5Fregexp=5Flength=20and=20max=5Fhyperscan=5Fregexp=5F?=
 =?UTF-8?q?tot=E2=80=A6=20(#28902)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Document the max_hyperscan_regexp_length and max_hyperscan_regexp_total_length settings

* Update docs/en/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/en/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/en/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/en/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/en/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/en/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/en/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/en/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/en/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/en/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/en/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update settings.md

* Translation into Russian

* Translation into Russian update

* Multiple match

* Update docs/ru/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/ru/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/ru/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

* Update docs/ru/operations/settings/settings.md

Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>

Co-authored-by: Tatiana Kirillova <kirillikoff@yandex-team.ru>
Co-authored-by: olgarev <56617294+olgarev@users.noreply.github.com>
---
 docs/en/operations/settings/settings.md | 88 +++++++++++++++++++++++++
 docs/ru/operations/settings/settings.md | 88 +++++++++++++++++++++++++
 2 files changed, 176 insertions(+)

diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index f286cf4e99e..e3a46d46cd7 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -3566,3 +3566,91 @@ Possible values:
 -   Positive integer.
 
 Default value: `1000`.
+
+## max_hyperscan_regexp_length {#max-hyperscan-regexp-length}
+
+Defines the maximum length for each regular expression in the [hyperscan multi-match functions](../../sql-reference/functions/string-search-functions.md#multimatchanyhaystack-pattern1-pattern2-patternn). 
+
+Possible values:
+
+-   Positive integer.
+-   0 - The length is not limited.
+
+Default value: `0`.
+
+**Example**
+
+Query:
+
+```sql
+SELECT multiMatchAny('abcd', ['ab','bcd','c','d']) SETTINGS max_hyperscan_regexp_length = 3;
+```
+
+Result:
+
+```text
+┌─multiMatchAny('abcd', ['ab', 'bcd', 'c', 'd'])─┐
+│                                              1 │
+└────────────────────────────────────────────────┘
+
+```
+
+Query:
+
+```sql
+SELECT multiMatchAny('abcd', ['ab','bcd','c','d']) SETTINGS max_hyperscan_regexp_length = 2;
+```
+
+Result:
+
+```text
+Exception: Regexp length too large.
+```
+
+**See Also**
+
+-   [max_hyperscan_regexp_total_length](#max-hyperscan-regexp-total-length)
+
+
+## max_hyperscan_regexp_total_length {#max-hyperscan-regexp-total-length}
+
+Sets the maximum length total of all regular expressions in each [hyperscan multi-match function](../../sql-reference/functions/string-search-functions.md#multimatchanyhaystack-pattern1-pattern2-patternn). 
+
+Possible values:
+
+-   Positive integer.
+-   0 - The length is not limited.
+
+Default value: `0`.
+
+**Example**
+
+Query:
+
+```sql
+SELECT multiMatchAny('abcd', ['a','b','c','d']) SETTINGS max_hyperscan_regexp_total_length = 5;
+```
+
+Result:
+
+```text
+┌─multiMatchAny('abcd', ['a', 'b', 'c', 'd'])─┐
+│                                           1 │
+└─────────────────────────────────────────────┘
+```
+
+Query:
+
+```sql
+SELECT multiMatchAny('abcd', ['ab','bc','c','d']) SETTINGS max_hyperscan_regexp_total_length = 5;
+```
+
+Result:
+
+```text
+Exception: Total regexp lengths too large.
+```
+
+**See Also**
+
+-   [max_hyperscan_regexp_length](#max-hyperscan-regexp-length)
diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index 742d86bdd9e..44e05d862c6 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -3375,3 +3375,91 @@ SETTINGS index_granularity = 8192 │
 -   Положительное целое число.
 
 Значение по умолчанию: `1000`.
+
+## max_hyperscan_regexp_length {#max-hyperscan-regexp-length}
+
+Задает максимальную длину каждого регулярного выражения в [hyperscan-функциях](../../sql-reference/functions/string-search-functions.md#multimatchanyhaystack-pattern1-pattern2-patternn)  поиска множественных совпадений в строке. 
+
+Возможные значения:
+
+-   Положительное целое число.
+-   0 - длина не ограничена.
+
+Значение по умолчанию: `0`.
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT multiMatchAny('abcd', ['ab','bcd','c','d']) SETTINGS max_hyperscan_regexp_length = 3;
+```
+
+Результат:
+
+```text
+┌─multiMatchAny('abcd', ['ab', 'bcd', 'c', 'd'])─┐
+│                                              1 │
+└────────────────────────────────────────────────┘
+
+```
+
+Запрос:
+
+```sql
+SELECT multiMatchAny('abcd', ['ab','bcd','c','d']) SETTINGS max_hyperscan_regexp_length = 2;
+```
+
+Результат:
+
+```text
+Exception: Regexp length too large.
+```
+
+**См. также**
+
+-   [max_hyperscan_regexp_total_length](#max-hyperscan-regexp-total-length)
+
+
+## max_hyperscan_regexp_total_length {#max-hyperscan-regexp-total-length}
+
+Задает максимальную общую длину всех регулярных выражений в каждой [hyperscan-функции](../../sql-reference/functions/string-search-functions.md#multimatchanyhaystack-pattern1-pattern2-patternn)  поиска множественных совпадений в строке.
+
+Возможные значения:
+
+-   Положительное целое число.
+-   0 - длина не ограничена.
+
+Значение по умолчанию: `0`.
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT multiMatchAny('abcd', ['a','b','c','d']) SETTINGS max_hyperscan_regexp_total_length = 5;
+```
+
+Результат:
+
+```text
+┌─multiMatchAny('abcd', ['a', 'b', 'c', 'd'])─┐
+│                                           1 │
+└─────────────────────────────────────────────┘
+```
+
+Запрос:
+
+```sql
+SELECT multiMatchAny('abcd', ['ab','bc','c','d']) SETTINGS max_hyperscan_regexp_total_length = 5;
+```
+
+Результат:
+
+```text
+Exception: Total regexp lengths too large.
+```
+
+**См. также**
+
+-   [max_hyperscan_regexp_length](#max-hyperscan-regexp-length)