Merge branch 'master' of https://github.com/yandex/ClickHouse into CLICKHOUSE-2720

CHANGELOG.md

@@ -1,3 +1,41 @@
+# ClickHouse release 1.1.54289
+
+## New features:
+* `SYSTEM` queries for server administration: `SYSTEM RELOAD DICTIONARY`, `SYSTEM RELOAD DICTIONARIES`, `SYSTEM DROP DNS CACHE`, `SYSTEM SHUTDOWN`, `SYSTEM KILL`.
+* Added functions for working with arrays: `concat`, `arraySlice`, `arrayPushBack`, `arrayPushFront`, `arrayPopBack`, `arrayPopFront`.
+* Added the `root` and `identity` parameters for the ZooKeeper configuration. This allows you to isolate individual users on the same ZooKeeper cluster.
+* Added the aggregate functions `groupBitAnd`, `groupBitOr`, and `groupBitXor` (for compatibility, they can also be accessed with the names `BIT_AND`, `BIT_OR`, and `BIT_XOR`).
+* External dictionaries can be loaded from MySQL by specifying a socket in the filesystem.
+* External dictionaries can be loaded from MySQL over SSL (the `ssl_cert`, `ssl_key`, and `ssl_ca` parameters).
+* Added the `max_network_bandwidth_for_user` setting to restrict the overall bandwidth use for queries per user.
+* Support for `DROP TABLE` for temporary tables.
+* Support for reading `DateTime` values in Unix timestamp format from the `CSV` and `JSONEachRow` formats.
+* Lagging replicas in distributed queries are now excluded by default (the default threshold is 5 minutes).
+* FIFO locking is used during ALTER: an ALTER query isn't blocked indefinitely for continuously running queries.
+* Option to set `umask` in the config file.
+* Improved performance for queries with `DISTINCT`.
+
+## Bug fixes:
+* Improved the process for deleting old nodes in ZooKeeper. Previously, old nodes sometimes didn't get deleted if there were very frequent inserts, which caused the server to be slow to shut down, among other things.
+* Fixed randomization when choosing hosts for the connection to ZooKeeper.
+* Fixed the exclusion of lagging replicas in distributed queries if the replica is localhost.
+* Fixed an error where a data part in a `ReplicatedMergeTree` table could be broken after running `ALTER MODIFY` on an element in a `Nested` structure.
+* Fixed an error that could cause SELECT queries to "hang". 
+* Improvements to distributed DDL queries.
+* Fixed the query `CREATE TABLE ... AS <materialized view>`.
+* Resolved the deadlock in the `ALTER ... CLEAR COLUMN IN PARTITION` query for `Buffer` tables.
+* Fixed the invalid default value for `Enum`s (0 instead of the minimum) when using the `JSONEachRow` and `TSKV` formats.
+* Resolved the appearance of zombie processes when using a dictionary with an `executable` source.
+* Fixed segfault for the HEAD query.
+
+## Improvements to development workflow and ClickHouse build:
+* You can use `pbuilder` to build ClickHouse.
+* You can use `libc++` instead of `libstdc++` for builds on Linux.
+* Added instructions for using static code analysis tools: `Coverity`, `clang-tidy`, and `cppcheck`.
+
+## Please note when upgrading:
+* There is now a higher default value for the MergeTree setting `max_bytes_to_merge_at_max_space_in_pool` (the maximum total size of data parts to merge, in bytes): it has increased from 100 GiB to 150 GiB. This might result in large merges running after the server upgrade, which could cause an increased load on the disk subsystem. If the free space available on the server is less than twice the total amount of the merges that are running, this will cause all other merges to stop running, including merges of small data parts. As a result, INSERT requests will fail with the message "Merges are processing significantly slower than inserts." Use the `SELECT * FROM system.merges` request to monitor the situation. You can also check the `DiskSpaceReservedForMerge` metric in the `system.metrics` table, or in Graphite. You don't need to do anything to fix this, since the issue will resolve itself once the large merges finish. If you find this unacceptable, you can restore the previous value for the `max_bytes_to_merge_at_max_space_in_pool` setting (to do this, go to the `<merge_tree>` section in config.xml, set `<max_bytes_to_merge_at_max_space_in_pool>107374182400</max_bytes_to_merge_at_max_space_in_pool>` and restart the server).
+
 # ClickHouse release 1.1.54284
 
 * This is bugfix release for previous 1.1.54282 release. It fixes ZooKeeper nodes leak in `parts/` directory.

CHANGELOG_RU.md

@@ -1,3 +1,41 @@
+# Релиз ClickHouse 1.1.54289
+
+## Новые возможности:
+* Запросы `SYSTEM` для административных действий с сервером: `SYSTEM RELOAD DICTIONARY`, `SYSTEM RELOAD DICTIONARIES`, `SYSTEM DROP DNS CACHE`, `SYSTEM SHUTDOWN`, `SYSTEM KILL`.
+* Добавлены функции для работы с массивами: `concat`, `arraySlice`, `arrayPushBack`, `arrayPushFront`, `arrayPopBack`, `arrayPopFront`.
+* Добавлены параметры `root` и `identity` для конфигурации ZooKeeper. Это позволяет изолировать разных пользователей одного ZooKeeper кластера.
+* Добавлены агрегатные функции `groupBitAnd`, `groupBitOr`, `groupBitXor` (для совместимости доступны также под именами `BIT_AND`, `BIT_OR`, `BIT_XOR`).
+* Возможность загрузки внешних словарей из MySQL с указанием сокета на файловой системе.
+* Возможность загрузки внешних словарей из MySQL через SSL соединение (параметры `ssl_cert`, `ssl_key`, `ssl_ca`).
+* Добавлена настройка `max_network_bandwidth_for_user` для ограничения общего потребления сети для всех запросов одного пользователя.
+* Поддержка `DROP TABLE` для временных таблиц.
+* Поддержка чтения значений типа `DateTime` в формате unix timestamp из форматов `CSV` и `JSONEachRow`.
+* Включено по-умолчанию отключение отстающих реплик при распределённых запросах (по-умолчанию порог равен 5 минутам).
+* Используются FIFO блокировки при ALTER: выполнение ALTER не будет неограниченно блокироваться при непрерывно выполняющихся запросах.
+* Возможность задать `umask` в конфигурационном файле.
+* Увеличена производительность запросов с `DISTINCT`.
+
+## Исправления ошибок:
+* Более оптимальная процедура удаления старых нод в ZooKeeper. Ранее в случае очень частых вставок, старые ноды могли не успевать удаляться, что приводило, в том числе, к очень долгому завершению сервера.
+* Исправлена рандомизация при выборе хостов для соединения с ZooKeeper.
+* Исправлено отключение отстающей реплики при распределённых запросах, если реплика является localhost.
+* Исправлена ошибка, в связи с которой кусок данных таблицы типа `ReplicatedMergeTree` мог становиться битым после выполнения `ALTER MODIFY` элемента `Nested` структуры.
+* Исправлена ошибка приводящая к возможному зависанию SELECT запросов.
+* Доработки распределённых DDL запросов.
+* Исправлен запрос `CREATE TABLE ... AS <materialized view>`.
+* Исправлен дедлок при запросе `ALTER ... CLEAR COLUMN IN PARTITION` для `Buffer` таблиц.
+* Исправлено использование неправильного значения по-умолчанию для `Enum`-ов (0 вместо минимального) при использовании форматов `JSONEachRow` и `TSKV`.
+* Исправлено появление zombie процессов при работе со словарём с источником `executable`.
+* Исправлен segfault при запросе HEAD.
+
+## Улучшения процесса разработки и сборки ClickHouse:
+* Возможность сборки с помощью `pbuilder`.
+* Возможность сборки с использованием `libc++` вместо `libstdc++` под Linux.
+* Добавлены инструкции для использования статических анализаторов кода `Coverity`, `clang-tidy`, `cppcheck`.
+
+## На что обратить внимание при обновлении:
+* Увеличено значение по-умолчанию для настройки MergeTree `max_bytes_to_merge_at_max_space_in_pool` (максимальный суммарный размер кусков в байтах для мержа) со 100 GiB до 150 GiB. Это может привести к запуску больших мержей после обновления сервера, что может вызвать повышенную нагрузку на дисковую подсистему. Если же на серверах, где это происходит, количество свободного места менее чем в два раза больше суммарного объёма выполняющихся мержей, то в связи с этим перестанут выполняться какие-либо другие мержи, включая мержи мелких кусков. Это приведёт к тому, что INSERT-ы будут отклоняться с сообщением "Merges are processing significantly slower than inserts". Для наблюдения, используйте запрос `SELECT * FROM system.merges`. Вы также можете смотреть на метрику `DiskSpaceReservedForMerge` в таблице `system.metrics` или в Graphite. Для исправления этой ситуации можно ничего не делать, так как она нормализуется сама после завершения больших мержей. Если же вас это не устраивает, вы можете вернуть настройку `max_bytes_to_merge_at_max_space_in_pool` в старое значение, прописав в config.xml в секции `<merge_tree>` `<max_bytes_to_merge_at_max_space_in_pool>107374182400</max_bytes_to_merge_at_max_space_in_pool>` и перезапустить сервер.
+
 # Релиз ClickHouse 1.1.54284
 
 * Релиз содержит изменения к предыдущему релизу 1.1.54282, которые исправляют утечку записей о кусках в ZooKeeper

CMakeLists.txt

@@ -71,11 +71,16 @@ if (USE_STATIC_LIBRARIES)
     list(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
 endif ()
 
-option (GLIBC_COMPATIBILITY "Set to TRUE to enable compatibility with older glibc libraries. Note that it is not compatible with ASan." OFF)
+if (CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
+    option (USE_INTERNAL_MEMCPY "Use internal implementation of 'memcpy' function instead of provided by libc. Only for x86_64." ON)
+
+    if (CMAKE_SYSTEM MATCHES "Linux")
+        option (GLIBC_COMPATIBILITY "Set to TRUE to enable compatibility with older glibc libraries. Only for x86_64, Linux. Implies USE_INTERNAL_MEMCPY." ON)
+    endif()
+endif ()
 
 if (GLIBC_COMPATIBILITY)
-    set (GLIBC_COMPATIBILITY_COMPILE_FLAGS   "-include ${ClickHouse_SOURCE_DIR}/libs/libcommon/include/common/glibc_compatibility.h")
+    set (USE_INTERNAL_MEMCPY ON)
-    set (GLIBC_COMPATIBILITY_LINK_FLAGS      "-Wl,--wrap=memcpy")
 endif ()
 
 if (CXX11_ABI STREQUAL ENABLE)
@@ -107,6 +112,11 @@ if (USE_LIBCXX)
     set (CMAKE_CXX_FLAGS_DEBUG           "${CMAKE_CXX_FLAGS_DEBUG} -D_LIBCPP_DEBUG=1") # More checks in debug build.
 endif ()
 
+# Special options for better optimized code with clang
+#if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+#    set (CMAKE_CXX_FLAGS_RELWITHDEBINFO  "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -Wno-unused-command-line-argument -mllvm -inline-threshold=10000")
+#endif ()
+
 set (CMAKE_BUILD_COLOR_MAKEFILE          ON)
 set (CMAKE_CXX_FLAGS                     "${CMAKE_CXX_FLAGS} ${COMPILER_FLAGS} -std=gnu++1z ${PLATFORM_EXTRA_CXX_FLAG} -fno-omit-frame-pointer ${COMMON_WARNING_FLAGS} ${CXX_WARNING_FLAGS} ${GLIBC_COMPATIBILITY_COMPILE_FLAGS}")
 #set (CMAKE_CXX_FLAGS_RELEASE             "${CMAKE_CXX_FLAGS_RELEASE}")

contrib/libboost/boost_1_65_0/libs/filesystem/src/operations.cpp

@@ -2394,7 +2394,12 @@ namespace detail
         && (filename.size()== 1
           || (filename[1] == dot
             && filename.size()== 2)))
-        {  it.increment(*ec); }
+        {
+            if (ec)
+                it.increment(*ec);
+            else
+                it.increment();
+        }
     }
   }
 

contrib/libzlib-ng/CMakeLists.txt

@@ -489,39 +489,15 @@ if(MINGW OR MSYS)
     set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
 endif(MINGW OR MSYS)
 
-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_GZFILE_SRCS} ${ZLIB_ARCH_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
 add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_GZFILE_SRCS} ${ZLIB_ARCH_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
 
-set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
-set_target_properties(zlib PROPERTIES SOVERSION 1)
-
-if(NOT CYGWIN)
-    # This property causes shared libraries on Linux to have the full version
-    # encoded into their final filename.  We disable this on Cygwin because
-    # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
-    # seems to be the default.
-    #
-    # This has no effect with MSVC, on that platform the version info for
-    # the DLL comes from the resource file win32/zlib1.rc
-    set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
-endif()
-
 if(UNIX)
     # On unix-like platforms the library is almost always called libz
-   set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
+   set_target_properties(zlibstatic PROPERTIES OUTPUT_NAME z)
-   if(NOT APPLE)
-     set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
-   endif()
-elseif(MSYS)
-   # Suppress version number from shared library name
-   set(CMAKE_SHARED_LIBRARY_NAME_WITH_VERSION 0)
-elseif(BUILD_SHARED_LIBS AND WIN32)
-    # Creates zlib1.dll when building shared library version
-    set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
 endif()
 
 if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
-    install(TARGETS zlib zlibstatic
+    install(TARGETS zlibstatic
         RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
         ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
         LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
@@ -529,35 +505,6 @@ endif()
 if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
     install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}")
 endif()
-if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
-    install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3")
-endif()
 if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
     install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")
 endif()
-
-#============================================================================
-# Example binaries
-#============================================================================
-
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-	set (CMAKE_EXE_LINKER_FLAGS "")
-endif ()
-
-add_executable(example test/example.c)
-target_link_libraries(example zlib)
-add_test(example example)
-
-add_executable(minigzip test/minigzip.c)
-target_link_libraries(minigzip zlib)
-
-if(HAVE_OFF64_T)
-    add_executable(example64 test/example.c)
-    target_link_libraries(example64 zlib)
-    set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-    add_test(example64 example64)
-
-    add_executable(minigzip64 test/minigzip.c)
-    target_link_libraries(minigzip64 zlib)
-    set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-endif()

copy_headers.sh

@@ -16,7 +16,8 @@
 # sudo ./copy_headers.sh . /usr/share/clickhouse/headers/
 
 SOURCE_PATH=${1:-.}
-DST=${2:-$SOURCE_PATH/../headers};
+DST=${2:-$SOURCE_PATH/../headers}
+BUILD_PATH=${3:-$SOURCE_PATH/build}
 
 PATH="/usr/local/bin:/usr/local/sbin:/usr/bin:$PATH"
 
@@ -24,14 +25,19 @@ if [[ -z $CLANG ]]; then
     CLANG="clang"
 fi
 
+START_HEADERS=$(echo \
+    $BUILD_PATH/dbms/src/Common/config_version.h \
+    $SOURCE_PATH/dbms/src/Interpreters/SpecializedAggregator.h \
+    $SOURCE_PATH/dbms/src/AggregateFunctions/AggregateFunction*.h)
+
 # Опция -mcx16 для того, чтобы выбиралось больше заголовочных файлов (с запасом).
 
-for src_file in $($CLANG -M -xc++ -std=gnu++1z -Wall -Werror -msse4 -mcx16 -mpopcnt -O3 -g -fPIC \
+for src_file in $(echo | $CLANG -M -xc++ -std=gnu++1z -Wall -Werror -msse4 -mcx16 -mpopcnt -O3 -g -fPIC \
-    $(cat "$SOURCE_PATH/build/include_directories.txt") \
+    $(cat "$BUILD_PATH/include_directories.txt") \
-    "$SOURCE_PATH/build/dbms/src/Common/config_version.h" \
+    $(echo $START_HEADERS | sed -r -e 's/[^ ]+/-include \0/g') \
-    "$SOURCE_PATH/dbms/src/Interpreters/SpecializedAggregator.h" |
+    - |
     tr -d '\\' |
-    sed -r -e 's/^\w+\.o://');
+    sed -r -e 's/^-\.o://');
 do
     dst_file=$src_file;
     dst_file=$(echo $dst_file | sed -r -e 's/build\///')    # for simplicity reasons, will put generated headers near the rest.

dbms/src/AggregateFunctions/AggregateFunctionArgMinMax.h

@@ -69,6 +69,8 @@ public:
     {
         this->data(place).result.insertResultInto(to);
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 }

dbms/src/AggregateFunctions/AggregateFunctionArray.h

@@ -132,6 +132,8 @@ public:
     }
 
     IAggregateFunction::AddFunc getAddressOfAddFunction() const override final { return &addFree; }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 }

dbms/src/AggregateFunctions/AggregateFunctionAvg.h

@@ -70,6 +70,8 @@ public:
         static_cast<ColumnFloat64 &>(to).getData().push_back(
             static_cast<Float64>(this->data(place).sum) / this->data(place).count);
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 

dbms/src/AggregateFunctions/AggregateFunctionBitwise.h

@@ -81,6 +81,8 @@ public:
     {
         static_cast<ColumnVector<T> &>(to).getData().push_back(this->data(place).value);
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 

dbms/src/AggregateFunctions/AggregateFunctionCount.h

@@ -70,6 +70,8 @@ public:
     {
         data(place).count += x;
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 
@@ -114,6 +116,8 @@ public:
     {
         static_cast<ColumnUInt64 &>(to).getData().push_back(data(place).count);
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 
@@ -183,6 +187,8 @@ public:
         static_cast<ColumnUInt64 &>(to).getData().push_back(data(place).count);
     }
 
+    const char * getHeaderFilePath() const override { return __FILE__; }
+
 private:
     enum { MAX_ARGS = 8 };
     size_t number_of_arguments = 0;

dbms/src/AggregateFunctions/AggregateFunctionDebug.cpp

@@ -1,92 +0,0 @@
-#include <AggregateFunctions/INullaryAggregateFunction.h>
-#include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <Columns/ColumnsNumber.h>
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-
-
-namespace DB
-{
-
-
-/** State management of aggregate functions is done in a non-trivial way:
-  * - the memory for them needs to be allocated in the pool,
-  *   pointers to these states can be passed between different data structures,
-  *   herewith, you can not make RAII wrappers for each individual state.
-  * For more information, see Aggregator.h.
-  *
-  * In this regard, there are difficult-debugging bugs.
-  * To simplify the playback of bugs, an aggregate `debug` function was written,
-  *  and its source code is decided not to delete after debugging.
-  *
-  * This aggregate function takes zero arguments and does nothing.
-  * But it has a state that is non-trivially created and destroyed.
-  */
-
-
-struct AggregateFunctionDebugData
-{
-    std::unique_ptr<size_t> ptr { new size_t(0xABCDEF01DEADBEEF) };
-    AggregateFunctionDebugData() {}
-    ~AggregateFunctionDebugData()
-    {
-        if (*ptr != 0xABCDEF01DEADBEEF)
-        {
-            std::cerr << "Bug!";
-            abort();
-        }
-
-        ptr.reset();
-    }
-};
-
-
-class AggregateFunctionDebug final : public INullaryAggregateFunction<AggregateFunctionDebugData, AggregateFunctionDebug>
-{
-public:
-    String getName() const override { return "debug"; }
-
-    DataTypePtr getReturnType() const override
-    {
-        return std::make_shared<DataTypeUInt8>();
-    }
-
-    void addImpl(AggregateDataPtr place) const
-    {
-    }
-
-    void merge(AggregateDataPtr place, ConstAggregateDataPtr rhs, Arena * arena) const override
-    {
-    }
-
-    void serialize(ConstAggregateDataPtr place, WriteBuffer & buf) const override
-    {
-        writeBinary(UInt8(0), buf);
-    }
-
-    void deserialize(AggregateDataPtr place, ReadBuffer & buf, Arena *) const override
-    {
-        UInt8 tmp;
-        readBinary(tmp, buf);
-    }
-
-    void insertResultInto(ConstAggregateDataPtr place, IColumn & to) const override
-    {
-        static_cast<ColumnUInt8 &>(to).getData().push_back(0);
-    }
-};
-
-
-AggregateFunctionPtr createAggregateFunctionDebug(const std::string & name, const DataTypes & argument_types, const Array & parameters)
-{
-    return std::make_shared<AggregateFunctionDebug>();
-}
-
-
-void registerAggregateFunctionDebug(AggregateFunctionFactory & factory)
-{
-    factory.registerFunction("debug", createAggregateFunctionDebug);
-}
-
-}

dbms/src/AggregateFunctions/AggregateFunctionForEach.h

@@ -245,6 +245,8 @@ public:
     }
 
     IAggregateFunction::AddFunc getAddressOfAddFunction() const override final { return &addFree; }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 

dbms/src/AggregateFunctions/AggregateFunctionGroupArray.cpp

@@ -8,7 +8,7 @@ namespace DB
 namespace
 {
 
-template <template <typename, typename> class AggregateFunctionTemplate, class Data, typename ... TArgs>
+template <template <typename, typename> class AggregateFunctionTemplate, typename Data, typename ... TArgs>
 static IAggregateFunction * createWithNumericOrTimeType(const IDataType & argument_type, TArgs && ... args)
 {
          if (typeid_cast<const DataTypeDate     *>(&argument_type)) return new AggregateFunctionTemplate<UInt16, Data>(std::forward<TArgs>(args)...);

dbms/src/AggregateFunctions/AggregateFunctionGroupArray.h

@@ -137,6 +137,8 @@ public:
     {
         return true;
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 
@@ -408,6 +410,8 @@ public:
     {
         return true;
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 #undef AGGREGATE_FUNCTION_GROUP_ARRAY_MAX_ARRAY_SIZE

dbms/src/AggregateFunctions/AggregateFunctionGroupArrayInsertAt.h

@@ -202,6 +202,8 @@ public:
 
         to_offsets.push_back((to_offsets.empty() ? 0 : to_offsets.back()) + result_array_size);
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 

dbms/src/AggregateFunctions/AggregateFunctionGroupUniqArray.h

@@ -98,6 +98,8 @@ public:
         for (auto it = set.begin(); it != set.end(); ++it, ++i)
             data_to[old_size + i] = *it;
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 
@@ -219,6 +221,8 @@ public:
             deserializeAndInsert(elem, data_to);
         }
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 

dbms/src/AggregateFunctions/AggregateFunctionIf.h

@@ -121,6 +121,8 @@ public:
     }
 
     IAggregateFunction::AddFunc getAddressOfAddFunction() const override final { return &addFree; }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 }

dbms/src/AggregateFunctions/AggregateFunctionMerge.h

@@ -121,6 +121,8 @@ public:
     }
 
     IAggregateFunction::AddFunc getAddressOfAddFunction() const override final { return &addFree; }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 }

