diff --git a/dbms/src/Functions/FunctionsHigherOrder.h b/dbms/src/Functions/FunctionsHigherOrder.h index dde39a63924..a3a51a66238 100644 --- a/dbms/src/Functions/FunctionsHigherOrder.h +++ b/dbms/src/Functions/FunctionsHigherOrder.h @@ -885,16 +885,16 @@ public: }; -struct NameArrayMap { static constexpr auto name = "arrayMap"; }; -struct NameArrayFilter { static constexpr auto name = "arrayFilter"; }; -struct NameArrayCount { static constexpr auto name = "arrayCount"; }; -struct NameArrayExists { static constexpr auto name = "arrayExists"; }; -struct NameArrayAll { static constexpr auto name = "arrayAll"; }; -struct NameArraySum { static constexpr auto name = "arraySum"; }; -struct NameArrayFirst { static constexpr auto name = "arrayFirst"; }; -struct NameArrayFirstIndex { static constexpr auto name = "arrayFirstIndex"; }; +struct NameArrayMap { static constexpr auto name = "arrayMap"; }; +struct NameArrayFilter { static constexpr auto name = "arrayFilter"; }; +struct NameArrayCount { static constexpr auto name = "arrayCount"; }; +struct NameArrayExists { static constexpr auto name = "arrayExists"; }; +struct NameArrayAll { static constexpr auto name = "arrayAll"; }; +struct NameArraySum { static constexpr auto name = "arraySum"; }; +struct NameArrayFirst { static constexpr auto name = "arrayFirst"; }; +struct NameArrayFirstIndex { static constexpr auto name = "arrayFirstIndex"; }; struct NameArraySort { static constexpr auto name = "arraySort"; }; -struct NameArrayReverseSort { static constexpr auto name = "arrayReverseSort"; }; +struct NameArrayReverseSort { static constexpr auto name = "arrayReverseSort"; }; using FunctionArrayMap = FunctionArrayMapped; using FunctionArrayFilter = FunctionArrayMapped; diff --git a/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp index 98cf45d91b4..2f65ece09d5 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp +++ b/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp @@ -1,22 +1,3 @@ -/// Compatibility with clang, in which std::numeric_limits (from libstdc++ from gcc) for some reason does not specialize for __uint128_t. -#if __clang__ && __clang_major__ < 4 - #include - - namespace std - { - template <> - struct numeric_limits<__uint128_t> - { - static constexpr bool is_specialized = true; - static constexpr bool is_signed = false; - static constexpr bool is_integer = true; - static constexpr int radix = 2; - static constexpr int digits = 8 * sizeof(char) * 2; - static constexpr __uint128_t min () { return 0; } // used in boost 1.65.1+ - }; - } -#endif - #include /// For calculations related to sampling coefficients. #include