dbms/src/AggregateFunctions/AggregateFunctionMinMaxAny.h

@@ -726,6 +726,8 @@ public:
     {
         this->data(place).insertResultInto(to);
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 }

dbms/src/AggregateFunctions/AggregateFunctionNull.h

@@ -157,6 +157,8 @@ public:
     {
         return nested_function->isState();
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 

dbms/src/AggregateFunctions/AggregateFunctionQuantile.h

@@ -99,6 +99,8 @@ public:
         else
             static_cast<ColumnVector<ArgumentFieldType> &>(to).getData().push_back(sample.quantileInterpolated(level));
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 
@@ -192,6 +194,8 @@ public:
                 data_to.push_back(sample.quantileInterpolated(levels[i]));
         }
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 }

dbms/src/AggregateFunctions/AggregateFunctionQuantileDeterministic.h

@@ -105,6 +105,8 @@ public:
         else
             static_cast<ColumnVector<ArgumentFieldType> &>(to).getData().push_back(sample.quantileInterpolated(level));
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 
@@ -204,6 +206,8 @@ public:
                 data_to.push_back(sample.quantileInterpolated(levels[i]));
         }
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 }

dbms/src/AggregateFunctions/AggregateFunctionQuantileExact.h

@@ -117,6 +117,8 @@ public:
 
         static_cast<ColumnVector<T> &>(to).getData().push_back(quantile);
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 
@@ -217,6 +219,8 @@ public:
                 data_to[old_size + i] = T();
         }
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 }

dbms/src/AggregateFunctions/AggregateFunctionQuantileExactWeighted.h

@@ -154,6 +154,8 @@ public:
 
         static_cast<ColumnVector<ValueType> &>(to).getData().push_back(it->first);
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 
@@ -296,6 +298,8 @@ public:
             ++level_index;
         }
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 }

dbms/src/AggregateFunctions/AggregateFunctionQuantileTDigest.h

@@ -411,6 +411,8 @@ public:
         else
             static_cast<ColumnVector<T> &>(to).getData().push_back(quantile);
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 
@@ -480,6 +482,8 @@ public:
         else
             static_cast<ColumnVector<T> &>(to).getData().push_back(quantile);
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 
@@ -563,6 +567,8 @@ public:
                 params, &levels.levels[0], &levels.permutation[0], size, &data_to[old_size]);
         }
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 
@@ -648,6 +654,8 @@ public:
                 params, &levels.levels[0], &levels.permutation[0], size, &data_to[old_size]);
         }
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 }

dbms/src/AggregateFunctions/AggregateFunctionQuantileTiming.h

@@ -843,6 +843,8 @@ public:
     {
         static_cast<ColumnFloat32 &>(to).getData().push_back(this->data(place).getFloat(level));
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 
@@ -903,6 +905,8 @@ public:
     {
         static_cast<ColumnFloat32 &>(to).getData().push_back(this->data(place).getFloat(level));
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 
@@ -971,6 +975,8 @@ public:
 
         this->data(place).getManyFloat(&levels.levels[0], &levels.permutation[0], size, &data_to[old_size]);
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 
@@ -1037,6 +1043,8 @@ public:
 
         this->data(place).getManyFloat(&levels.levels[0], &levels.permutation[0], size, &data_to[old_size]);
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 

dbms/src/AggregateFunctions/AggregateFunctionSequenceMatch.h

@@ -238,6 +238,8 @@ public:
 
     IAggregateFunction::AddFunc getAddressOfAddFunction() const override final { return &addFree; }
 
+    const char * getHeaderFilePath() const override { return __FILE__; }
+
 private:
     enum class PatternActionType
     {

dbms/src/AggregateFunctions/AggregateFunctionState.h

@@ -111,6 +111,8 @@ public:
     }
 
     IAggregateFunction::AddFunc getAddressOfAddFunction() const override final { return &addFree; }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 }

dbms/src/AggregateFunctions/AggregateFunctionStatistics.h

@@ -47,7 +47,7 @@ bool areComparable(UInt64 a, UInt64 b)
   * Source: "Updating formulae and a pairwise algorithm for computing sample variances"
   * (Chan et al., Stanford University, 12.1979)
   */
-template<typename T, typename Op>
+template <typename T, typename Op>
 class AggregateFunctionVarianceData
 {
 public:
@@ -109,7 +109,7 @@ private:
 
 /** The main code for the implementation of varSamp, stddevSamp, varPop, stddevPop.
   */
-template<typename T, typename Op>
+template <typename T, typename Op>
 class AggregateFunctionVariance final
     : public IUnaryAggregateFunction<AggregateFunctionVarianceData<T, Op>,
         AggregateFunctionVariance<T, Op>>
@@ -153,6 +153,8 @@ public:
     {
         this->data(place).publish(to);
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 /** Implementing the varSamp function.
@@ -214,7 +216,7 @@ struct AggregateFunctionStdDevPopImpl
 /** If `compute_marginal_moments` flag is set this class provides the successor
   * CovarianceData support of marginal moments for calculating the correlation.
   */
-template<bool compute_marginal_moments>
+template <bool compute_marginal_moments>
 class BaseCovarianceData
 {
 protected:
@@ -224,7 +226,7 @@ protected:
     void deserialize(const ReadBuffer & buf) {}
 };
 
-template<>
+template <>
 class BaseCovarianceData<true>
 {
 protected:
@@ -262,7 +264,7 @@ protected:
   * (J. Bennett et al., Sandia National Laboratories,
   *  2009 IEEE International Conference on Cluster Computing)
   */
-template<typename T, typename U, typename Op, bool compute_marginal_moments>
+template <typename T, typename U, typename Op, bool compute_marginal_moments>
 class CovarianceData : public BaseCovarianceData<compute_marginal_moments>
 {
 private:
@@ -348,13 +350,13 @@ public:
         Base::deserialize(buf);
     }
 
-    template<bool compute = compute_marginal_moments>
+    template <bool compute = compute_marginal_moments>
     void publish(IColumn & to, typename std::enable_if<compute>::type * = nullptr) const
     {
         static_cast<ColumnFloat64 &>(to).getData().push_back(Op::apply(co_moment, Base::left_m2, Base::right_m2, count));
     }
 
-    template<bool compute = compute_marginal_moments>
+    template <bool compute = compute_marginal_moments>
     void publish(IColumn & to, typename std::enable_if<!compute>::type * = nullptr) const
     {
         static_cast<ColumnFloat64 &>(to).getData().push_back(Op::apply(co_moment, count));
@@ -367,7 +369,7 @@ private:
     Float64 co_moment = 0.0;
 };
 
-template<typename T, typename U, typename Op, bool compute_marginal_moments = false>
+template <typename T, typename U, typename Op, bool compute_marginal_moments = false>
 class AggregateFunctionCovariance final
     : public IBinaryAggregateFunction<
         CovarianceData<T, U, Op, compute_marginal_moments>,
@@ -416,6 +418,8 @@ public:
     {
         this->data(place).publish(to);
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 /** Implementing the covarSamp function.
@@ -465,25 +469,25 @@ struct AggregateFunctionCorrImpl
     }
 };
 
-template<typename T>
+template <typename T>
 using AggregateFunctionVarSamp = AggregateFunctionVariance<T, AggregateFunctionVarSampImpl>;
 
-template<typename T>
+template <typename T>
 using AggregateFunctionStdDevSamp = AggregateFunctionVariance<T, AggregateFunctionStdDevSampImpl>;
 
-template<typename T>
+template <typename T>
 using AggregateFunctionVarPop = AggregateFunctionVariance<T, AggregateFunctionVarPopImpl>;
 
-template<typename T>
+template <typename T>
 using AggregateFunctionStdDevPop = AggregateFunctionVariance<T, AggregateFunctionStdDevPopImpl>;
 
-template<typename T, typename U>
+template <typename T, typename U>
 using AggregateFunctionCovarSamp = AggregateFunctionCovariance<T, U, AggregateFunctionCovarSampImpl>;
 
-template<typename T, typename U>
+template <typename T, typename U>
 using AggregateFunctionCovarPop = AggregateFunctionCovariance<T, U, AggregateFunctionCovarPopImpl>;
 
-template<typename T, typename U>
+template <typename T, typename U>
 using AggregateFunctionCorr = AggregateFunctionCovariance<T, U, AggregateFunctionCorrImpl, true>;
 
 }

dbms/src/AggregateFunctions/AggregateFunctionSum.h

@@ -63,6 +63,8 @@ public:
     {
         static_cast<ColumnVector<typename NearestFieldType<T>::Type> &>(to).getData().push_back(this->data(place).sum);
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 

dbms/src/AggregateFunctions/AggregateFunctionTopK.h

@@ -120,6 +120,8 @@ public:
         for (auto it = resultVec.begin(); it != resultVec.end(); ++it, ++i)
             data_to[old_size + i] = it->key;
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 
@@ -236,6 +238,8 @@ public:
             deserializeAndInsert(elem.key, data_to);
         }
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 

dbms/src/AggregateFunctions/AggregateFunctionUniq.h

@@ -255,7 +255,7 @@ struct OneAdder<T, Data, typename std::enable_if<
     std::is_same<Data, AggregateFunctionUniqHLL12Data<T>>::value>::type>
 {
     template <typename T2 = T>
-    static void addImpl(Data & data, const IColumn & column, size_t row_num,
+    static void ALWAYS_INLINE addImpl(Data & data, const IColumn & column, size_t row_num,
         typename std::enable_if<!std::is_same<T2, String>::value>::type * = nullptr)
     {
         const auto & value = static_cast<const ColumnVector<T2> &>(column).getData()[row_num];
@@ -263,7 +263,7 @@ struct OneAdder<T, Data, typename std::enable_if<
     }
 
     template <typename T2 = T>
-    static void addImpl(Data & data, const IColumn & column,    size_t row_num,
+    static void ALWAYS_INLINE addImpl(Data & data, const IColumn & column,    size_t row_num,
         typename std::enable_if<std::is_same<T2, String>::value>::type * = nullptr)
     {
         StringRef value = column.getDataAt(row_num);
@@ -279,7 +279,7 @@ struct OneAdder<T, Data, typename std::enable_if<
     std::is_same<Data, AggregateFunctionUniqCombinedData<T>>::value>::type>
 {
     template <typename T2 = T>
-    static void addImpl(Data & data, const IColumn & column, size_t row_num,
+    static void ALWAYS_INLINE addImpl(Data & data, const IColumn & column, size_t row_num,
         typename std::enable_if<!std::is_same<T2, String>::value>::type * = nullptr)
     {
         const auto & value = static_cast<const ColumnVector<T2> &>(column).getData()[row_num];
@@ -287,7 +287,7 @@ struct OneAdder<T, Data, typename std::enable_if<
     }
 
     template <typename T2 = T>
-    static void addImpl(Data & data, const IColumn & column,    size_t row_num,
+    static void ALWAYS_INLINE addImpl(Data & data, const IColumn & column,    size_t row_num,
         typename std::enable_if<std::is_same<T2, String>::value>::type * = nullptr)
     {
         StringRef value = column.getDataAt(row_num);
@@ -300,14 +300,14 @@ struct OneAdder<T, Data, typename std::enable_if<
     std::is_same<Data, AggregateFunctionUniqExactData<T>>::value>::type>
 {
     template <typename T2 = T>
-    static void addImpl(Data & data, const IColumn & column, size_t row_num,
+    static void ALWAYS_INLINE addImpl(Data & data, const IColumn & column, size_t row_num,
         typename std::enable_if<!std::is_same<T2, String>::value>::type * = nullptr)
     {
         data.set.insert(static_cast<const ColumnVector<T2> &>(column).getData()[row_num]);
     }
 
     template <typename T2 = T>
-    static void addImpl(Data & data, const IColumn & column, size_t row_num,
+    static void ALWAYS_INLINE addImpl(Data & data, const IColumn & column, size_t row_num,
         typename std::enable_if<std::is_same<T2, String>::value>::type * = nullptr)
     {
         StringRef value = column.getDataAt(row_num);
@@ -364,6 +364,8 @@ public:
     {
         static_cast<ColumnUInt64 &>(to).getData().push_back(this->data(place).set.size());
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 
@@ -426,6 +428,8 @@ public:
     }
 
     IAggregateFunction::AddFunc getAddressOfAddFunction() const override final { return &addFree; }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 

dbms/src/AggregateFunctions/AggregateFunctionUniqUpTo.h

@@ -176,6 +176,8 @@ public:
     {
         static_cast<ColumnUInt64 &>(to).getData().push_back(this->data(place).size());
     }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 
@@ -256,6 +258,8 @@ public:
     }
 
     IAggregateFunction::AddFunc getAddressOfAddFunction() const override final { return &addFree; }
+
+    const char * getHeaderFilePath() const override { return __FILE__; }
 };
 
 

dbms/src/AggregateFunctions/Helpers.h

@@ -34,7 +34,7 @@ static IAggregateFunction * createWithNumericType(const IDataType & argument_typ
         return nullptr;
 }
 
-template <template <typename, typename> class AggregateFunctionTemplate, class Data>
+template <template <typename, typename> class AggregateFunctionTemplate, typename Data>
 static IAggregateFunction * createWithNumericType(const IDataType & argument_type)
 {
          if (typeid_cast<const DataTypeUInt8 *>(&argument_type)) return new AggregateFunctionTemplate<UInt8, Data>;
@@ -53,7 +53,7 @@ static IAggregateFunction * createWithNumericType(const IDataType & argument_typ
         return nullptr;
 }
 
-template <template <typename, typename> class AggregateFunctionTemplate, class Data, typename ... TArgs>
+template <template <typename, typename> class AggregateFunctionTemplate, typename Data, typename ... TArgs>
 static IAggregateFunction * createWithNumericType(const IDataType & argument_type, TArgs && ... args)
 {
          if (typeid_cast<const DataTypeUInt8 *>(&argument_type)) return new AggregateFunctionTemplate<UInt8, Data>(std::forward<TArgs>(args)...);

dbms/src/AggregateFunctions/IAggregateFunction.h

@@ -121,7 +121,6 @@ public:
       */
     virtual bool isState() const { return false; }
 
-
     /** The inner loop that uses the function pointer is better than using the virtual function.
       * The reason is that in the case of virtual functions GCC 5.1.2 generates code,
       *  which, at each iteration of the loop, reloads the function address (the offset value in the virtual function table) from memory to the register.
@@ -130,6 +129,12 @@ public:
       */
     using AddFunc = void (*)(const IAggregateFunction *, AggregateDataPtr, const IColumn **, size_t, Arena *);
     virtual AddFunc getAddressOfAddFunction() const = 0;
+
+    /** This is used for runtime code generation to determine, which header files to include in generated source.
+      * Always implement it as
+      * const char * getHeaderFilePath() const override { return __FILE__; }
+      */
+    virtual const char * getHeaderFilePath() const = 0;
 };
 
 

dbms/src/AggregateFunctions/ReservoirSampler.h

@@ -30,7 +30,7 @@ namespace ReservoirSamplerOnEmpty
     };
 }
 
-template<typename ResultType, bool IsFloatingPoint>
+template <typename ResultType, bool IsFloatingPoint>
 struct NanLikeValueConstructor
 {
     static ResultType getValue()
@@ -38,7 +38,7 @@ struct NanLikeValueConstructor
         return std::numeric_limits<ResultType>::quiet_NaN();
     }
 };
-template<typename ResultType>
+template <typename ResultType>
 struct NanLikeValueConstructor<ResultType, false>
 {
     static ResultType getValue()
@@ -47,7 +47,7 @@ struct NanLikeValueConstructor<ResultType, false>
     }
 };
 
-template<typename T, ReservoirSamplerOnEmpty::Enum OnEmpty = ReservoirSamplerOnEmpty::THROW, typename Comparer = std::less<T>>
+template <typename T, ReservoirSamplerOnEmpty::Enum OnEmpty = ReservoirSamplerOnEmpty::THROW, typename Comparer = std::less<T>>
 class ReservoirSampler
 {
 public:

dbms/src/AggregateFunctions/registerAggregateFunctions.cpp

@@ -24,7 +24,6 @@ void registerAggregateFunctionsUniq(AggregateFunctionFactory & factory);
 void registerAggregateFunctionUniqUpTo(AggregateFunctionFactory & factory);
 void registerAggregateFunctionTopK(AggregateFunctionFactory & factory);
 void registerAggregateFunctionsBitwise(AggregateFunctionFactory & factory);
-void registerAggregateFunctionDebug(AggregateFunctionFactory & factory);
 
 
 void registerAggregateFunctions()
@@ -50,7 +49,6 @@ void registerAggregateFunctions()
     registerAggregateFunctionUniqUpTo(factory);
     registerAggregateFunctionTopK(factory);
     registerAggregateFunctionsBitwise(factory);
-    registerAggregateFunctionDebug(factory);
 }
 
 }

dbms/src/Columns/ColumnConst.h

@@ -19,7 +19,7 @@ namespace ErrorCodes
 /** ColumnConst contains another column with single element,
   *  but looks like a column with arbitary amount of same elements.
   */
-class ColumnConst : public IColumn
+class ColumnConst final : public IColumn
 {
 private:
     ColumnPtr data;

dbms/src/Common/CombinedCardinalityEstimator.h

@@ -287,13 +287,13 @@ private:
         }
     }
 
-    template<typename T>
+    template <typename T>
     inline T & getContainer()
     {
         return *reinterpret_cast<T *>(address & mask);
     }
 
-    template<typename T>
+    template <typename T>
     inline const T & getContainer() const
     {
         return *reinterpret_cast<T *>(address & mask);

dbms/src/Common/ConcurrentBoundedQueue.h

@@ -11,10 +11,10 @@
 
 namespace detail
 {
-    template <class T, bool is_nothrow_move_assignable = std::is_nothrow_move_assignable<T>::value>
+    template <typename T, bool is_nothrow_move_assignable = std::is_nothrow_move_assignable<T>::value>
     struct MoveOrCopyIfThrow;
 
-    template <class T>
+    template <typename T>
     struct MoveOrCopyIfThrow<T, true>
     {
         void operator()(T && src, T & dst) const
@@ -23,7 +23,7 @@ namespace detail
         }
     };
 
-    template <class T>
+    template <typename T>
     struct MoveOrCopyIfThrow<T, false>
     {
         void operator()(T && src, T & dst) const
@@ -32,14 +32,14 @@ namespace detail
         }
     };
 
-    template <class T>
+    template <typename T>
     void moveOrCopyIfThrow(T && src, T & dst)
     {
         MoveOrCopyIfThrow<T>()(std::forward<T>(src), dst);
     }
 };
 
-/** A very simple thread-safe queue of limited length.
+/** A very simple thread-safe queue of limited size.
   * If you try to pop an item from an empty queue, the thread is blocked until the queue becomes nonempty.
   * If you try to push an element into an overflowed queue, the thread is blocked until space appears in the queue.
   */
@@ -47,7 +47,6 @@ template <typename T>
 class ConcurrentBoundedQueue
 {
 private:
-    size_t max_fill;
     std::queue<T> queue;
     Poco::FastMutex mutex;
     Poco::Semaphore fill_count;

dbms/src/Common/CurrentMetrics.h

@@ -36,13 +36,13 @@ namespace CurrentMetrics
     /// Set value of specified metric.
     inline void set(Metric metric, Value value)
     {
-        values[metric] = value;
+        values[metric].store(value, std::memory_order_relaxed);
     }
 
     /// Add value for specified metric. You must subtract value later; or see class Increment below.
     inline void add(Metric metric, Value value = 1)
     {
-        values[metric] += value;
+        values[metric].fetch_add(value, std::memory_order_relaxed);
     }
 
     inline void sub(Metric metric, Value value = 1)
@@ -70,7 +70,7 @@ namespace CurrentMetrics
         ~Increment()
         {
             if (what)
-                *what -= amount;
+                what->fetch_sub(amount, std::memory_order_relaxed);
         }
 
         Increment(Increment && old)
@@ -88,14 +88,14 @@ namespace CurrentMetrics
 
         void changeTo(Value new_amount)
         {
-            *what += new_amount - amount;
+            what->fetch_add(new_amount - amount, std::memory_order_relaxed);
             amount = new_amount;
         }
 
         /// Subtract value before destructor.
         void destroy()
         {
-            *what -= amount;
+            what->fetch_sub(amount, std::memory_order_relaxed);
             what = nullptr;
         }
     };

dbms/src/Common/HyperLogLogCounter.h

@@ -36,7 +36,7 @@ namespace details
 {
 
 /// Look-up table of logarithms for integer numbers, used in HyperLogLogCounter.
-template<UInt8 K>
+template <UInt8 K>
 struct LogLUT
 {
     LogLUT()
@@ -60,15 +60,15 @@ private:
     double log_table[M + 1];
 };
 
-template<UInt8 K> struct MinCounterTypeHelper;
+template <UInt8 K> struct MinCounterTypeHelper;
-template<> struct MinCounterTypeHelper<0>    { using Type = UInt8; };
+template <> struct MinCounterTypeHelper<0>    { using Type = UInt8; };
-template<> struct MinCounterTypeHelper<1>    { using Type = UInt16; };
+template <> struct MinCounterTypeHelper<1>    { using Type = UInt16; };
-template<> struct MinCounterTypeHelper<2>    { using Type = UInt32; };
+template <> struct MinCounterTypeHelper<2>    { using Type = UInt32; };
-template<> struct MinCounterTypeHelper<3>    { using Type = UInt64; };
+template <> struct MinCounterTypeHelper<3>    { using Type = UInt64; };
 
 /// Auxiliary structure for automatic determining minimum size of counter's type depending on its maximum value.
 /// Used in HyperLogLogCounter in order to spend memory efficiently.
-template<UInt64 MaxValue> struct MinCounterType
+template <UInt64 MaxValue> struct MinCounterType
 {
     using Type = typename MinCounterTypeHelper<
         (MaxValue >= 1 << 8) +
@@ -78,7 +78,7 @@ template<UInt64 MaxValue> struct MinCounterType
 };
 
 /// Denominator of expression for HyperLogLog algorithm.
-template<UInt8 precision, int max_rank, typename HashValueType, typename DenominatorType,
+template <UInt8 precision, int max_rank, typename HashValueType, typename DenominatorType,
     DenominatorMode denominator_mode, typename Enable = void>
 class __attribute__ ((packed)) Denominator;
 
@@ -118,7 +118,7 @@ struct IntermediateDenominator<HashValueType, DenominatorType, DenominatorMode::
 /// "Lightweight" implementation of expression's denominator for HyperLogLog algorithm.
 /// Uses minimum amount of memory, but estimates may be unstable.
 /// Satisfiable when rank storage is small enough.
-template<UInt8 precision, int max_rank, typename HashValueType, typename DenominatorType,
+template <UInt8 precision, int max_rank, typename HashValueType, typename DenominatorType,
     DenominatorMode denominator_mode>
 class __attribute__ ((packed)) Denominator<precision, max_rank, HashValueType, DenominatorType,
     denominator_mode,
@@ -162,7 +162,7 @@ private:
 /// Fully-functional version of expression's denominator for HyperLogLog algorithm.
 /// Spends more space that lightweight version. Estimates will always be stable.
 /// Used when rank storage is big.
-template<UInt8 precision, int max_rank, typename HashValueType, typename DenominatorType,
+template <UInt8 precision, int max_rank, typename HashValueType, typename DenominatorType,
     DenominatorMode denominator_mode>
 class __attribute__ ((packed)) Denominator<precision, max_rank, HashValueType, DenominatorType,
     denominator_mode,

dbms/src/Common/MemoryTracker.cpp

@@ -32,8 +32,8 @@ MemoryTracker::~MemoryTracker()
       *  then memory usage of 'next' memory trackers will be underestimated,
       *  because amount will be decreased twice (first - here, second - when real 'free' happens).
       */
-    if (amount)
+    if (auto value = amount.load(std::memory_order_relaxed))
-        free(amount);
+        free(value);
 }
 
 
@@ -47,7 +47,11 @@ void MemoryTracker::logPeakMemoryUsage() const
 
 void MemoryTracker::alloc(Int64 size)
 {
-    Int64 will_be = amount += size;
+    /** Using memory_order_relaxed means that if allocations are done simultaneously,
+      *  we allow exception about memory limit exceeded to be thrown only on next allocation.
+      * So, we allow over-allocations.
+      */
+    Int64 will_be = size + amount.fetch_add(size, std::memory_order_relaxed);
 
     if (!next.load(std::memory_order_relaxed))
         CurrentMetrics::add(metric, size);
@@ -96,29 +100,31 @@ void MemoryTracker::alloc(Int64 size)
 
 void MemoryTracker::free(Int64 size)
 {
+    Int64 new_amount = amount.fetch_sub(size, std::memory_order_relaxed) - size;
+
     /** Sometimes, query could free some data, that was allocated outside of query context.
       * Example: cache eviction.
       * To avoid negative memory usage, we "saturate" amount.
       * Memory usage will be calculated with some error.
+      * NOTE The code is not atomic. Not worth to fix.
       */
-    Int64 size_to_subtract = size;
+    if (new_amount < 0)
-    if (size_to_subtract > amount)
+    {
-        size_to_subtract = amount;
+        amount.fetch_sub(new_amount);
-
+        size += new_amount;
-    amount -= size_to_subtract;
+    }
-    /// NOTE above code is not atomic. It's easy to fix.
 
     if (auto loaded_next = next.load(std::memory_order_relaxed))
         loaded_next->free(size);
     else
-        CurrentMetrics::sub(metric, size_to_subtract);
+        CurrentMetrics::sub(metric, size);
 }
 
 
 void MemoryTracker::reset()
 {
     if (!next.load(std::memory_order_relaxed))
-        CurrentMetrics::sub(metric, amount);
+        CurrentMetrics::sub(metric, amount.load(std::memory_order_relaxed));
 
     amount.store(0, std::memory_order_relaxed);
     peak.store(0, std::memory_order_relaxed);

dbms/src/Common/PoolWithFailoverBase.h

@@ -137,7 +137,7 @@ protected:
     Logger * log;
 };
 
-template<typename TNestedPool>
+template <typename TNestedPool>
 typename TNestedPool::Entry
 PoolWithFailoverBase<TNestedPool>::get(const TryGetEntryFunc & try_get_entry, const GetPriorityFunc & get_priority)
 {
@@ -149,7 +149,7 @@ PoolWithFailoverBase<TNestedPool>::get(const TryGetEntryFunc & try_get_entry, co
     return results[0].entry;
 }
 
-template<typename TNestedPool>
+template <typename TNestedPool>
 std::vector<typename PoolWithFailoverBase<TNestedPool>::TryResult>
 PoolWithFailoverBase<TNestedPool>::getMany(
         size_t min_entries, size_t max_entries,
@@ -293,7 +293,7 @@ PoolWithFailoverBase<TNestedPool>::getMany(
     return try_results;
 }
 
-template<typename TNestedPool>
+template <typename TNestedPool>
 void PoolWithFailoverBase<TNestedPool>::reportError(const Entry & entry)
 {
     for (size_t i = 0; i < nested_pools.size(); ++i)
@@ -308,7 +308,7 @@ void PoolWithFailoverBase<TNestedPool>::reportError(const Entry & entry)
     throw DB::Exception("Can't find pool to report error.");
 }
 
-template<typename TNestedPool>
+template <typename TNestedPool>
 struct PoolWithFailoverBase<TNestedPool>::PoolState
 {
     UInt64 error_count = 0;
@@ -330,7 +330,7 @@ private:
     std::minstd_rand rng = std::minstd_rand(randomSeed());
 };
 
-template<typename TNestedPool>
+template <typename TNestedPool>
 typename PoolWithFailoverBase<TNestedPool>::PoolStates
 PoolWithFailoverBase<TNestedPool>::updatePoolStates()
 {

dbms/src/Common/ProfileEvents.h

@@ -24,7 +24,7 @@ namespace ProfileEvents
     /// Increment a counter for event. Thread-safe.
     inline void increment(Event event, Count amount = 1)
     {
-        counters[event] += amount;
+        counters[event].fetch_add(amount, std::memory_order_relaxed);
     }
 
     /// Get index just after last event identifier.

dbms/src/Common/RadixSort.h

@@ -185,6 +185,7 @@ public:
         Element * swap_buffer = reinterpret_cast<Element *>(allocator.allocate(size * sizeof(Element)));
 
         /// Transform the array and calculate the histogram.
+        /// NOTE This is slightly suboptimal. Look at https://github.com/powturbo/TurboHist
         for (size_t i = 0; i < size; ++i)
         {
             if (!Traits::Transform::transform_is_simple)

dbms/src/Common/UInt128.h

@@ -50,7 +50,7 @@ struct UInt128
     template <typename T> bool inline operator<= (const T rhs) const { return *this <= UInt128(rhs); }
     template <typename T> bool inline operator<  (const T rhs) const { return *this <  UInt128(rhs); }
 
-    template<typename T> explicit operator T() const { return static_cast<T>(low); }
+    template <typename T> explicit operator T() const { return static_cast<T>(low); }
 
 #if !__clang__
 #pragma GCC diagnostic pop

dbms/src/Common/ZooKeeper/ZooKeeperHolder.h

@@ -19,7 +19,7 @@ public:
     ZooKeeperHolder() = default;
 
     /// вызывать из одного потока - не thread safe
-    template <class... Args>
+    template <typename... Args>
     void init(Args&&... args);
     /// был ли класс инициализирован
     bool isInitialized() const { return ptr != nullptr; }
@@ -75,7 +75,7 @@ private:
     static std::string nullptr_exception_message;
 };
 
-template <class... Args>
+template <typename... Args>
 void ZooKeeperHolder::init(Args&&... args)
 {
     ptr = std::make_shared<ZooKeeper>(std::forward<Args>(args)...);

dbms/src/Common/tests/AvalancheTest.h

@@ -38,7 +38,7 @@ inline uint32_t getbit ( const void * block, int len, uint32_t bit )
   return 0;
 }
 
-template< typename T >
+template < typename T >
 inline uint32_t getbit ( T & blob, uint32_t bit )
 {
   return getbit(&blob,sizeof(blob),bit);
@@ -54,7 +54,7 @@ inline void flipbit ( void * block, int len, uint32_t bit )
   if(byte < len) b[byte] ^= (1 << bit);
 }
 
-template< typename T >
+template < typename T >
 inline void flipbit ( T & blob, uint32_t bit )
 {
   flipbit(&blob,sizeof(blob),bit);
@@ -146,7 +146,7 @@ bool AvalancheTest ( pfHash hash, const int reps )
 // BIC test variant - store all intermediate data in a table, draw diagram
 // afterwards (much faster)
 
-template< typename keytype, typename hashtype >
+template < typename keytype, typename hashtype >
 void BicTest3 ( pfHash hash, const int reps, bool verbose = true )
 {
   const int keybytes = sizeof(keytype);

dbms/src/Common/tests/hopscotch-map/src/hopscotch_hash.h

@@ -146,7 +146,7 @@ private:
  * Grow the map by GrowthFactor::num/GrowthFactor::den and use a modulo to map a hash
  * to a bucket. Slower but it can be usefull if you want a slower growth.
  */
-template<class GrowthFactor = std::ratio<3, 2>>
+template <typename GrowthFactor = std::ratio<3, 2>>
 class mod_growth_policy {
 public:
     mod_growth_policy(std::size_t& min_bucket_count_in_out) {
@@ -212,7 +212,7 @@ static constexpr const std::array<std::size_t, 39> PRIMES = {{
     1610612741ul, 3221225473ul, 4294967291ul
 }};
 
-template<unsigned int IPrime>
+template <unsigned int IPrime>
 static std::size_t mod(std::size_t hash) { return hash % PRIMES[IPrime]; }
 
 // MOD_PRIME[iprime](hash) returns hash % PRIMES[iprime]. This table allows for faster modulo as the
@@ -274,26 +274,26 @@ namespace detail_hopscotch_hash {
     
     
     
-template<typename T>
+template <typename T>
 struct make_void {
     using type = void;
 };
 
 
-template<typename T, typename = void>
+template <typename T, typename = void>
 struct has_is_transparent : std::false_type {
 };
 
-template<typename T>
+template <typename T>
 struct has_is_transparent<T, typename make_void<typename T::is_transparent>::type> : std::true_type {
 };
 
 
-template<typename T, typename = void>
+template <typename T, typename = void>
 struct has_key_compare : std::false_type {
 };
 
-template<typename T>
+template <typename T>
 struct has_key_compare<T, typename make_void<typename T::key_compare>::type> : std::true_type {
 };
 
@@ -305,29 +305,29 @@ struct has_key_compare<T, typename make_void<typename T::key_compare>::type> : s
  * smallest_type_for_min_bits::type returns the smallest type that can fit MinBits.
  */
 static const size_t SMALLEST_TYPE_MAX_BITS_SUPPORTED = 64;
-template<unsigned int MinBits, typename Enable = void>
+template <unsigned int MinBits, typename Enable = void>
 class smallest_type_for_min_bits {
 };
 
-template<unsigned int MinBits>
+template <unsigned int MinBits>
 class smallest_type_for_min_bits<MinBits, typename std::enable_if<(MinBits > 0) && (MinBits <= 8)>::type> {
 public:
     using type = std::uint_least8_t;
 };
 
-template<unsigned int MinBits>
+template <unsigned int MinBits>
 class smallest_type_for_min_bits<MinBits, typename std::enable_if<(MinBits > 8) && (MinBits <= 16)>::type> {
 public:
     using type = std::uint_least16_t;
 };
 
-template<unsigned int MinBits>
+template <unsigned int MinBits>
 class smallest_type_for_min_bits<MinBits, typename std::enable_if<(MinBits > 16) && (MinBits <= 32)>::type> {
 public:
     using type = std::uint_least32_t;
 };
 
-template<unsigned int MinBits>
+template <unsigned int MinBits>
 class smallest_type_for_min_bits<MinBits, typename std::enable_if<(MinBits > 32) && (MinBits <= 64)>::type> {
 public:
     using type = std::uint_least64_t;
@@ -353,7 +353,7 @@ public:
 static const std::size_t NB_RESERVED_BITS_IN_NEIGHBORHOOD = 2; 
 
 
-template<bool StoreHash>
+template <bool StoreHash>
 class hopscotch_bucket_hash {
 public:    
     using hash_type = std::false_type;
@@ -375,7 +375,7 @@ protected:
     }
 };
 
-template<>
+template <>
 class hopscotch_bucket_hash<true> {
 public:
     using hash_type = std::uint_least32_t;
@@ -402,7 +402,7 @@ private:
     hash_type m_hash;
 };
 
-template<typename ValueType, unsigned int NeighborhoodSize, bool StoreHash>
+template <typename ValueType, unsigned int NeighborhoodSize, bool StoreHash>
 class hopscotch_bucket: public hopscotch_bucket_hash<StoreHash> {
 private:
     static const size_t MIN_NEIGHBORHOOD_SIZE = 4;
@@ -529,7 +529,7 @@ public:
         return *reinterpret_cast<const value_type*>(std::addressof(m_value));
     }
     
-    template<typename... Args>
+    template <typename... Args>
     void set_value_of_empty_bucket(std::size_t hash, Args&&... value_type_args) {
         tsl_assert(empty());
         
@@ -617,7 +617,7 @@ private:
  * OverflowContainer will be used as containers for overflown elements. Usually it should be a list<ValueType>
  * or a set<Key>/map<Key, T>.
  */
-template<class ValueType,
+template <typename ValueType,
          class KeySelect,
          class ValueSelect,
          class Hash,
@@ -629,11 +629,11 @@ template<class ValueType,
          class OverflowContainer>
 class hopscotch_hash: private Hash, private KeyEqual, private GrowthPolicy {
 private:
-    template<typename U>
+    template <typename U>
     using has_mapped_type = typename std::integral_constant<bool, !std::is_same<U, void>::value>;
     
 public:
-    template<bool is_const>
+    template <bool is_const>
     class hopscotch_iterator;
     
     using key_type = typename KeySelect::key_type;
@@ -680,7 +680,7 @@ public:
      * In case of a map, to get a modifiable reference to the value associated to a key (the '.second' in the 
      * stored pair), you have to call 'value()'.
      */
-    template<bool is_const>
+    template <bool is_const>
     class hopscotch_iterator {
         friend class hopscotch_hash;
     private:
@@ -724,7 +724,7 @@ public:
             return KeySelect()(*m_overflow_iterator);
         }
 
-        template<class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
+        template <typename U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
         typename std::conditional<
                         is_const, 
                         const typename U::value_type&, 
@@ -791,7 +791,7 @@ public:
 
     
 public:
-    template<class OC = OverflowContainer, typename std::enable_if<!has_key_compare<OC>::value>::type* = nullptr>
+    template <typename OC = OverflowContainer, typename std::enable_if<!has_key_compare<OC>::value>::type* = nullptr>
     hopscotch_hash(size_type bucket_count, 
                   const Hash& hash,
                   const KeyEqual& equal,
@@ -814,7 +814,7 @@ public:
         this->max_load_factor(max_load_factor);
     }
     
-    template<class OC = OverflowContainer, typename std::enable_if<has_key_compare<OC>::value>::type* = nullptr>
+    template <typename OC = OverflowContainer, typename std::enable_if<has_key_compare<OC>::value>::type* = nullptr>
     hopscotch_hash(size_type bucket_count, 
                   const Hash& hash,
                   const KeyEqual& equal,
@@ -949,7 +949,7 @@ public:
         return insert_impl(value); 
     }
         
-    template<class P, typename std::enable_if<std::is_constructible<value_type, P&&>::value>::type* = nullptr>
+    template <typename P, typename std::enable_if<std::is_constructible<value_type, P&&>::value>::type* = nullptr>
     std::pair<iterator, bool> insert(P&& value) { 
         return emplace(std::forward<P>(value)); 
     }
@@ -967,7 +967,7 @@ public:
         return insert(value).first; 
     }
         
-    template<class P, typename std::enable_if<std::is_constructible<value_type, P&&>::value>::type* = nullptr>
+    template <typename P, typename std::enable_if<std::is_constructible<value_type, P&&>::value>::type* = nullptr>
     iterator insert(const_iterator hint, P&& value) {
         return emplace_hint(hint, std::forward<P>(value)); 
     }
@@ -981,7 +981,7 @@ public:
     }
     
     
-    template<class InputIt>
+    template <typename InputIt>
     void insert(InputIt first, InputIt last) {
         if(std::is_base_of<std::forward_iterator_tag, 
                            typename std::iterator_traits<InputIt>::iterator_category>::value) 
@@ -1003,18 +1003,18 @@ public:
     }
     
     
-    template<class M>
+    template <typename M>
     std::pair<iterator, bool> insert_or_assign(const key_type& k, M&& obj) { 
         return insert_or_assign_impl(k, std::forward<M>(obj)); 
     }
 
-    template<class M>
+    template <typename M>
     std::pair<iterator, bool> insert_or_assign(key_type&& k, M&& obj) { 
         return insert_or_assign_impl(std::move(k), std::forward<M>(obj)); 
     }
     
     
-    template<class M>
+    template <typename M>
     iterator insert_or_assign(const_iterator hint, const key_type& k, M&& obj) {
         if(hint != cend() && compare_keys(KeySelect()(*hint), k)) { 
             auto it = mutable_iterator(hint); 
@@ -1026,7 +1026,7 @@ public:
         return insert_or_assign(k, std::forward<M>(obj)).first;
     }
     
-    template<class M>
+    template <typename M>
     iterator insert_or_assign(const_iterator hint, key_type&& k, M&& obj) {
         if(hint != cend() && compare_keys(KeySelect()(*hint), k)) {
             auto it = mutable_iterator(hint); 
@@ -1039,27 +1039,27 @@ public:
     }
     
     
-    template<class... Args>
+    template <typename... Args>
     std::pair<iterator, bool> emplace(Args&&... args) {
         return insert(value_type(std::forward<Args>(args)...));
     }
     
-    template<class... Args>
+    template <typename... Args>
     iterator emplace_hint(const_iterator hint, Args&&... args) {
         return insert(hint, value_type(std::forward<Args>(args)...));        
     }
     
-    template<class... Args>
+    template <typename... Args>
     std::pair<iterator, bool> try_emplace(const key_type& k, Args&&... args) { 
         return try_emplace_impl(k, std::forward<Args>(args)...);
     }
     
-    template<class... Args>
+    template <typename... Args>
     std::pair<iterator, bool> try_emplace(key_type&& k, Args&&... args) {
         return try_emplace_impl(std::move(k), std::forward<Args>(args)...);
     }
     
-    template<class... Args>
+    template <typename... Args>
     iterator try_emplace(const_iterator hint, const key_type& k, Args&&... args) { 
         if(hint != cend() && compare_keys(KeySelect()(*hint), k)) { 
             return mutable_iterator(hint); 
@@ -1068,7 +1068,7 @@ public:
         return try_emplace(k, std::forward<Args>(args)...).first;
     }
     
-    template<class... Args>
+    template <typename... Args>
     iterator try_emplace(const_iterator hint, key_type&& k, Args&&... args) {
         if(hint != cend() && compare_keys(KeySelect()(*hint), k)) { 
             return mutable_iterator(hint); 
@@ -1111,12 +1111,12 @@ public:
         return to_delete;
     }
     
-    template<class K>
+    template <typename K>
     size_type erase(const K& key) {
         return erase(key, hash_key(key));
     }
     
-    template<class K>
+    template <typename K>
     size_type erase(const K& key, std::size_t hash) {
         const std::size_t ibucket_for_hash = bucket_for_hash(hash);
         
@@ -1157,23 +1157,23 @@ public:
     /*
      * Lookup
      */
-    template<class K, class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
+    template <typename K, typename U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
     typename U::value_type& at(const K& key) {
         return at(key, hash_key(key));
     }
     
-    template<class K, class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
+    template <typename K, typename U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
     typename U::value_type& at(const K& key, std::size_t hash) {
         return const_cast<typename U::value_type&>(static_cast<const hopscotch_hash*>(this)->at(key, hash));
     }
     
     
-    template<class K, class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
+    template <typename K, typename U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
     const typename U::value_type& at(const K& key) const {
         return at(key, hash_key(key));
     }
     
-    template<class K, class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
+    template <typename K, typename U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
     const typename U::value_type& at(const K& key, std::size_t hash) const {
         using T = typename U::value_type;
         
@@ -1187,7 +1187,7 @@ public:
     }
     
     
-    template<class K, class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
+    template <typename K, typename U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
     typename U::value_type& operator[](K&& key) {
         using T = typename U::value_type;
         
@@ -1206,57 +1206,57 @@ public:
     }
     
     
-    template<class K>
+    template <typename K>
     size_type count(const K& key) const {
         return count(key, hash_key(key));
     }
     
-    template<class K>
+    template <typename K>
     size_type count(const K& key, std::size_t hash) const {
         return count_impl(key, hash, m_buckets.cbegin() + bucket_for_hash(hash));
     }
     
     
-    template<class K>
+    template <typename K>
     iterator find(const K& key) {
         return find(key, hash_key(key));
     }
     
-    template<class K>
+    template <typename K>
     iterator find(const K& key, std::size_t hash) {
         return find_impl(key, hash, m_buckets.begin() + bucket_for_hash(hash));
     }
     
     
-    template<class K>
+    template <typename K>
     const_iterator find(const K& key) const {
         return find(key, hash_key(key));
     }
     
-    template<class K>
+    template <typename K>
     const_iterator find(const K& key, std::size_t hash) const {
         return find_impl(key, hash, m_buckets.begin() + bucket_for_hash(hash));
     }
     
     
-    template<class K>
+    template <typename K>
     std::pair<iterator, iterator> equal_range(const K& key) {
         return equal_range(key, hash_key(key));
     }
     
-    template<class K>
+    template <typename K>
     std::pair<iterator, iterator> equal_range(const K& key, std::size_t hash) {
         iterator it = find(key, hash);
         return std::make_pair(it, (it == end())?it:std::next(it));
     }
     
     
-    template<class K>
+    template <typename K>
     std::pair<const_iterator, const_iterator> equal_range(const K& key) const {
         return equal_range(key, hash_key(key));
     }
     
-    template<class K>
+    template <typename K>
     std::pair<const_iterator, const_iterator> equal_range(const K& key, std::size_t hash) const {
         const_iterator it = find(key, hash);
         return std::make_pair(it, (it == cend())?it:std::next(it));
@@ -1339,19 +1339,19 @@ public:
         return m_overflow_elements.size();
     }
     
-    template<class U = OverflowContainer, typename std::enable_if<has_key_compare<U>::value>::type* = nullptr>
+    template <typename U = OverflowContainer, typename std::enable_if<has_key_compare<U>::value>::type* = nullptr>
     typename U::key_compare key_comp() const {
         return m_overflow_elements.key_comp();
     }
     
     
 private:
-    template<class K>
+    template <typename K>
     std::size_t hash_key(const K& key) const {
         return Hash::operator()(key);
     }
     
-    template<class K1, class K2>
+    template <typename K1, typename K2>
     bool compare_keys(const K1& key1, const K2& key2) const {
         return KeyEqual::operator()(key1, key2);
     }
@@ -1365,7 +1365,7 @@ private:
                   std::is_copy_constructible<value_type>::value, 
                   "value_type must be either copy constructible or nothrow move constructible.");
     
-    template<typename U = value_type, 
+    template <typename U = value_type, 
              typename std::enable_if<std::is_nothrow_move_constructible<U>::value>::type* = nullptr>
     void rehash_impl(size_type count) {
         hopscotch_hash new_map = new_hopscotch_hash(count);
@@ -1425,7 +1425,7 @@ private:
         new_map.swap(*this);
     }
     
-    template<typename U = value_type, 
+    template <typename U = value_type, 
              typename std::enable_if<std::is_copy_constructible<U>::value && 
                                      !std::is_nothrow_move_constructible<U>::value>::type* = nullptr>
     void rehash_impl(size_type count) {
@@ -1499,7 +1499,7 @@ private:
     
 
     
-    template<class K, class M>
+    template <typename K, typename M>
     std::pair<iterator, bool> insert_or_assign_impl(K&& key, M&& obj) {
         auto it = try_emplace_impl(std::forward<K>(key), std::forward<M>(obj));
         if(!it.second) {
@@ -1509,7 +1509,7 @@ private:
         return it;
     }
     
-    template<typename P, class... Args>
+    template <typename P, typename... Args>
     std::pair<iterator, bool> try_emplace_impl(P&& key, Args&&... args_value) {
         const std::size_t hash = hash_key(key);
         const std::size_t ibucket_for_hash = bucket_for_hash(hash);
@@ -1525,7 +1525,7 @@ private:
                                                    std::forward_as_tuple(std::forward<Args>(args_value)...));
     }
     
-    template<typename P>
+    template <typename P>
     std::pair<iterator, bool> insert_impl(P&& value) {
         const std::size_t hash = hash_key(KeySelect()(value));
         const std::size_t ibucket_for_hash = bucket_for_hash(hash);
@@ -1540,7 +1540,7 @@ private:
         return insert_impl(ibucket_for_hash, hash, std::forward<P>(value));
     }
     
-    template<typename... Args>
+    template <typename... Args>
     std::pair<iterator, bool> insert_impl(std::size_t ibucket_for_hash, std::size_t hash, Args&&... value_type_args) {
         if((m_nb_elements - m_overflow_elements.size()) >= m_load_threshold) {
             rehash(GrowthPolicy::next_bucket_count());
@@ -1624,7 +1624,7 @@ private:
      * 
      * Return bucket iterator to ibucket_empty
      */
-    template<typename... Args>
+    template <typename... Args>
     iterator_buckets insert_in_bucket(std::size_t ibucket_empty, std::size_t ibucket_for_hash,
                                       std::size_t hash, Args&&... value_type_args) 
     {
@@ -1682,7 +1682,7 @@ private:
     
     
     
-    template<class K, class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
+    template <typename K, typename U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
     typename U::value_type* find_value_impl(const K& key, std::size_t hash, iterator_buckets it_bucket) {
         return const_cast<typename U::value_type*>(
                     static_cast<const hopscotch_hash*>(this)->find_value_impl(key, hash, it_bucket));
@@ -1693,7 +1693,7 @@ private:
      *
      * Return null if no value for key (TODO use std::optional when available).
      */
-    template<class K, class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
+    template <typename K, typename U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
     const typename U::value_type* find_value_impl(const K& key, std::size_t hash, 
                                                   const_iterator_buckets it_bucket) const 
     {
@@ -1712,7 +1712,7 @@ private:
         return nullptr;
     }
     
-    template<class K>
+    template <typename K>
     size_type count_impl(const K& key, std::size_t hash, const_iterator_buckets it_bucket) const {
         if(find_in_buckets(key, hash, it_bucket) != m_buckets.cend()) {
             return 1;
@@ -1725,7 +1725,7 @@ private:
         }
     }
     
-    template<class K>
+    template <typename K>
     iterator find_impl(const K& key, std::size_t hash, iterator_buckets it_bucket) {
         auto it = find_in_buckets(key, hash, it_bucket);
         if(it != m_buckets.end()) {
@@ -1739,7 +1739,7 @@ private:
         return iterator(m_buckets.end(), m_buckets.end(), find_in_overflow(key));
     }
     
-    template<class K>
+    template <typename K>
     const_iterator find_impl(const K& key, std::size_t hash, const_iterator_buckets it_bucket) const {
         auto it = find_in_buckets(key, hash, it_bucket);
         if(it != m_buckets.cend()) {
@@ -1754,14 +1754,14 @@ private:
         return const_iterator(m_buckets.cend(), m_buckets.cend(), find_in_overflow(key));
     }
     
-    template<class K>
+    template <typename K>
     iterator_buckets find_in_buckets(const K& key, std::size_t hash, iterator_buckets it_bucket) {   
         auto it_find = static_cast<const hopscotch_hash*>(this)->find_in_buckets(key, hash, it_bucket); 
         return m_buckets.begin() + std::distance(m_buckets.cbegin(), it_find);
     }
 
     
-    template<class K>
+    template <typename K>
     const_iterator_buckets find_in_buckets(const K& key, std::size_t hash, const_iterator_buckets it_bucket) const {      
         (void) hash; // Avoid warning of unused variable when StoreHash is false;
 
@@ -1791,7 +1791,7 @@ private:
     
 
     
-    template<class K, class U = OverflowContainer, typename std::enable_if<!has_key_compare<U>::value>::type* = nullptr>
+    template <typename K, typename U = OverflowContainer, typename std::enable_if<!has_key_compare<U>::value>::type* = nullptr>
     iterator_overflow find_in_overflow(const K& key) {
         return std::find_if(m_overflow_elements.begin(), m_overflow_elements.end(), 
                             [&](const value_type& value) { 
@@ -1799,7 +1799,7 @@ private:
                             });
     }
     
-    template<class K, class U = OverflowContainer, typename std::enable_if<!has_key_compare<U>::value>::type* = nullptr>
+    template <typename K, typename U = OverflowContainer, typename std::enable_if<!has_key_compare<U>::value>::type* = nullptr>
     const_iterator_overflow find_in_overflow(const K& key) const {
         return std::find_if(m_overflow_elements.cbegin(), m_overflow_elements.cend(), 
                             [&](const value_type& value) { 
@@ -1807,37 +1807,37 @@ private:
                             });
     }
     
-    template<class K, class U = OverflowContainer, typename std::enable_if<has_key_compare<U>::value>::type* = nullptr>
+    template <typename K, typename U = OverflowContainer, typename std::enable_if<has_key_compare<U>::value>::type* = nullptr>
     iterator_overflow find_in_overflow(const K& key) {
         return m_overflow_elements.find(key);
     }
     
-    template<class K, class U = OverflowContainer, typename std::enable_if<has_key_compare<U>::value>::type* = nullptr>
+    template <typename K, typename U = OverflowContainer, typename std::enable_if<has_key_compare<U>::value>::type* = nullptr>
     const_iterator_overflow find_in_overflow(const K& key) const {
         return m_overflow_elements.find(key);
     }
     
     
     
-    template<class... Args, class U = OverflowContainer, typename std::enable_if<!has_key_compare<U>::value>::type* = nullptr>
+    template <typename... Args, typename U = OverflowContainer, typename std::enable_if<!has_key_compare<U>::value>::type* = nullptr>
     iterator_overflow insert_in_overflow(Args&&... value_type_args) {
         return m_overflow_elements.emplace(m_overflow_elements.end(), std::forward<Args>(value_type_args)...);
     }
     
-    template<class... Args, class U = OverflowContainer, typename std::enable_if<has_key_compare<U>::value>::type* = nullptr>
+    template <typename... Args, typename U = OverflowContainer, typename std::enable_if<has_key_compare<U>::value>::type* = nullptr>
     iterator_overflow insert_in_overflow(Args&&... value_type_args) {
         return m_overflow_elements.emplace(std::forward<Args>(value_type_args)...).first;
     }
     
     
     
-    template<class U = OverflowContainer, typename std::enable_if<!has_key_compare<U>::value>::type* = nullptr>
+    template <typename U = OverflowContainer, typename std::enable_if<!has_key_compare<U>::value>::type* = nullptr>
     hopscotch_hash new_hopscotch_hash(size_type bucket_count) {
         return hopscotch_hash(bucket_count, static_cast<Hash&>(*this), static_cast<KeyEqual&>(*this), 
                               get_allocator(), m_max_load_factor);
     }
     
-    template<class U = OverflowContainer, typename std::enable_if<has_key_compare<U>::value>::type* = nullptr>
+    template <typename U = OverflowContainer, typename std::enable_if<has_key_compare<U>::value>::type* = nullptr>
     hopscotch_hash new_hopscotch_hash(size_type bucket_count) {
         return hopscotch_hash(bucket_count, static_cast<Hash&>(*this), static_cast<KeyEqual&>(*this), 
                               get_allocator(), m_max_load_factor, m_overflow_elements.key_comp());

dbms/src/Common/tests/hopscotch-map/src/hopscotch_map.h

@@ -68,7 +68,7 @@ namespace tsl {
  *    insert will invalidate the iterators). Or if there is a rehash.
  *  - erase: iterator on the erased element is the only one which become invalid.
  */
-template<class Key, 
+template <typename Key, 
          class T, 
          class Hash = std::hash<Key>,
          class KeyEqual = std::equal_to<Key>,
@@ -78,7 +78,7 @@ template<class Key,
          class GrowthPolicy = tsl::power_of_two_growth_policy>
 class hopscotch_map {
 private:    
-    template<typename U>
+    template <typename U>
     using has_is_transparent = tsl::detail_hopscotch_hash::has_is_transparent<U>;
     
     class KeySelect {
@@ -161,7 +161,7 @@ public:
     explicit hopscotch_map(const Allocator& alloc) : hopscotch_map(ht::DEFAULT_INIT_BUCKETS_SIZE, alloc) {
     }
     
-    template<class InputIt>
+    template <typename InputIt>
     hopscotch_map(InputIt first, InputIt last,
                 size_type bucket_count = ht::DEFAULT_INIT_BUCKETS_SIZE,
                 const Hash& hash = Hash(),
@@ -171,14 +171,14 @@ public:
         insert(first, last);
     }
     
-    template<class InputIt>
+    template <typename InputIt>
     hopscotch_map(InputIt first, InputIt last,
                 size_type bucket_count,
                 const Allocator& alloc) : hopscotch_map(first, last, bucket_count, Hash(), KeyEqual(), alloc)
     {
     }
     
-    template<class InputIt>
+    template <typename InputIt>
     hopscotch_map(InputIt first, InputIt last,
                 size_type bucket_count,
                 const Hash& hash,
@@ -254,7 +254,7 @@ public:
         return m_ht.insert(value); 
     }
         
-    template<class P, typename std::enable_if<std::is_constructible<value_type, P&&>::value>::type* = nullptr>
+    template <typename P, typename std::enable_if<std::is_constructible<value_type, P&&>::value>::type* = nullptr>
     std::pair<iterator, bool> insert(P&& value) { 
         return m_ht.insert(std::forward<P>(value)); 
     }
@@ -268,7 +268,7 @@ public:
         return m_ht.insert(hint, value); 
     }
         
-    template<class P, typename std::enable_if<std::is_constructible<value_type, P&&>::value>::type* = nullptr>
+    template <typename P, typename std::enable_if<std::is_constructible<value_type, P&&>::value>::type* = nullptr>
     iterator insert(const_iterator hint, P&& value) { 
         return m_ht.insert(hint, std::forward<P>(value));
     }
@@ -278,7 +278,7 @@ public:
     }
     
     
-    template<class InputIt>
+    template <typename InputIt>
     void insert(InputIt first, InputIt last) { 
         m_ht.insert(first, last); 
     }
@@ -290,22 +290,22 @@ public:
     
     
     
-    template<class M>
+    template <typename M>
     std::pair<iterator, bool> insert_or_assign(const key_type& k, M&& obj) { 
         return m_ht.insert_or_assign(k, std::forward<M>(obj)); 
     }
 
-    template<class M>
+    template <typename M>
     std::pair<iterator, bool> insert_or_assign(key_type&& k, M&& obj) { 
         return m_ht.insert_or_assign(std::move(k), std::forward<M>(obj)); 
     }
     
-    template<class M>
+    template <typename M>
     iterator insert_or_assign(const_iterator hint, const key_type& k, M&& obj) {
         return m_ht.insert_or_assign(hint, k, std::forward<M>(obj));
     }
     
-    template<class M>
+    template <typename M>
     iterator insert_or_assign(const_iterator hint, key_type&& k, M&& obj) {
         return m_ht.insert_or_assign(hint, std::move(k), std::forward<M>(obj));
     }
@@ -319,7 +319,7 @@ public:
      * 
      * Mainly here for compatibility with the std::unordered_map interface.
      */
-    template<class... Args>
+    template <typename... Args>
     std::pair<iterator, bool> emplace(Args&&... args) { 
         return m_ht.emplace(std::forward<Args>(args)...); 
     }
@@ -333,7 +333,7 @@ public:
      * 
      * Mainly here for compatibility with the std::unordered_map interface.
      */
-    template<class... Args>
+    template <typename... Args>
     iterator emplace_hint(const_iterator hint, Args&&... args) {
         return m_ht.emplace_hint(hint, std::forward<Args>(args)...);
     }
@@ -341,22 +341,22 @@ public:
     
     
     
-    template<class... Args>
+    template <typename... Args>
     std::pair<iterator, bool> try_emplace(const key_type& k, Args&&... args) { 
         return m_ht.try_emplace(k, std::forward<Args>(args)...);
     }
     
-    template<class... Args>
+    template <typename... Args>
     std::pair<iterator, bool> try_emplace(key_type&& k, Args&&... args) {
         return m_ht.try_emplace(std::move(k), std::forward<Args>(args)...);
     }
     
-    template<class... Args>
+    template <typename... Args>
     iterator try_emplace(const_iterator hint, const key_type& k, Args&&... args) {
         return m_ht.try_emplace(hint, k, std::forward<Args>(args)...);
     }
     
-    template<class... Args>
+    template <typename... Args>
     iterator try_emplace(const_iterator hint, key_type&& k, Args&&... args) {
         return m_ht.try_emplace(hint, std::move(k), std::forward<Args>(args)...);
     }
@@ -381,7 +381,7 @@ public:
      * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     size_type erase(const K& key) { return m_ht.erase(key); }
     
     /**
@@ -390,7 +390,7 @@ public:
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup to the value if you already have the hash.
      */    
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     size_type erase(const K& key, std::size_t precalculated_hash) { 
         return m_ht.erase(key, precalculated_hash); 
     }
@@ -424,7 +424,7 @@ public:
      * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     T& at(const K& key) { return m_ht.at(key); }
 
     /**
@@ -433,20 +433,20 @@ public:
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */    
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     T& at(const K& key, std::size_t precalculated_hash) { return m_ht.at(key, precalculated_hash); }
     
     
     /**
      * @copydoc at(const K& key)
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     const T& at(const K& key) const { return m_ht.at(key); }
     
     /**
      * @copydoc at(const K& key, std::size_t precalculated_hash)
      */    
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     const T& at(const K& key, std::size_t precalculated_hash) const { return m_ht.at(key, precalculated_hash); }
     
     
@@ -472,7 +472,7 @@ public:
      * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     size_type count(const K& key) const { return m_ht.count(key); }
     
     /**
@@ -481,7 +481,7 @@ public:
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */     
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     size_type count(const K& key, std::size_t precalculated_hash) const { return m_ht.count(key, precalculated_hash); }
     
     
@@ -508,7 +508,7 @@ public:
      * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     iterator find(const K& key) { return m_ht.find(key); }
     
     /**
@@ -517,13 +517,13 @@ public:
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     iterator find(const K& key, std::size_t precalculated_hash) { return m_ht.find(key, precalculated_hash); }
     
     /**
      * @copydoc find(const K& key)
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     const_iterator find(const K& key) const { return m_ht.find(key); }
     
     /**
@@ -532,7 +532,7 @@ public:
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     const_iterator find(const K& key, std::size_t precalculated_hash) const { 
         return m_ht.find(key, precalculated_hash); 
     }
@@ -563,7 +563,7 @@ public:
      * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     std::pair<iterator, iterator> equal_range(const K& key) { return m_ht.equal_range(key); }
     
     
@@ -573,7 +573,7 @@ public:
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     std::pair<iterator, iterator> equal_range(const K& key, std::size_t precalculated_hash) { 
         return m_ht.equal_range(key, precalculated_hash); 
     }
@@ -581,13 +581,13 @@ public:
     /**
      * @copydoc equal_range(const K& key)
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     std::pair<const_iterator, const_iterator> equal_range(const K& key) const { return m_ht.equal_range(key); }
     
     /**
      * @copydoc equal_range(const K& key, std::size_t precalculated_hash)
      */    
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     std::pair<const_iterator, const_iterator> equal_range(const K& key, std::size_t precalculated_hash) const { 
         return m_ht.equal_range(key, precalculated_hash); 
     }

dbms/src/Common/tests/hopscotch-map/src/hopscotch_sc_map.h

@@ -53,7 +53,7 @@ namespace tsl {
  * 
  * @copydoc hopscotch_map
  */
-template<class Key, 
+template <typename Key, 
          class T, 
          class Hash = std::hash<Key>,
          class KeyEqual = std::equal_to<Key>,
@@ -64,7 +64,7 @@ template<class Key,
          class GrowthPolicy = tsl::power_of_two_growth_policy>
 class hopscotch_sc_map {
 private:
-    template<typename U>
+    template <typename U>
     using has_is_transparent = tsl::detail_hopscotch_hash::has_is_transparent<U>;
     
     class KeySelect {
@@ -150,7 +150,7 @@ public:
     explicit hopscotch_sc_map(const Allocator& alloc) : hopscotch_sc_map(ht::DEFAULT_INIT_BUCKETS_SIZE, alloc) {
     }
     
-    template<class InputIt>
+    template <typename InputIt>
     hopscotch_sc_map(InputIt first, InputIt last,
                 size_type bucket_count = ht::DEFAULT_INIT_BUCKETS_SIZE,
                 const Hash& hash = Hash(),
@@ -160,14 +160,14 @@ public:
         insert(first, last);
     }
     
-    template<class InputIt>
+    template <typename InputIt>
     hopscotch_sc_map(InputIt first, InputIt last,
                 size_type bucket_count,
                 const Allocator& alloc) : hopscotch_sc_map(first, last, bucket_count, Hash(), KeyEqual(), alloc)
     {
     }
     
-    template<class InputIt>
+    template <typename InputIt>
     hopscotch_sc_map(InputIt first, InputIt last,
                 size_type bucket_count,
                 const Hash& hash,
@@ -243,7 +243,7 @@ public:
         return m_ht.insert(value); 
     }
         
-    template<class P, typename std::enable_if<std::is_constructible<value_type, P&&>::value>::type* = nullptr>
+    template <typename P, typename std::enable_if<std::is_constructible<value_type, P&&>::value>::type* = nullptr>
     std::pair<iterator, bool> insert(P&& value) { 
         return m_ht.insert(std::forward<P>(value)); 
     }
@@ -257,7 +257,7 @@ public:
         return m_ht.insert(hint, value); 
     }
         
-    template<class P, typename std::enable_if<std::is_constructible<value_type, P&&>::value>::type* = nullptr>
+    template <typename P, typename std::enable_if<std::is_constructible<value_type, P&&>::value>::type* = nullptr>
     iterator insert(const_iterator hint, P&& value) { 
         return m_ht.insert(hint, std::forward<P>(value));
     }
@@ -267,7 +267,7 @@ public:
     }
     
     
-    template<class InputIt>
+    template <typename InputIt>
     void insert(InputIt first, InputIt last) { 
         m_ht.insert(first, last); 
     }
@@ -279,22 +279,22 @@ public:
     
     
     
-    template<class M>
+    template <typename M>
     std::pair<iterator, bool> insert_or_assign(const key_type& k, M&& obj) { 
         return m_ht.insert_or_assign(k, std::forward<M>(obj)); 
     }
 
-    template<class M>
+    template <typename M>
     std::pair<iterator, bool> insert_or_assign(key_type&& k, M&& obj) { 
         return m_ht.insert_or_assign(std::move(k), std::forward<M>(obj)); 
     }
     
-    template<class M>
+    template <typename M>
     iterator insert_or_assign(const_iterator hint, const key_type& k, M&& obj) {
         return m_ht.insert_or_assign(hint, k, std::forward<M>(obj));
     }
     
-    template<class M>
+    template <typename M>
     iterator insert_or_assign(const_iterator hint, key_type&& k, M&& obj) {
         return m_ht.insert_or_assign(hint, std::move(k), std::forward<M>(obj));
     }
@@ -307,7 +307,7 @@ public:
      * 
      * Mainly here for compatibility with the std::unordered_map interface.
      */
-    template<class... Args>
+    template <typename... Args>
     std::pair<iterator, bool> emplace(Args&&... args) { 
         return m_ht.emplace(std::forward<Args>(args)...); 
     }
@@ -321,7 +321,7 @@ public:
      * 
      * Mainly here for compatibility with the std::unordered_map interface.
      */
-    template<class... Args>
+    template <typename... Args>
     iterator emplace_hint(const_iterator hint, Args&&... args) {
         return m_ht.emplace_hint(hint, std::forward<Args>(args)...);
     }
@@ -329,22 +329,22 @@ public:
     
     
     
-    template<class... Args>
+    template <typename... Args>
     std::pair<iterator, bool> try_emplace(const key_type& k, Args&&... args) { 
         return m_ht.try_emplace(k, std::forward<Args>(args)...);
     }
     
-    template<class... Args>
+    template <typename... Args>
     std::pair<iterator, bool> try_emplace(key_type&& k, Args&&... args) {
         return m_ht.try_emplace(std::move(k), std::forward<Args>(args)...);
     }
     
-    template<class... Args>
+    template <typename... Args>
     iterator try_emplace(const_iterator hint, const key_type& k, Args&&... args) {
         return m_ht.try_emplace(hint, k, std::forward<Args>(args)...);
     }
     
-    template<class... Args>
+    template <typename... Args>
     iterator try_emplace(const_iterator hint, key_type&& k, Args&&... args) {
         return m_ht.try_emplace(hint, std::move(k), std::forward<Args>(args)...);
     }
@@ -370,7 +370,7 @@ public:
      * and Compare::is_transparent exist. 
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     size_type erase(const K& key) { return m_ht.erase(key); }
     
@@ -380,7 +380,7 @@ public:
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup to the value if you already have the hash.
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     size_type erase(const K& key, std::size_t precalculated_hash) { return m_ht.erase(key, precalculated_hash); }
     
@@ -412,7 +412,7 @@ public:
      * and Compare::is_transparent exist. 
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     T& at(const K& key) { return m_ht.at(key); }
     
@@ -422,21 +422,21 @@ public:
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */    
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     T& at(const K& key, std::size_t precalculated_hash) { return m_ht.at(key, precalculated_hash); }
     
     /**
      * @copydoc at(const K& key)
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     const T& at(const K& key) const { return m_ht.at(key); }
     
     /**
      * @copydoc at(const K& key, std::size_t precalculated_hash)
      */    
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     const T& at(const K& key, std::size_t precalculated_hash) const { return m_ht.at(key, precalculated_hash); }
     
@@ -462,7 +462,7 @@ public:
      * and Compare::is_transparent exist. 
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     size_type count(const K& key) const { return m_ht.count(key); }
     
@@ -472,7 +472,7 @@ public:
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */     
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     size_type count(const K& key, std::size_t precalculated_hash) const { return m_ht.count(key, precalculated_hash); }
     
@@ -499,7 +499,7 @@ public:
      * and Compare::is_transparent exist. 
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     iterator find(const K& key) { return m_ht.find(key); }
     
@@ -509,21 +509,21 @@ public:
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     iterator find(const K& key, std::size_t precalculated_hash) { return m_ht.find(key, precalculated_hash); }
     
     /**
      * @copydoc find(const K& key)
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     const_iterator find(const K& key) const { return m_ht.find(key); }
     
     /**
      * @copydoc find(const K& key, std::size_t precalculated_hash)
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     const_iterator find(const K& key, std::size_t precalculated_hash) const { return m_ht.find(key, precalculated_hash); }
     
@@ -554,7 +554,7 @@ public:
      * and Compare::is_transparent exist. 
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     std::pair<iterator, iterator> equal_range(const K& key) { return m_ht.equal_range(key); }
     
@@ -564,7 +564,7 @@ public:
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */    
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     std::pair<iterator, iterator> equal_range(const K& key, std::size_t precalculated_hash) { 
         return m_ht.equal_range(key, precalculated_hash); 
@@ -573,14 +573,14 @@ public:
     /**
      * @copydoc equal_range(const K& key)
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     std::pair<const_iterator, const_iterator> equal_range(const K& key) const { return m_ht.equal_range(key); }
     
     /**
      * @copydoc equal_range(const K& key, std::size_t precalculated_hash)
      */    
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     std::pair<const_iterator, const_iterator> equal_range(const K& key, std::size_t precalculated_hash) const { 
         return m_ht.equal_range(key, precalculated_hash); 

dbms/src/Common/tests/hopscotch-map/src/hopscotch_sc_set.h

@@ -53,7 +53,7 @@ namespace tsl {
  * 
  * @copydoc hopscotch_set
  */
-template<class Key, 
+template <typename Key, 
          class Hash = std::hash<Key>,
          class KeyEqual = std::equal_to<Key>,
          class Compare = std::less<Key>,
@@ -63,7 +63,7 @@ template<class Key,
          class GrowthPolicy = tsl::power_of_two_growth_policy>
 class hopscotch_sc_set {
 private:    
-    template<typename U>
+    template <typename U>
     using has_is_transparent = tsl::detail_hopscotch_hash::has_is_transparent<U>;
     
     class KeySelect {
@@ -133,7 +133,7 @@ public:
     explicit hopscotch_sc_set(const Allocator& alloc) : hopscotch_sc_set(ht::DEFAULT_INIT_BUCKETS_SIZE, alloc) {
     }
     
-    template<class InputIt>
+    template <typename InputIt>
     hopscotch_sc_set(InputIt first, InputIt last,
                 size_type bucket_count = ht::DEFAULT_INIT_BUCKETS_SIZE,
                 const Hash& hash = Hash(),
@@ -143,14 +143,14 @@ public:
         insert(first, last);
     }
     
-    template<class InputIt>
+    template <typename InputIt>
     hopscotch_sc_set(InputIt first, InputIt last,
                 size_type bucket_count,
                 const Allocator& alloc) : hopscotch_sc_set(first, last, bucket_count, Hash(), KeyEqual(), alloc)
     {
     }
     
-    template<class InputIt>
+    template <typename InputIt>
     hopscotch_sc_set(InputIt first, InputIt last,
                 size_type bucket_count,
                 const Hash& hash,
@@ -228,7 +228,7 @@ public:
     iterator insert(const_iterator hint, const value_type& value) { return m_ht.insert(hint, value); }
     iterator insert(const_iterator hint, value_type&& value) { return m_ht.insert(hint, std::move(value)); }
     
-    template<class InputIt>
+    template <typename InputIt>
     void insert(InputIt first, InputIt last) { m_ht.insert(first, last); }
     void insert(std::initializer_list<value_type> ilist) { m_ht.insert(ilist.begin(), ilist.end()); }
 
@@ -241,7 +241,7 @@ public:
      * 
      * Mainly here for compatibility with the std::unordered_map interface.
      */
-    template<class... Args>
+    template <typename... Args>
     std::pair<iterator, bool> emplace(Args&&... args) { return m_ht.emplace(std::forward<Args>(args)...); }
     
     
@@ -253,7 +253,7 @@ public:
      * 
      * Mainly here for compatibility with the std::unordered_map interface.
      */
-    template<class... Args>
+    template <typename... Args>
     iterator emplace_hint(const_iterator hint, Args&&... args) {
         return m_ht.emplace_hint(hint, std::forward<Args>(args)...);
     }
@@ -279,7 +279,7 @@ public:
      * and Compare::is_transparent exist. 
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     size_type erase(const K& key) { return m_ht.erase(key); }
     
@@ -289,7 +289,7 @@ public:
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup to the value if you already have the hash.
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     size_type erase(const K& key, std::size_t precalculated_hash) { return m_ht.erase(key, precalculated_hash); }
     
@@ -315,7 +315,7 @@ public:
      * and Compare::is_transparent exist. 
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     size_type count(const K& key) const { return m_ht.count(key); }
     
@@ -325,7 +325,7 @@ public:
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     size_type count(const K& key, std::size_t precalculated_hash) const { return m_ht.count(key, precalculated_hash); }
     
@@ -352,7 +352,7 @@ public:
      * and Compare::is_transparent exist. 
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     iterator find(const K& key) { return m_ht.find(key); }
     
@@ -362,14 +362,14 @@ public:
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     iterator find(const K& key, std::size_t precalculated_hash) { return m_ht.find(key, precalculated_hash); }
     
     /**
      * @copydoc find(const K& key)
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     const_iterator find(const K& key) const { return m_ht.find(key); }
     
@@ -379,7 +379,7 @@ public:
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     const_iterator find(const K& key, std::size_t precalculated_hash) const { return m_ht.find(key, precalculated_hash); }
     
@@ -410,7 +410,7 @@ public:
      * and Compare::is_transparent exist. 
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     std::pair<iterator, iterator> equal_range(const K& key) { return m_ht.equal_range(key); }
     
@@ -420,7 +420,7 @@ public:
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     std::pair<iterator, iterator> equal_range(const K& key, std::size_t precalculated_hash) { 
         return m_ht.equal_range(key, precalculated_hash); 
@@ -429,14 +429,14 @@ public:
     /**
      * @copydoc equal_range(const K& key)
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     std::pair<const_iterator, const_iterator> equal_range(const K& key) const { return m_ht.equal_range(key); }    
     
     /**
      * @copydoc equal_range(const K& key, std::size_t precalculated_hash)
      */
-    template<class K, class KE = KeyEqual, class CP = Compare, 
+    template <typename K, typename KE = KeyEqual, typename CP = Compare, 
              typename std::enable_if<has_is_transparent<KE>::value && has_is_transparent<CP>::value>::type* = nullptr> 
     std::pair<const_iterator, const_iterator> equal_range(const K& key, std::size_t precalculated_hash) const { 
         return m_ht.equal_range(key, precalculated_hash); 

dbms/src/Common/tests/hopscotch-map/src/hopscotch_set.h

@@ -68,7 +68,7 @@ namespace tsl {
  *    insert will invalidate the iterators). Or if there is a rehash.
  *  - erase: iterator on the erased element is the only one which become invalid.
  */
-template<class Key, 
+template <typename Key, 
          class Hash = std::hash<Key>,
          class KeyEqual = std::equal_to<Key>,
          class Allocator = std::allocator<Key>,
@@ -77,7 +77,7 @@ template<class Key,
          class GrowthPolicy = tsl::power_of_two_growth_policy>
 class hopscotch_set {
 private:    
-    template<typename U>
+    template <typename U>
     using has_is_transparent = tsl::detail_hopscotch_hash::has_is_transparent<U>;
     
     class KeySelect {
@@ -145,7 +145,7 @@ public:
     explicit hopscotch_set(const Allocator& alloc) : hopscotch_set(ht::DEFAULT_INIT_BUCKETS_SIZE, alloc) {
     }
     
-    template<class InputIt>
+    template <typename InputIt>
     hopscotch_set(InputIt first, InputIt last,
                 size_type bucket_count = ht::DEFAULT_INIT_BUCKETS_SIZE,
                 const Hash& hash = Hash(),
@@ -155,14 +155,14 @@ public:
         insert(first, last);
     }
     
-    template<class InputIt>
+    template <typename InputIt>
     hopscotch_set(InputIt first, InputIt last,
                 size_type bucket_count,
                 const Allocator& alloc) : hopscotch_set(first, last, bucket_count, Hash(), KeyEqual(), alloc)
     {
     }
     
-    template<class InputIt>
+    template <typename InputIt>
     hopscotch_set(InputIt first, InputIt last,
                 size_type bucket_count,
                 const Hash& hash,
@@ -240,7 +240,7 @@ public:
     iterator insert(const_iterator hint, const value_type& value) { return m_ht.insert(hint, value); }
     iterator insert(const_iterator hint, value_type&& value) { return m_ht.insert(hint, std::move(value)); }
     
-    template<class InputIt>
+    template <typename InputIt>
     void insert(InputIt first, InputIt last) { m_ht.insert(first, last); }
     void insert(std::initializer_list<value_type> ilist) { m_ht.insert(ilist.begin(), ilist.end()); }
 
@@ -253,7 +253,7 @@ public:
      * 
      * Mainly here for compatibility with the std::unordered_map interface.
      */
-    template<class... Args>
+    template <typename... Args>
     std::pair<iterator, bool> emplace(Args&&... args) { return m_ht.emplace(std::forward<Args>(args)...); }
     
     
@@ -265,7 +265,7 @@ public:
      * 
      * Mainly here for compatibility with the std::unordered_map interface.
      */
-    template<class... Args>
+    template <typename... Args>
     iterator emplace_hint(const_iterator hint, Args&&... args) {
         return m_ht.emplace_hint(hint, std::forward<Args>(args)...);
     }
@@ -290,7 +290,7 @@ public:
      * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     size_type erase(const K& key) { return m_ht.erase(key); }
     
     /**
@@ -299,7 +299,7 @@ public:
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup to the value if you already have the hash.
      */    
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     size_type erase(const K& key, std::size_t precalculated_hash) { 
         return m_ht.erase(key, precalculated_hash); 
     }
@@ -325,7 +325,7 @@ public:
      * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     size_type count(const K& key) const { return m_ht.count(key); }
     
     /**
@@ -334,7 +334,7 @@ public:
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     size_type count(const K& key, std::size_t precalculated_hash) const { return m_ht.count(key, precalculated_hash); }
     
     
@@ -359,7 +359,7 @@ public:
      * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     iterator find(const K& key) { return m_ht.find(key); }
     
     /**
@@ -368,13 +368,13 @@ public:
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     iterator find(const K& key, std::size_t precalculated_hash) { return m_ht.find(key, precalculated_hash); }
     
     /**
      * @copydoc find(const K& key)
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     const_iterator find(const K& key) const { return m_ht.find(key); }
     
     /**
@@ -383,7 +383,7 @@ public:
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     const_iterator find(const K& key, std::size_t precalculated_hash) const { return m_ht.find(key, precalculated_hash); }
     
     
@@ -412,7 +412,7 @@ public:
      * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
      * If so, K must be hashable and comparable to Key.
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     std::pair<iterator, iterator> equal_range(const K& key) { return m_ht.equal_range(key); }
     
     /**
@@ -421,7 +421,7 @@ public:
      * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
      * as hash_function()(key). Usefull to speed-up the lookup if you already have the hash.
      */    
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     std::pair<iterator, iterator> equal_range(const K& key, std::size_t precalculated_hash) { 
         return m_ht.equal_range(key, precalculated_hash); 
     }
@@ -429,13 +429,13 @@ public:
     /**
      * @copydoc equal_range(const K& key)
      */
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     std::pair<const_iterator, const_iterator> equal_range(const K& key) const { return m_ht.equal_range(key); }
 
     /**
      * @copydoc equal_range(const K& key, std::size_t precalculated_hash)
      */    
-    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    template <typename K, typename KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
     std::pair<const_iterator, const_iterator> equal_range(const K& key, std::size_t precalculated_hash) const { 
         return m_ht.equal_range(key, precalculated_hash); 
     }

dbms/src/Core/AccurateComparison.h

@@ -161,7 +161,7 @@ inline bool_if_safe_conversion<A, B> greaterOp(A a, B b)
 
 constexpr DB::Int64 MAX_INT64_WITH_EXACT_FLOAT64_REPR = 9007199254740992LL; // 2^53
 
-template<>
+template <>
 inline bool greaterOp<DB::Float64, DB::Int64>(DB::Float64 f, DB::Int64 i)
 {
     if (-MAX_INT64_WITH_EXACT_FLOAT64_REPR <= i && i <= MAX_INT64_WITH_EXACT_FLOAT64_REPR)
@@ -171,7 +171,7 @@ inline bool greaterOp<DB::Float64, DB::Int64>(DB::Float64 f, DB::Int64 i)
             || (f > static_cast<DB::Float64>(std::numeric_limits<DB::Int64>::min()) && static_cast<DB::Int64>(f) > i);
 }
 
-template<>
+template <>
 inline bool greaterOp<DB::Int64, DB::Float64>(DB::Int64 i, DB::Float64 f)
 {
     if (-MAX_INT64_WITH_EXACT_FLOAT64_REPR <= i && i <= MAX_INT64_WITH_EXACT_FLOAT64_REPR)
@@ -181,7 +181,7 @@ inline bool greaterOp<DB::Int64, DB::Float64>(DB::Int64 i, DB::Float64 f)
             || (f < static_cast<DB::Float64>(std::numeric_limits<DB::Int64>::max()) && i > static_cast<DB::Int64>(f));
 }
 
-template<>
+template <>
 inline bool greaterOp<DB::Float64, DB::UInt64>(DB::Float64 f, DB::UInt64 u)
 {
     if (u <= static_cast<DB::UInt64>(MAX_INT64_WITH_EXACT_FLOAT64_REPR))
@@ -191,7 +191,7 @@ inline bool greaterOp<DB::Float64, DB::UInt64>(DB::Float64 f, DB::UInt64 u)
             || (f >= 0 && static_cast<DB::UInt64>(f) > u);
 }
 
-template<>
+template <>
 inline bool greaterOp<DB::UInt64, DB::Float64>(DB::UInt64 u, DB::Float64 f)
 {
     if (u <= static_cast<DB::UInt64>(MAX_INT64_WITH_EXACT_FLOAT64_REPR))
@@ -202,49 +202,49 @@ inline bool greaterOp<DB::UInt64, DB::Float64>(DB::UInt64 u, DB::Float64 f)
 }
 
 // Case 3b for float32
-template<>
+template <>
 inline bool greaterOp<DB::Float32, DB::Int64>(DB::Float32 f, DB::Int64 i)
 {
     return greaterOp(static_cast<DB::Float64>(f), i);
 }
 
-template<>
+template <>
 inline bool greaterOp<DB::Int64, DB::Float32>(DB::Int64 i, DB::Float32 f)
 {
     return greaterOp(i, static_cast<DB::Float64>(f));
 }
 
-template<>
+template <>
 inline bool greaterOp<DB::Float32, DB::UInt64>(DB::Float32 f, DB::UInt64 u)
 {
     return greaterOp(static_cast<DB::Float64>(f), u);
 }
 
-template<>
+template <>
 inline bool greaterOp<DB::UInt64, DB::Float32>(DB::UInt64 u, DB::Float32 f)
 {
     return greaterOp(u, static_cast<DB::Float64>(f));
 }
 
-template<>
+template <>
 inline bool greaterOp<DB::Float64, DB::UInt128>(DB::Float64 f, DB::UInt128 u)
 {
     return u.low == 0 && greaterOp(f, u.high);
 }
 
-template<>
+template <>
 inline bool greaterOp<DB::UInt128, DB::Float64>(DB::UInt128 u, DB::Float64 f)
 {
     return u.low != 0 || greaterOp(u.high, f);
 }
 
-template<>
+template <>
 inline bool greaterOp<DB::Float32, DB::UInt128>(DB::Float32 f, DB::UInt128 u)
 {
     return greaterOp(static_cast<DB::Float64>(f), u);
 }
 
-template<>
+template <>
 inline bool greaterOp<DB::UInt128, DB::Float32>(DB::UInt128 u, DB::Float32 f)
 {
     return greaterOp(u, static_cast<DB::Float64>(f));
@@ -262,73 +262,73 @@ inline bool_if_safe_conversion<A, B> equalsOp(A a, B b)
     return a == b;
 }
 
-template<>
+template <>
 inline bool equalsOp<DB::Float64, DB::UInt64>(DB::Float64 f, DB::UInt64 u)
 {
     return static_cast<DB::UInt64>(f) == u && f == static_cast<DB::Float64>(u);
 }
 
-template<>
+template <>
 inline bool equalsOp<DB::UInt64, DB::Float64>(DB::UInt64 u, DB::Float64 f)
 {
     return u == static_cast<DB::UInt64>(f) && static_cast<DB::Float64>(u) == f;
 }
 
-template<>
+template <>
 inline bool equalsOp<DB::Float64, DB::Int64>(DB::Float64 f, DB::Int64 u)
 {
     return static_cast<DB::Int64>(f) == u && f == static_cast<DB::Float64>(u);
 }
 
-template<>
+template <>
 inline bool equalsOp<DB::Int64, DB::Float64>(DB::Int64 u, DB::Float64 f)
 {
     return u == static_cast<DB::Int64>(f) && static_cast<DB::Float64>(u) == f;
 }
 
-template<>
+template <>
 inline bool equalsOp<DB::Float32, DB::UInt64>(DB::Float32 f, DB::UInt64 u)
 {
     return static_cast<DB::UInt64>(f) == u && f == static_cast<DB::Float32>(u);
 }
 
-template<>
+template <>
 inline bool equalsOp<DB::UInt64, DB::Float32>(DB::UInt64 u, DB::Float32 f)
 {
     return u == static_cast<DB::UInt64>(f) && static_cast<DB::Float32>(u) == f;
 }
 
-template<>
+template <>
 inline bool equalsOp<DB::Float32, DB::Int64>(DB::Float32 f, DB::Int64 u)
 {
     return static_cast<DB::Int64>(f) == u && f == static_cast<DB::Float32>(u);
 }
 
-template<>
+template <>
 inline bool equalsOp<DB::Int64, DB::Float32>(DB::Int64 u, DB::Float32 f)
 {
     return u == static_cast<DB::Int64>(f) && static_cast<DB::Float32>(u) == f;
 }
 
-template<>
+template <>
 inline bool equalsOp<DB::UInt128, DB::Float64>(DB::UInt128 u, DB::Float64 f)
 {
     return u.low == 0 && equalsOp(static_cast<UInt64>(u.high), f);
 }
 
-template<>
+template <>
 inline bool equalsOp<DB::UInt128, DB::Float32>(DB::UInt128 u, DB::Float32 f)
 {
     return equalsOp(u, static_cast<DB::Float64>(f));
 }
 
-template<>
+template <>
 inline bool equalsOp<DB::Float64, DB::UInt128>(DB::Float64 f, DB::UInt128 u)
 {
     return equalsOp(u, f);
 }
 
-template<>
+template <>
 inline bool equalsOp<DB::Float32, DB::UInt128>(DB::Float32 f, DB::UInt128 u)
 {
     return equalsOp(static_cast<DB::Float64>(f), u);

dbms/src/Core/QualifiedTableName.h

@@ -36,7 +36,7 @@ struct QualifiedTableName
 namespace std
 {
 
-template<> struct hash<DB::QualifiedTableName>
+template <> struct hash<DB::QualifiedTableName>
 {
     using argument_type = DB::QualifiedTableName;
     using result_type = size_t;

dbms/src/DataStreams/AggregatingSortedBlockInputStream.cpp

@@ -68,7 +68,7 @@ Block AggregatingSortedBlockInputStream::readImpl()
 }
 
 
-template<class TSortCursor>
+template <typename TSortCursor>
 void AggregatingSortedBlockInputStream::merge(ColumnPlainPtrs & merged_columns, std::priority_queue<TSortCursor> & queue)
 {
     size_t merged_rows = 0;
@@ -133,7 +133,7 @@ void AggregatingSortedBlockInputStream::merge(ColumnPlainPtrs & merged_columns,
 }
 
 
-template <class TSortCursor>
+template <typename TSortCursor>
 void AggregatingSortedBlockInputStream::addRow(TSortCursor & cursor)
 {
     for (size_t i = 0, size = column_numbers_to_aggregate.size(); i < size; ++i)

dbms/src/DataStreams/AggregatingSortedBlockInputStream.h

@@ -70,12 +70,12 @@ private:
     /** We support two different cursors - with Collation and without.
      *  Templates are used instead of polymorphic SortCursor and calls to virtual functions.
      */
-    template <class TSortCursor>
+    template <typename TSortCursor>
     void merge(ColumnPlainPtrs & merged_columns, std::priority_queue<TSortCursor> & queue);
 
     /** Extract all states of aggregate functions and merge them with the current group.
       */
-    template <class TSortCursor>
+    template <typename TSortCursor>
     void addRow(TSortCursor & cursor);
 };
 

dbms/src/DataStreams/AsynchronousBlockInputStream.h

@@ -57,7 +57,10 @@ public:
         if (started)
         {
             pool.wait();
+            if (exception)
+                std::rethrow_exception(exception);
             children.back()->readSuffix();
+            started = false;
         }
     }
 
@@ -79,23 +82,18 @@ public:
 
     ~AsynchronousBlockInputStream() override
     {
-        try
+        if (started)
-        {
+            pool.wait();
-            pool.wait();    /// It's ok to call wait even if there is no active threads.
-        }
-        catch (...)
-        {
-            tryLogCurrentException(__PRETTY_FUNCTION__);
-        }
     }
 
 protected:
-    ThreadPool pool{1}; /// Rethrows exceptions automatically on wait.
+    ThreadPool pool{1};
     Poco::Event ready;
     bool started = false;
     bool first = true;
 
     Block block;
+    std::exception_ptr exception;
 
 
     Block readImpl() override
@@ -103,12 +101,15 @@ protected:
         /// If there were no calculations yet, calculate the first block synchronously
         if (!started)
         {
-            started = true;
             calculate(current_memory_tracker);
+            started = true;
         }
         else    /// If the calculations are already in progress - wait for the result
             pool.wait();
 
+        if (exception)
+            std::rethrow_exception(exception);
+
         Block res = block;
         if (!res)
             return res;
@@ -133,6 +134,8 @@ protected:
     {
         CurrentMetrics::Increment metric_increment{CurrentMetrics::QueryThread};
 
+        try
+        {
             if (first)
             {
                 first = false;
@@ -142,6 +145,11 @@ protected:
             }
 
             block = children.back()->read();
+        }
+        catch (...)
+        {
+            exception = std::current_exception();
+        }
 
         ready.set();
     }

dbms/src/DataStreams/CollapsingSortedBlockInputStream.cpp

@@ -136,7 +136,7 @@ Block CollapsingSortedBlockInputStream::readImpl()
 }
 
 
-template<class TSortCursor>
+template <typename TSortCursor>
 void CollapsingSortedBlockInputStream::merge(ColumnPlainPtrs & merged_columns, std::priority_queue<TSortCursor> & queue)
 {
     size_t merged_rows = 0;

dbms/src/DataStreams/CollapsingSortedBlockInputStream.h

@@ -90,7 +90,7 @@ private:
     /** We support two different cursors - with Collation and without.
      *  Templates are used instead of polymorphic SortCursors and calls to virtual functions.
      */
-    template<class TSortCursor>
+    template <typename TSortCursor>
     void merge(ColumnPlainPtrs & merged_columns, std::priority_queue<TSortCursor> & queue);
 
     /// Output to result rows for the current primary key.

dbms/src/DataStreams/ColumnGathererStream.cpp

@@ -118,8 +118,13 @@ void ColumnGathererStream::fetchNewBlock(Source & source, size_t source_num)
 void ColumnGathererStream::readSuffixImpl()
 {
     const BlockStreamProfileInfo & profile_info = getProfileInfo();
+
+    /// Don't print info for small parts (< 10M rows)
+    if (profile_info.rows < 10000000)
+        return;
+
     double seconds = profile_info.total_stopwatch.elapsedSeconds();
-    LOG_DEBUG(log, std::fixed << std::setprecision(2)
+    LOG_TRACE(log, std::fixed << std::setprecision(2)
         << "Gathered column " << name
         << " (" << static_cast<double>(profile_info.bytes) / profile_info.rows << " bytes/elem.)"
         << " in " << seconds << " sec., "

dbms/src/DataStreams/ColumnGathererStream.h

@@ -68,7 +68,7 @@ public:
     void readSuffixImpl() override;
 
     /// for use in implementations of IColumn::gather()
-    template<typename Column>
+    template <typename Column>
     void gather(Column & column_res);
 
 private:
@@ -110,7 +110,7 @@ private:
     Poco::Logger * log;
 };
 
-template<typename Column>
+template <typename Column>
 void ColumnGathererStream::gather(Column & column_res)
 {
     if (source_to_fully_copy) /// Was set on a previous iteration

dbms/src/DataStreams/GraphiteRollupSortedBlockInputStream.cpp

@@ -218,7 +218,7 @@ void GraphiteRollupSortedBlockInputStream::merge(ColumnPlainPtrs & merged_column
 }
 
 
-template <class TSortCursor>
+template <typename TSortCursor>
 void GraphiteRollupSortedBlockInputStream::startNextRow(ColumnPlainPtrs & merged_columns, TSortCursor & cursor, const Graphite::Pattern * next_pattern)
 {
     /// Copy unmodified column values.

dbms/src/DataStreams/GraphiteRollupSortedBlockInputStream.h

@@ -199,7 +199,7 @@ private:
     void merge(ColumnPlainPtrs & merged_columns, std::priority_queue<TSortCursor> & queue);
 
     /// Insert the values into the resulting columns, which will not be changed in the future.
-    template <class TSortCursor>
+    template <typename TSortCursor>
     void startNextRow(ColumnPlainPtrs & merged_columns, TSortCursor & cursor, const Graphite::Pattern * next_pattern);
 
     /// Insert the calculated `time`, `value`, `version` values into the resulting columns by the last group of rows.

dbms/src/DataStreams/MergingSortedBlockInputStream.cpp

@@ -174,6 +174,38 @@ Block MergingSortedBlockInputStream::readImpl()
     return merged_block;
 }
 
+
+template <typename TSortCursor>
+void MergingSortedBlockInputStream::fetchNextBlock(const TSortCursor & current, std::priority_queue<TSortCursor> & queue)
+{
+    size_t i = 0;
+    size_t size = cursors.size();
+    for (; i < size; ++i)
+    {
+        if (&cursors[i] == current.impl)
+        {
+            source_blocks[i] = new detail::SharedBlock(children[i]->read());
+            if (*source_blocks[i])
+            {
+                cursors[i].reset(*source_blocks[i]);
+                queue.push(TSortCursor(&cursors[i]));
+            }
+
+            break;
+        }
+    }
+
+    if (i == size)
+        throw Exception("Logical error in MergingSortedBlockInputStream", ErrorCodes::LOGICAL_ERROR);
+}
+
+template
+void MergingSortedBlockInputStream::fetchNextBlock<SortCursor>(const SortCursor & current, std::priority_queue<SortCursor> & queue);
+
+template
+void MergingSortedBlockInputStream::fetchNextBlock<SortCursorWithCollation>(const SortCursorWithCollation & current, std::priority_queue<SortCursorWithCollation> & queue);
+
+
 template <typename TSortCursor>
 void MergingSortedBlockInputStream::merge(Block & merged_block, ColumnPlainPtrs & merged_columns, std::priority_queue<TSortCursor> & queue)
 {
@@ -321,31 +353,6 @@ void MergingSortedBlockInputStream::merge(Block & merged_block, ColumnPlainPtrs
 }
 
 
-template <typename TSortCursor>
-void MergingSortedBlockInputStream::fetchNextBlock(const TSortCursor & current, std::priority_queue<TSortCursor> & queue)
-{
-    size_t i = 0;
-    size_t size = cursors.size();
-    for (; i < size; ++i)
-    {
-        if (&cursors[i] == current.impl)
-        {
-            source_blocks[i] = new detail::SharedBlock(children[i]->read());
-            if (*source_blocks[i])
-            {
-                cursors[i].reset(*source_blocks[i]);
-                queue.push(TSortCursor(&cursors[i]));
-            }
-
-            break;
-        }
-    }
-
-    if (i == size)
-        throw Exception("Logical error in MergingSortedBlockInputStream", ErrorCodes::LOGICAL_ERROR);
-}
-
-
 void MergingSortedBlockInputStream::readSuffixImpl()
 {
      if (quiet)

dbms/src/DataStreams/MergingSortedBlockInputStream.h

@@ -153,7 +153,7 @@ protected:
     /// These methods are used in Collapsing/Summing/Aggregating... SortedBlockInputStream-s.
 
     /// Save the row pointed to by cursor in `row`.
-    template <class TSortCursor>
+    template <typename TSortCursor>
     void setRow(Row & row, TSortCursor & cursor)
     {
         for (size_t i = 0; i < num_columns; ++i)
@@ -185,7 +185,7 @@ protected:
         }
     }
 
-    template <class TSortCursor>
+    template <typename TSortCursor>
     void setRowRef(RowRef & row_ref, TSortCursor & cursor)
     {
         row_ref.row_num = cursor.impl->pos;
@@ -195,7 +195,7 @@ protected:
             row_ref.columns[i] = cursor->all_columns[i];
     }
 
-    template <class TSortCursor>
+    template <typename TSortCursor>
     void setPrimaryKeyRef(RowRef & row_ref, TSortCursor & cursor)
     {
         row_ref.row_num = cursor.impl->pos;

dbms/src/DataStreams/ReplacingSortedBlockInputStream.cpp

@@ -58,7 +58,7 @@ Block ReplacingSortedBlockInputStream::readImpl()
 }
 
 
-template<class TSortCursor>
+template <typename TSortCursor>
 void ReplacingSortedBlockInputStream::merge(ColumnPlainPtrs & merged_columns, std::priority_queue<TSortCursor> & queue)
 {
     size_t merged_rows = 0;

dbms/src/DataStreams/ReplacingSortedBlockInputStream.h

@@ -63,7 +63,7 @@ private:
 
     PODArray<RowSourcePart> current_row_sources;   /// Sources of rows with the current primary key
 
-    template<class TSortCursor>
+    template <typename TSortCursor>
     void merge(ColumnPlainPtrs & merged_columns, std::priority_queue<TSortCursor> & queue);
 
     /// Output into result the rows for current primary key.

dbms/src/DataStreams/SummingSortedBlockInputStream.cpp

@@ -176,7 +176,7 @@ Block SummingSortedBlockInputStream::readImpl()
 }
 
 
-template <class TSortCursor>
+template <typename TSortCursor>
 void SummingSortedBlockInputStream::merge(ColumnPlainPtrs & merged_columns, std::priority_queue<TSortCursor> & queue)
 {
     size_t merged_rows = 0;
@@ -269,7 +269,7 @@ public:
 };
 
 
-template <class TSortCursor>
+template <typename TSortCursor>
 bool SummingSortedBlockInputStream::mergeMaps(Row & row, TSortCursor & cursor)
 {
     bool non_empty_map_present = false;
@@ -283,7 +283,7 @@ bool SummingSortedBlockInputStream::mergeMaps(Row & row, TSortCursor & cursor)
 }
 
 
-template <class TSortCursor>
+template <typename TSortCursor>
 bool SummingSortedBlockInputStream::mergeMap(const MapDescription & desc, Row & row, TSortCursor & cursor)
 {
     /// Strongly non-optimal.
@@ -367,7 +367,7 @@ bool SummingSortedBlockInputStream::mergeMap(const MapDescription & desc, Row &
 }
 
 
-template <class TSortCursor>
+template <typename TSortCursor>
 bool SummingSortedBlockInputStream::addRow(Row & row, TSortCursor & cursor)
 {
     bool res = mergeMaps(row, cursor);    /// Is there at least one non-zero number or non-empty array

dbms/src/DataStreams/SummingSortedBlockInputStream.h

@@ -90,7 +90,7 @@ private:
     /** We support two different cursors - with Collation and without.
      *  Templates are used instead of polymorphic SortCursor and calls to virtual functions.
      */
-    template <class TSortCursor>
+    template <typename TSortCursor>
     void merge(ColumnPlainPtrs & merged_columns, std::priority_queue<TSortCursor> & queue);
 
     /// Insert the summed row for the current group into the result.
@@ -99,16 +99,16 @@ private:
     /** For nested Map, a merge by key is performed with the ejection of rows of nested arrays, in which
       * all items are zero.
       */
-    template <class TSortCursor>
+    template <typename TSortCursor>
     bool mergeMaps(Row & row, TSortCursor & cursor);
 
-    template <class TSortCursor>
+    template <typename TSortCursor>
     bool mergeMap(const MapDescription & map, Row & row, TSortCursor & cursor);
 
     /** Add the row under the cursor to the `row`.
       * Returns false if the result is zero.
       */
-    template <class TSortCursor>
+    template <typename TSortCursor>
     bool addRow(Row & row, TSortCursor & cursor);
 };
 

dbms/src/DataStreams/UnionBlockInputStream.h

@@ -237,13 +237,13 @@ protected:
     }
 
 private:
-    template<StreamUnionMode mode2 = mode>
+    template <StreamUnionMode mode2 = mode>
     BlockExtraInfo doGetBlockExtraInfo(typename std::enable_if<mode2 == StreamUnionMode::ExtraInfo>::type * = nullptr) const
     {
         return received_payload.extra_info;
     }
 
-    template<StreamUnionMode mode2 = mode>
+    template <StreamUnionMode mode2 = mode>
     BlockExtraInfo doGetBlockExtraInfo(typename std::enable_if<mode2 == StreamUnionMode::Basic>::type * = nullptr) const
     {
         throw Exception("Method getBlockExtraInfo is not supported for mode StreamUnionMode::Basic",

dbms/src/Dictionaries/ComplexKeyCacheDictionary.cpp

@@ -466,6 +466,17 @@ StringRef ComplexKeyCacheDictionary::placeKeysInPool(
     return { place, sum_keys_size };
 }
 
+/// Explicit instantiations.
+
+template StringRef ComplexKeyCacheDictionary::placeKeysInPool<Arena>(
+    const size_t row, const Columns & key_columns, StringRefs & keys,
+    const std::vector<DictionaryAttribute> & key_attributes, Arena & pool);
+
+template StringRef ComplexKeyCacheDictionary::placeKeysInPool<ArenaWithFreeLists>(
+    const size_t row, const Columns & key_columns, StringRefs & keys,
+    const std::vector<DictionaryAttribute> & key_attributes, ArenaWithFreeLists & pool);
+
+
 StringRef ComplexKeyCacheDictionary::placeKeysInFixedSizePool(
     const size_t row, const Columns & key_columns) const
 {

dbms/src/Dictionaries/DictionaryBlockInputStream.h

@@ -19,7 +19,7 @@ namespace DB
  * BlockInputStream implementation for external dictionaries
  * read() returns single block consisting of the in-memory contents of the dictionaries
  */
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
 class DictionaryBlockInputStream : public DictionaryBlockInputStreamBase
 {
 public:
@@ -51,13 +51,13 @@ protected:
 private:
     // pointer types to getXXX functions
     // for single key dictionaries
-    template <class Type>
+    template <typename Type>
     using DictionaryGetter = void (DictionaryType::*)(
                                  const std::string &, const PaddedPODArray<Key> &, PaddedPODArray<Type> &) const;
     using DictionaryStringGetter = void (DictionaryType::*)(
                                        const std::string &, const PaddedPODArray<Key> &, ColumnString *) const;
     // for complex complex key dictionaries
-    template <class Type>
+    template <typename Type>
     using GetterByKey = void (DictionaryType::*)(
                             const std::string &, const Columns &, const DataTypes &, PaddedPODArray<Type> & out) const;
     using StringGetterByKey = void (DictionaryType::*)(
@@ -65,34 +65,34 @@ private:
 
     // call getXXX
     // for single key dictionaries
-    template <class Type, class Container>
+    template <typename Type, typename Container>
     void callGetter(DictionaryGetter<Type> getter, const PaddedPODArray<Key> & ids,
                     const Columns & keys, const DataTypes & data_types,
                     Container & container, const DictionaryAttribute & attribute, const DictionaryType & dictionary) const;
-    template <class Container>
+    template <typename Container>
     void callGetter(DictionaryStringGetter getter, const PaddedPODArray<Key> & ids,
                     const Columns & keys, const DataTypes & data_types,
                     Container & container, const DictionaryAttribute & attribute, const DictionaryType & dictionary) const;
     // for complex complex key dictionaries
-    template <class Type, class Container>
+    template <typename Type, typename Container>
     void callGetter(GetterByKey<Type> getter, const PaddedPODArray<Key> & ids,
                     const Columns & keys, const DataTypes & data_types,
                     Container & container, const DictionaryAttribute & attribute, const DictionaryType & dictionary) const;
-    template <class Container>
+    template <typename Container>
     void callGetter(StringGetterByKey getter, const PaddedPODArray<Key> & ids,
                     const Columns & keys, const DataTypes & data_types,
                     Container & container, const DictionaryAttribute & attribute, const DictionaryType & dictionary) const;
 
-    template <template <class> class Getter, class StringGetter>
+    template <template <typename> class Getter, typename StringGetter>
     Block fillBlock(const PaddedPODArray<Key> & ids, const Columns & keys,
                     const DataTypes & types, ColumnsWithTypeAndName && view) const;
 
 
-    template <class AttributeType, class Getter>
+    template <typename AttributeType, typename Getter>
     ColumnPtr getColumnFromAttribute(Getter getter, const PaddedPODArray<Key> & ids,
                                      const Columns & keys, const DataTypes & data_types,
                                      const DictionaryAttribute & attribute, const DictionaryType & dictionary) const;
-    template <class Getter>
+    template <typename Getter>
     ColumnPtr getColumnFromStringAttribute(Getter getter, const PaddedPODArray<Key> & ids,
                                            const Columns & keys, const DataTypes & data_types,
                                            const DictionaryAttribute& attribute, const DictionaryType& dictionary) const;
@@ -115,7 +115,7 @@ private:
     GetColumnsFunction get_view_columns_function;
 };
 
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
 DictionaryBlockInputStream<DictionaryType, Key>::DictionaryBlockInputStream(
     std::shared_ptr<const IDictionaryBase> dictionary, size_t max_block_size,
     PaddedPODArray<Key> && ids, const Names& column_names)
@@ -127,7 +127,7 @@ DictionaryBlockInputStream<DictionaryType, Key>::DictionaryBlockInputStream(
 {
 }
 
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
 DictionaryBlockInputStream<DictionaryType, Key>::DictionaryBlockInputStream(
     std::shared_ptr<const IDictionaryBase> dictionary, size_t max_block_size,
     const std::vector<StringRef> & keys, const Names& column_names)
@@ -140,7 +140,7 @@ DictionaryBlockInputStream<DictionaryType, Key>::DictionaryBlockInputStream(
     fillKeyColumns(keys, 0, keys.size(), dictionaty_structure, key_columns);
 }
 
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
 DictionaryBlockInputStream<DictionaryType, Key>::DictionaryBlockInputStream(
     std::shared_ptr<const IDictionaryBase> dictionary, size_t max_block_size,
     const Columns & data_columns, const Names & column_names,
@@ -155,7 +155,7 @@ DictionaryBlockInputStream<DictionaryType, Key>::DictionaryBlockInputStream(
 {
 }
 
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
 Block DictionaryBlockInputStream<DictionaryType, Key>::getBlock(size_t start, size_t length) const
 {
     if (!key_columns.empty())
@@ -197,8 +197,8 @@ Block DictionaryBlockInputStream<DictionaryType, Key>::getBlock(size_t start, si
     }
 }
 
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
-template <class Type, class Container>
+template <typename Type, typename Container>
 void DictionaryBlockInputStream<DictionaryType, Key>::callGetter(
     DictionaryGetter<Type> getter, const PaddedPODArray<Key> & ids,
     const Columns & keys, const DataTypes & data_types,
@@ -207,8 +207,8 @@ void DictionaryBlockInputStream<DictionaryType, Key>::callGetter(
     (dictionary.*getter)(attribute.name, ids, container);
 }
 
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
-template <class Container>
+template <typename Container>
 void DictionaryBlockInputStream<DictionaryType, Key>::callGetter(
     DictionaryStringGetter getter, const PaddedPODArray<Key> & ids,
     const Columns & keys, const DataTypes & data_types,
@@ -217,8 +217,8 @@ void DictionaryBlockInputStream<DictionaryType, Key>::callGetter(
     (dictionary.*getter)(attribute.name, ids, container);
 }
 
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
-template <class Type, class Container>
+template <typename Type, typename Container>
 void DictionaryBlockInputStream<DictionaryType, Key>::callGetter(
     GetterByKey<Type> getter, const PaddedPODArray<Key> & ids,
     const Columns & keys, const DataTypes & data_types,
@@ -227,8 +227,8 @@ void DictionaryBlockInputStream<DictionaryType, Key>::callGetter(
     (dictionary.*getter)(attribute.name, keys, data_types, container);
 }
 
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
-template <class Container>
+template <typename Container>
 void DictionaryBlockInputStream<DictionaryType, Key>::callGetter(
     StringGetterByKey getter, const PaddedPODArray<Key> & ids,
     const Columns & keys, const DataTypes & data_types,
@@ -237,8 +237,8 @@ void DictionaryBlockInputStream<DictionaryType, Key>::callGetter(
     (dictionary.*getter)(attribute.name, keys, data_types, container);
 }
 
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
-template <template <class> class Getter, class StringGetter>
+template <template <typename> class Getter, typename StringGetter>
 Block DictionaryBlockInputStream<DictionaryType, Key>::fillBlock(
     const PaddedPODArray<Key>& ids, const Columns& keys, const DataTypes & types, ColumnsWithTypeAndName && view) const
 {
@@ -317,8 +317,8 @@ Block DictionaryBlockInputStream<DictionaryType, Key>::fillBlock(
     return Block(block_columns);
 }
 
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
-template <class AttributeType, class Getter>
+template <typename AttributeType, typename Getter>
 ColumnPtr DictionaryBlockInputStream<DictionaryType, Key>::getColumnFromAttribute(
     Getter getter, const PaddedPODArray<Key> & ids,
     const Columns & keys, const DataTypes & data_types,
@@ -332,8 +332,8 @@ ColumnPtr DictionaryBlockInputStream<DictionaryType, Key>::getColumnFromAttribut
     return ColumnPtr(std::move(column_vector));
 }
 
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
-template <class Getter>
+template <typename Getter>
 ColumnPtr DictionaryBlockInputStream<DictionaryType, Key>::getColumnFromStringAttribute(
     Getter getter, const PaddedPODArray<Key> & ids,
     const Columns & keys, const DataTypes & data_types,
@@ -345,7 +345,7 @@ ColumnPtr DictionaryBlockInputStream<DictionaryType, Key>::getColumnFromStringAt
     return column_string;
 }
 
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
 ColumnPtr DictionaryBlockInputStream<DictionaryType, Key>::getColumnFromIds(const PaddedPODArray<Key>& ids) const
 {
     auto column_vector = std::make_shared<ColumnVector<UInt64>>();
@@ -357,7 +357,7 @@ ColumnPtr DictionaryBlockInputStream<DictionaryType, Key>::getColumnFromIds(cons
     return column_vector;
 }
 
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
 void DictionaryBlockInputStream<DictionaryType, Key>::fillKeyColumns(
     const std::vector<StringRef> & keys, size_t start, size_t size,
     const DictionaryStructure& dictionary_structure, ColumnsWithTypeAndName & columns) const

dbms/src/Dictionaries/RangeDictionaryBlockInputStream.h

@@ -17,7 +17,7 @@ namespace DB
  * BlockInputStream implementation for external dictionaries
  * read() returns single block consisting of the in-memory contents of the dictionaries
  */
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
 class RangeDictionaryBlockInputStream : public DictionaryBlockInputStreamBase
 {
 public:
@@ -35,20 +35,20 @@ protected:
     Block getBlock(size_t start, size_t length) const override;
 
 private:
-    template <class Type>
+    template <typename Type>
     using DictionaryGetter = void (DictionaryType::*)(const std::string &, const PaddedPODArray<Key> &,
                              const PaddedPODArray<UInt16> &, PaddedPODArray<Type> &) const;
 
-    template <class AttributeType>
+    template <typename AttributeType>
     ColumnPtr getColumnFromAttribute(DictionaryGetter<AttributeType> getter,
                                      const PaddedPODArray<Key>& ids, const PaddedPODArray<UInt16> & dates,
                                      const DictionaryAttribute& attribute, const DictionaryType& dictionary) const;
     ColumnPtr getColumnFromAttributeString(const PaddedPODArray<Key>& ids, const PaddedPODArray<UInt16> & dates,
                                            const DictionaryAttribute& attribute, const DictionaryType& dictionary) const;
-    template <class T>
+    template <typename T>
     ColumnPtr getColumnFromPODArray(const PaddedPODArray<T>& array) const;
 
-    template <class T>
+    template <typename T>
     void addSpecialColumn(
         const std::experimental::optional<DictionarySpecialAttribute>& attribute, DataTypePtr type,
         const std::string & default_name, const std::unordered_set<std::string> & column_names,
@@ -65,7 +65,7 @@ private:
 };
 
 
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
 RangeDictionaryBlockInputStream<DictionaryType, Key>::RangeDictionaryBlockInputStream(
     DictionatyPtr dictionary, size_t max_column_size, const Names & column_names, PaddedPODArray<Key> && ids,
     PaddedPODArray<UInt16> && start_dates, PaddedPODArray<UInt16> && end_dates)
@@ -75,7 +75,7 @@ RangeDictionaryBlockInputStream<DictionaryType, Key>::RangeDictionaryBlockInputS
 {
 }
 
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
 Block RangeDictionaryBlockInputStream<DictionaryType, Key>::getBlock(size_t start, size_t length) const
 {
     PaddedPODArray<Key> block_ids;
@@ -95,8 +95,8 @@ Block RangeDictionaryBlockInputStream<DictionaryType, Key>::getBlock(size_t star
     return fillBlock(block_ids, block_start_dates, block_end_dates);
 }
 
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
-template <class AttributeType>
+template <typename AttributeType>
 ColumnPtr RangeDictionaryBlockInputStream<DictionaryType, Key>::getColumnFromAttribute(
     DictionaryGetter<AttributeType> getter, const PaddedPODArray<Key>& ids,
     const PaddedPODArray<UInt16> & dates, const DictionaryAttribute& attribute, const DictionaryType& dictionary) const
@@ -106,7 +106,7 @@ ColumnPtr RangeDictionaryBlockInputStream<DictionaryType, Key>::getColumnFromAtt
     return ColumnPtr(std::move(column_vector));
 }
 
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
 ColumnPtr RangeDictionaryBlockInputStream<DictionaryType, Key>::getColumnFromAttributeString(
     const PaddedPODArray<Key>& ids, const PaddedPODArray<UInt16> & dates,
     const DictionaryAttribute& attribute, const DictionaryType& dictionary) const
@@ -116,8 +116,8 @@ ColumnPtr RangeDictionaryBlockInputStream<DictionaryType, Key>::getColumnFromAtt
     return ColumnPtr(std::move(column_string));
 }
 
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
-template <class T>
+template <typename T>
 ColumnPtr RangeDictionaryBlockInputStream<DictionaryType, Key>::getColumnFromPODArray(const PaddedPODArray<T>& array) const
 {
     auto column_vector = std::make_unique<ColumnVector<T>>();
@@ -130,8 +130,8 @@ ColumnPtr RangeDictionaryBlockInputStream<DictionaryType, Key>::getColumnFromPOD
 }
 
 
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
-template <class T>
+template <typename T>
 void RangeDictionaryBlockInputStream<DictionaryType, Key>::addSpecialColumn(
     const std::experimental::optional<DictionarySpecialAttribute> & attribute, DataTypePtr type,
     const std::string& default_name, const std::unordered_set<std::string> & column_names,
@@ -146,7 +146,7 @@ void RangeDictionaryBlockInputStream<DictionaryType, Key>::addSpecialColumn(
     }
 }
 
-template <class DictionaryType, class Key>
+template <typename DictionaryType, typename Key>
 Block RangeDictionaryBlockInputStream<DictionaryType, Key>::fillBlock(
     const PaddedPODArray<Key>& ids,
     const PaddedPODArray<UInt16> & start_dates, const PaddedPODArray<UInt16> & end_dates) const

dbms/src/Functions/FunctionsArithmetic.h

@@ -38,21 +38,21 @@ struct BinaryOperationImplBase
 {
     using ResultType = ResultType_;
 
-    static void vector_vector(const PaddedPODArray<A> & a, const PaddedPODArray<B> & b, PaddedPODArray<ResultType> & c)
+    static void NO_INLINE vector_vector(const PaddedPODArray<A> & a, const PaddedPODArray<B> & b, PaddedPODArray<ResultType> & c)
     {
         size_t size = a.size();
         for (size_t i = 0; i < size; ++i)
             c[i] = Op::template apply<ResultType>(a[i], b[i]);
     }
 
-    static void vector_constant(const PaddedPODArray<A> & a, B b, PaddedPODArray<ResultType> & c)
+    static void NO_INLINE vector_constant(const PaddedPODArray<A> & a, B b, PaddedPODArray<ResultType> & c)
     {
         size_t size = a.size();
         for (size_t i = 0; i < size; ++i)
             c[i] = Op::template apply<ResultType>(a[i], b);
     }
 
-    static void constant_vector(A a, const PaddedPODArray<B> & b, PaddedPODArray<ResultType> & c)
+    static void NO_INLINE constant_vector(A a, const PaddedPODArray<B> & b, PaddedPODArray<ResultType> & c)
     {
         size_t size = b.size();
         for (size_t i = 0; i < size; ++i)
@@ -76,7 +76,7 @@ struct UnaryOperationImpl
 {
     using ResultType = typename Op::ResultType;
 
-    static void vector(const PaddedPODArray<A> & a, PaddedPODArray<ResultType> & c)
+    static void NO_INLINE vector(const PaddedPODArray<A> & a, PaddedPODArray<ResultType> & c)
     {
         size_t size = a.size();
         for (size_t i = 0; i < size; ++i)

dbms/src/Functions/FunctionsComparison.h

@@ -90,7 +90,7 @@ template <typename A, typename B> struct GreaterOrEqualsOp
 };
 
 
-template<typename A, typename B, typename Op>
+template <typename A, typename B, typename Op>
 struct NumComparisonImpl
 {
     /// If you don't specify NO_INLINE, the compiler will inline this function, but we don't need this as this function contains tight loop inside.

dbms/src/Functions/FunctionsConversion.h

@@ -705,7 +705,7 @@ private:
         }
     }
 
-    template<typename ToDataType2 = ToDataType, typename Name2 = Name>
+    template <typename ToDataType2 = ToDataType, typename Name2 = Name>
     DataTypePtr getReturnTypeInternal(const DataTypes & arguments,
         typename std::enable_if<!(std::is_same<ToDataType2, DataTypeString>::value ||
             std::is_same<Name2, NameToUnixTimestamp>::value ||
@@ -721,7 +721,7 @@ private:
 
     /** Conversion of anything to String. For DateTime, it allows second optional argument - time zone.
       */
-    template<typename ToDataType2 = ToDataType, typename Name2 = Name>
+    template <typename ToDataType2 = ToDataType, typename Name2 = Name>
     DataTypePtr getReturnTypeInternal(const DataTypes & arguments,
         typename std::enable_if<std::is_same<ToDataType2, DataTypeString>::value>::type * = nullptr) const
     {
@@ -747,7 +747,7 @@ private:
         return std::make_shared<ToDataType2>();
     }
 
-    template<typename ToDataType2 = ToDataType, typename Name2 = Name>
+    template <typename ToDataType2 = ToDataType, typename Name2 = Name>
     DataTypePtr getReturnTypeInternal(const DataTypes & arguments,
         typename std::enable_if<std::is_same<Name2, NameToUnixTimestamp>::value, void>::type * = nullptr) const
     {
@@ -773,7 +773,7 @@ private:
         return std::make_shared<ToDataType2>();
     }
 
-    template<typename ToDataType2 = ToDataType, typename Name2 = Name>
+    template <typename ToDataType2 = ToDataType, typename Name2 = Name>
     DataTypePtr getReturnTypeInternal(const DataTypes & arguments,
         typename std::enable_if<std::is_same<Name2, NameToDate>::value>::type * = nullptr) const
     {

dbms/src/Functions/FunctionsDateTime.h

@@ -466,7 +466,7 @@ struct ToYYYYMMDDhhmmssImpl
 };
 
 
-template<typename FromType, typename ToType, typename Transform>
+template <typename FromType, typename ToType, typename Transform>
 struct Transformer
 {
     static void vector(const PaddedPODArray<FromType> & vec_from, PaddedPODArray<ToType> & vec_to, const DateLUTImpl & time_zone)

dbms/src/Functions/FunctionsFindCluster.h

@@ -167,7 +167,7 @@ protected:
 
     // Match the type of the centrods array and convert them to Float64, because we
     // don't want to have problems calculating negative distances of UInts
-    template<typename CentroidsType>
+    template <typename CentroidsType>
     bool fillCentroids(const IColumn * centroids_array_untyped, std::vector<Float64> & centroids)
     {
         const ColumnConst * const_centroids_array = checkAndGetColumnConst<ColumnVector<Array>>(centroids_array_untyped);
@@ -191,7 +191,7 @@ protected:
         return true;
     }
 
-    template<typename CentroidsType, typename OutputType>
+    template <typename CentroidsType, typename OutputType>
     bool executeOperation(const IColumn * in_untyped, IColumn * out_untyped, const IColumn * centroids_array_untyped)
     {
         // Match the type of the output
@@ -220,7 +220,7 @@ protected:
         return true;
     }
 
-    template<typename InputType, typename OutputType, typename CentroidsType>
+    template <typename InputType, typename OutputType, typename CentroidsType>
     bool executeOperationTyped(const IColumn * in_untyped, PaddedPODArray<OutputType> & dst, const IColumn * centroids_array_untyped)
     {
         const auto maybe_const = in_untyped->convertToFullColumnIfConst();

dbms/src/Functions/FunctionsHigherOrder.h

@@ -331,7 +331,7 @@ struct ArraySumImpl
         throw Exception("arraySum cannot add values of type " + expression_return->getName(), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
     }
 
-    template <class Element, class Result>
+    template <typename Element, typename Result>
     static bool executeType(const ColumnPtr & mapped, const ColumnArray::Offsets_t & offsets, ColumnPtr & res_ptr)
     {
         const ColumnVector<Element> * column = checkAndGetColumn<ColumnVector<Element>>(&*mapped);

dbms/src/Functions/FunctionsLogical.h

@@ -24,7 +24,7 @@ namespace ErrorCodes
   * Accept any numeric types, return a UInt8 containing 0 or 1.
   */
 
-template<typename B>
+template <typename B>
 struct AndImpl
 {
     static inline bool isSaturable()
@@ -43,7 +43,7 @@ struct AndImpl
     }
 };
 
-template<typename B>
+template <typename B>
 struct OrImpl
 {
     static inline bool isSaturable()
@@ -62,7 +62,7 @@ struct OrImpl
     }
 };
 
-template<typename B>
+template <typename B>
 struct XorImpl
 {
     static inline bool isSaturable()
@@ -81,7 +81,7 @@ struct XorImpl
     }
 };
 
-template<typename A>
+template <typename A>
 struct NotImpl
 {
     using ResultType = UInt8;
@@ -101,7 +101,7 @@ template <typename Op, size_t N>
 struct AssociativeOperationImpl
 {
     /// Erases the N last columns from `in` (if there are less, then all) and puts into `result` their combination.
-    static void execute(UInt8ColumnPtrs & in, UInt8Container & result)
+    static void NO_INLINE execute(UInt8ColumnPtrs & in, UInt8Container & result)
     {
         if (N > in.size())
         {

dbms/src/Functions/FunctionsReinterpret.h

@@ -27,7 +27,7 @@ namespace ErrorCodes
   */
 
 
-template<typename Name>
+template <typename Name>
 class FunctionReinterpretAsStringImpl : public IFunction
 {
 public:
@@ -52,7 +52,7 @@ public:
         return std::make_shared<DataTypeString>();
     }
 
-    template<typename T>
+    template <typename T>
     bool executeType(Block & block, const ColumnNumbers & arguments, size_t result)
     {
         if (auto col_from = checkAndGetColumn<ColumnVector<T>>(block.getByPosition(arguments[0]).column.get()))
@@ -112,7 +112,7 @@ public:
 };
 
 
-template<typename ToDataType, typename Name>
+template <typename ToDataType, typename Name>
 class FunctionReinterpretStringAs : public IFunction
 {
 public:

dbms/src/Functions/FunctionsRound.cpp

@@ -9,9 +9,15 @@ void registerFunctionsRound(FunctionFactory & factory)
     factory.registerFunction<FunctionRoundToExp2>();
     factory.registerFunction<FunctionRoundDuration>();
     factory.registerFunction<FunctionRoundAge>();
-    factory.registerFunction<FunctionRound>();
+
-    factory.registerFunction<FunctionCeil>();
+    factory.registerFunction("round", FunctionRound::create, FunctionFactory::CaseInsensitive);
-    factory.registerFunction<FunctionFloor>();
+    factory.registerFunction("floor", FunctionFloor::create, FunctionFactory::CaseInsensitive);
+    factory.registerFunction("ceil", FunctionCeil::create, FunctionFactory::CaseInsensitive);
+    factory.registerFunction("trunc", FunctionTrunc::create, FunctionFactory::CaseInsensitive);
+
+    /// Compatibility aliases.
+    factory.registerFunction("ceiling", FunctionCeil::create, FunctionFactory::CaseInsensitive);
+    factory.registerFunction("truncate", FunctionTrunc::create, FunctionFactory::CaseInsensitive);
 }
 
 }

dbms/src/Functions/FunctionsString.cpp

@@ -705,7 +705,7 @@ public:
 
     void executeImpl(Block & block, const ColumnNumbers & arguments, const size_t result) override
     {
-        if (!is_injective && !arguments.empty() && checkDataType<DataTypeArray>(block.getByPosition(0).type.get()))
+        if (!is_injective && !arguments.empty() && checkDataType<DataTypeArray>(block.getByPosition(arguments[0]).type.get()))
             return FunctionArrayConcat().executeImpl(block, arguments, result);
 
         if (arguments.size() == 2)

dbms/src/Functions/FunctionsVisitParam.h

@@ -49,7 +49,7 @@ struct HasParam
     }
 };
 
-template<typename NumericType>
+template <typename NumericType>
 struct ExtractNumericType
 {
     using ResultType = NumericType;
@@ -239,7 +239,7 @@ struct ExtractParamImpl
 
 /** For the case where the type of field to extract is a string.
  */
-template<typename ParamExtractor>
+template <typename ParamExtractor>
 struct ExtractParamToStringImpl
 {
     static void vector(const ColumnString::Chars_t & data, const ColumnString::Offsets_t & offsets,

dbms/src/Functions/tests/logical_functions_performance.cpp

@@ -18,7 +18,7 @@ namespace ErrorCodes
 }
 
 
-template<typename B>
+template <typename B>
 struct AndImpl
 {
     static inline UInt8 apply(UInt8 a, B b)
@@ -27,7 +27,7 @@ struct AndImpl
     }
 };
 
-template<typename B>
+template <typename B>
 struct OrImpl
 {
     static inline UInt8 apply(UInt8 a, B b)
@@ -36,7 +36,7 @@ struct OrImpl
     }
 };
 
-template<typename B>
+template <typename B>
 struct XorImpl
 {
     static inline UInt8 apply(UInt8 a, B b)

dbms/src/IO/HashingWriteBuffer.cpp

@@ -7,7 +7,7 @@ namespace DB
 
 /// computation of the hash depends on the partitioning of blocks
 /// so you need to compute a hash of n complete pieces and one incomplete
-template <class Buffer>
+template <typename Buffer>
 void IHashingBuffer<Buffer>::calculateHash(DB::BufferBase::Position data, size_t len)
 {
     if (len)

dbms/src/IO/HashingWriteBuffer.h

@@ -11,7 +11,7 @@
 namespace DB
 {
 
-template <class Buffer>
+template <typename Buffer>
 class IHashingBuffer : public BufferWithOwnMemory<Buffer>
 {
 public:

dbms/src/IO/ReadHelpers.cpp

@@ -19,7 +19,7 @@ namespace ErrorCodes
     extern const int INCORRECT_DATA;
 }
 
-template <class IteratorSrc, class IteratorDst>
+template <typename IteratorSrc, typename IteratorDst>
 void parseHex(IteratorSrc src, IteratorDst dst, const size_t num_bytes)
 {
     size_t src_pos = 0;

dbms/src/IO/ReadHelpers.h

@@ -344,14 +344,14 @@ void readIntTextUnsafe(T & x, ReadBuffer & buf)
         x = -x;
 }
 
-template<typename T>
+template <typename T>
 void tryReadIntTextUnsafe(T & x, ReadBuffer & buf)
 {
     return readIntTextUnsafe<T, false>(x, buf);
 }
 
 
-template <bool throw_exception, class ExcepFun, class NoExcepFun, class... Args>
+template <bool throw_exception, typename ExcepFun, typename NoExcepFun, typename... Args>
 bool exceptionPolicySelector(ExcepFun && excep_f, NoExcepFun && no_excep_f, Args &&... args)
 {
     if (throw_exception)
@@ -482,13 +482,13 @@ ReturnType readFloatTextImpl(T & x, ReadBuffer & buf)
     return ReturnType(true);
 }
 
-template <class T>
+template <typename T>
 inline bool tryReadFloatText(T & x, ReadBuffer & buf)
 {
     return readFloatTextImpl<T, bool>(x, buf);
 }
 
-template <class T>
+template <typename T>
 inline void readFloatText(T & x, ReadBuffer & buf)
 {
     readFloatTextImpl<T, void>(x, buf);
@@ -569,7 +569,7 @@ struct NullSink
 void parseUUID(const UInt8 * src36, UInt8 * dst16);
 void parseUUID(const UInt8 * src36, std::reverse_iterator<UInt8 *> dst16);
 
-template<class IteratorSrc, class IteratorDst>
+template <typename IteratorSrc, typename IteratorDst>
 void formatHex(IteratorSrc src, IteratorDst dst, const size_t num_bytes);
 
 /// In YYYY-MM-DD format

dbms/src/Interpreters/Aggregator.cpp

@@ -223,6 +223,7 @@ void Aggregator::compileIfPossible(AggregatedDataVariants::Type type)
 
     /// List of types of aggregate functions.
     std::stringstream aggregate_functions_typenames_str;
+    std::stringstream aggregate_functions_headers_args;
     for (size_t i = 0; i < params.aggregates_size; ++i)
     {
         IAggregateFunction & func = *aggregate_functions[i];
@@ -237,8 +238,21 @@ void Aggregator::compileIfPossible(AggregatedDataVariants::Type type)
                 + ", status: " + toString(status), ErrorCodes::CANNOT_COMPILE_CODE);
 
         aggregate_functions_typenames_str << ((i != 0) ? ", " : "") << type_name;
+
+        std::string header_path = func.getHeaderFilePath();
+        auto pos = header_path.find("/AggregateFunctions/");
+
+        if (pos == std::string::npos)
+            throw Exception("Cannot compile code: unusual path of header file for aggregate function: " + header_path,
+                ErrorCodes::CANNOT_COMPILE_CODE);
+
+        aggregate_functions_headers_args << "-include '" INTERNAL_COMPILER_HEADERS "/dbms/src";
+        aggregate_functions_headers_args.write(&header_path[pos], header_path.size() - pos);
+        aggregate_functions_headers_args << "' ";
     }
 
+    aggregate_functions_headers_args << "-include '" INTERNAL_COMPILER_HEADERS "/dbms/src/Interpreters/SpecializedAggregator.h'";
+
     std::string aggregate_functions_typenames = aggregate_functions_typenames_str.str();
 
     std::stringstream key_str;
@@ -355,9 +369,9 @@ void Aggregator::compileIfPossible(AggregatedDataVariants::Type type)
       * If the counter has reached the value min_count_to_compile, then the compilation starts asynchronously (in a separate thread)
       *  at the end of which `on_ready` callback is called.
       */
+    aggregate_functions_headers_args << " -Wno-unused-function";
     SharedLibraryPtr lib = params.compiler->getOrCount(key, params.min_count_to_compile,
-        "-include " INTERNAL_COMPILER_HEADERS "/dbms/src/Interpreters/SpecializedAggregator.h "
+        aggregate_functions_headers_args.str(),
-        "-Wno-unused-function",
         get_code, on_ready);
 
     /// If the result is already ready.

dbms/src/Interpreters/Compiler.cpp

@@ -215,7 +215,7 @@ void Compiler::compile(
 
     std::stringstream command;
 
-    /// Slightly uncomfortable.
+    /// Slightly unconvenient.
     command <<
         "LD_LIBRARY_PATH=" PATH_SHARE "/clickhouse/bin/"
         " " INTERNAL_COMPILER_EXECUTABLE
@@ -231,6 +231,7 @@ void Compiler::compile(
 #endif
         " -I " INTERNAL_COMPILER_HEADERS "/dbms/src/"
         " -I " INTERNAL_COMPILER_HEADERS "/contrib/libcityhash/include/"
+        " -I " INTERNAL_COMPILER_HEADERS "/contrib/libpcg-random/include/"
         " -I " INTERNAL_DOUBLE_CONVERSION_INCLUDE_DIR
         " -I " INTERNAL_Poco_Foundation_INCLUDE_DIR
         " -I " INTERNAL_Boost_INCLUDE_DIRS

dbms/src/Interpreters/SpecializedAggregator.h

@@ -1,39 +1,14 @@
 #include <Common/TypeList.h>
+#include <Common/typeid_cast.h>
 #include <Interpreters/Aggregator.h>
 
-#include <AggregateFunctions/AggregateFunctionArgMinMax.h>
-#include <AggregateFunctions/AggregateFunctionArray.h>
-#include <AggregateFunctions/AggregateFunctionAvg.h>
-#include <AggregateFunctions/AggregateFunctionCount.h>
-#include <AggregateFunctions/AggregateFunctionForEach.h>
-#include <AggregateFunctions/AggregateFunctionGroupArray.h>
-#include <AggregateFunctions/AggregateFunctionGroupArrayInsertAt.h>
-#include <AggregateFunctions/AggregateFunctionGroupUniqArray.h>
-#include <AggregateFunctions/AggregateFunctionIf.h>
-#include <AggregateFunctions/AggregateFunctionMerge.h>
-#include <AggregateFunctions/AggregateFunctionMinMaxAny.h>
-#include <AggregateFunctions/AggregateFunctionNull.h>
-#include <AggregateFunctions/AggregateFunctionQuantileDeterministic.h>
-#include <AggregateFunctions/AggregateFunctionQuantileExact.h>
-#include <AggregateFunctions/AggregateFunctionQuantileExactWeighted.h>
-#include <AggregateFunctions/AggregateFunctionQuantile.h>
-#include <AggregateFunctions/AggregateFunctionQuantileTDigest.h>
-#include <AggregateFunctions/AggregateFunctionQuantileTiming.h>
-#include <AggregateFunctions/AggregateFunctionSequenceMatch.h>
-#include <AggregateFunctions/AggregateFunctionState.h>
-#include <AggregateFunctions/AggregateFunctionStatistics.h>
-#include <AggregateFunctions/AggregateFunctionSum.h>
-#include <AggregateFunctions/AggregateFunctionTopK.h>
-#include <AggregateFunctions/AggregateFunctionUniq.h>
-#include <AggregateFunctions/AggregateFunctionUniqUpTo.h>
-
 
 namespace DB
 {
 
 
-/** An aggregation cycle template that allows you to generate a custom variant for a specific combination of aggregate functions.
+/** An aggregation loop template that allows you to generate a custom variant for a specific combination of aggregate functions.
-  * It differs from the usual one in that calls to aggregate functions should be inlined, and the update cycle of the aggregate functions should be unfold.
+  * It differs from the usual one in that calls to aggregate functions should be inlined, and the update loop of the aggregate functions should be unrolled.
   *
   * Since there are too many possible combinations, it is not possible to generate them all in advance.
   * This template is intended to instantiate it in runtime,
@@ -263,8 +238,8 @@ void NO_INLINE Aggregator::executeSpecializedWithoutKey(
 }
 
 
-/** The main code is compiled with gcc 5.
+/** The main code is compiled with gcc 7.
-  * But SpecializedAggregator is compiled using clang 3.6 into the .so file.
+  * But SpecializedAggregator is compiled using clang 6 into the .so file.
   * This is done because gcc can not get functions inlined,
   *  which were de-virtualized, in a particular case, and the performance is lower.
   * And also it's easier to distribute clang for deploy to the servers.

dbms/src/Parsers/ASTSystemQuery.h

@@ -1,6 +1,6 @@
 #pragma once
+
 #include <Parsers/IAST.h>
-#include <AggregateFunctions/AggregateFunctionCount.h>
 
 
 namespace DB

dbms/src/Parsers/ParserCreateQuery.h

@@ -56,7 +56,7 @@ protected:
 };
 
 
-template <class NameParser>
+template <typename NameParser>
 class IParserNameTypePair : public IParserBase
 {
 protected:
@@ -69,7 +69,7 @@ using ParserNameTypePair = IParserNameTypePair<ParserIdentifier>;
 /** Name and type separated by a space. The name can contain a dot. For example, Hits.URL String. */
 using ParserCompoundNameTypePair = IParserNameTypePair<ParserCompoundIdentifier>;
 
-template <class NameParser>
+template <typename NameParser>
 bool IParserNameTypePair<NameParser>::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     NameParser name_parser;
@@ -101,7 +101,7 @@ protected:
 };
 
 
-template <class NameParser>
+template <typename NameParser>
 class IParserColumnDeclaration : public IParserBase
 {
 protected:
@@ -112,7 +112,7 @@ protected:
 using ParserColumnDeclaration = IParserColumnDeclaration<ParserIdentifier>;
 using ParserCompoundColumnDeclaration = IParserColumnDeclaration<ParserCompoundIdentifier>;
 
-template <class NameParser>
+template <typename NameParser>
 bool IParserColumnDeclaration<NameParser>::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     NameParser name_parser;

dbms/src/Storages/ColumnDefault.h

@@ -21,7 +21,7 @@ enum class ColumnDefaultType
 
 namespace std
 {
-    template<> struct hash<DB::ColumnDefaultType>
+    template <> struct hash<DB::ColumnDefaultType>
     {
         size_t operator()(const DB::ColumnDefaultType type) const
         {

dbms/src/Storages/MarkCache.h

@@ -53,7 +53,7 @@ public:
         return key;
     }
 
-    template<typename LoadFunc>
+    template <typename LoadFunc>
     MappedPtr getOrSet(const Key & key, LoadFunc && load)
     {
         auto result = Base::getOrSet(key, load);