Merge branch 'master' into enable_zero_copy_replication_in_ci

CMakeLists.txt

@@ -245,7 +245,8 @@ else ()
 endif ()
 
 # Create BuildID when using lld. For other linkers it is created by default.
-if (LINKER_NAME MATCHES "lld$")
+# (NOTE: LINKER_NAME can be either path or name, and in different variants)
+if (LINKER_NAME MATCHES "lld")
     # SHA1 is not cryptographically secure but it is the best what lld is offering.
     set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id=sha1")
 endif ()
@@ -600,6 +601,7 @@ if (NATIVE_BUILD_TARGETS
             "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
             "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
             "-DENABLE_CCACHE=${ENABLE_CCACHE}"
+            "-DENABLE_CLICKHOUSE_SELF_EXTRACTING=${ENABLE_CLICKHOUSE_SELF_EXTRACTING}"
         ${CMAKE_SOURCE_DIR}
         WORKING_DIRECTORY "${NATIVE_BUILD_DIR}"
         COMMAND_ECHO STDOUT)

docs/en/development/developer-instruction.md

@@ -285,9 +285,4 @@ If you are not interested in functionality provided by third-party libraries, yo
 -DENABLE_LIBRARIES=0 -DENABLE_EMBEDDED_COMPILER=0
 ```
 
-Compressing the binary at the end of the build may take a while, disable the self-extraction feature via
-```
--DENABLE_CLICKHOUSE_SELF_EXTRACTING=0
-```
-
 In case of problems with any of the development options, you are on your own!

programs/CMakeLists.txt

@@ -18,11 +18,10 @@ option (ENABLE_CLICKHOUSE_SERVER "Server mode (main mode)" ${ENABLE_CLICKHOUSE_A
 option (ENABLE_CLICKHOUSE_CLIENT "Client mode (interactive tui/shell that connects to the server)"
     ${ENABLE_CLICKHOUSE_ALL})
 
-if (SPLIT_SHARED_LIBRARIES)
-    # Don't create self-extracting clickhouse for split build
-    option (ENABLE_CLICKHOUSE_SELF_EXTRACTING "Self-extracting executable" OFF)
-else ()
-    option (ENABLE_CLICKHOUSE_SELF_EXTRACTING "Self-extracting executable" ON)
+# Don't create self-extracting clickhouse for split build
+if (ENABLE_CLICKHOUSE_SELF_EXTRACTING AND SPLIT_SHARED_LIBRARIES)
+    message (STATUS "Self-extracting on split build is not supported")
+    unset (ENABLE_CLICKHOUSE_SELF_EXTRACTING CACHE)
 endif ()
 
 # https://clickhouse.com/docs/en/operations/utilities/clickhouse-local/

programs/server/config.d/ext-en.txt

@@ -0,0 +1 @@
+../../../tests/config/ext-en.txt

programs/server/config.d/ext-ru.txt

@@ -0,0 +1 @@
+../../../tests/config/ext-ru.txt

programs/server/config.d/lem-en.bin

@@ -0,0 +1 @@
+../../../tests/config/lem-en.bin

programs/server/config.d/nlp.xml

@@ -4,19 +4,19 @@
         <extension>
             <name>en</name>
             <type>plain</type>
-            <path>/etc/clickhouse-server/dictionaries/ext-en.txt</path>
+            <path>config.d/ext-en.txt</path>
         </extension>
         <extension>
             <name>ru</name>
             <type>plain</type>
-            <path>/etc/clickhouse-server/dictionaries/ext-ru.txt</path>
+            <path>config.d/ext-ru.txt</path>
         </extension>
     </synonyms_extensions>
 
     <lemmatizers>
         <lemmatizer>
             <lang>en</lang>
-            <path>/etc/clickhouse-server/dictionaries/lem-en.bin</path>
+            <path>config.d/lem-en.bin</path>
         </lemmatizer>
     </lemmatizers>
 </clickhouse>

src/Common/Documentation.h

@@ -43,7 +43,7 @@ namespace DB
   * Documentation does not support multiple languages.
   * The only available language is English.
   */
-struct Doc
+struct Documentation
 {
     using Description = std::string;
     using ExampleName = std::string;
@@ -56,13 +56,13 @@ struct Doc
     Examples examples;
     Categories categories;
 
-    Doc(Description description_) : description(std::move(description_)) {}
-    Doc(Description description_, Examples examples_) : description(std::move(description_)), examples(std::move(examples_)) {}
-    Doc(Description description_, Examples examples_, Categories categories_)
+    Documentation(Description description_) : description(std::move(description_)) {}
+    Documentation(Description description_, Examples examples_) : description(std::move(description_)), examples(std::move(examples_)) {}
+    Documentation(Description description_, Examples examples_, Categories categories_)
         : description(std::move(description_)), examples(std::move(examples_)), categories(std::move(categories_)) {}
 
     /// TODO: Please remove this constructor. Documentation should always be non-empty.
-    Doc() {}
+    Documentation() {}
 };
 
 }

src/Dictionaries/DictionaryStructure.cpp

@@ -55,6 +55,7 @@ std::optional<AttributeUnderlyingType> tryGetAttributeUnderlyingType(TypeIndex i
 
     return magic_enum::enum_cast<AttributeUnderlyingType>(static_cast<TypeIndexUnderlying>(index));
 }
+
 }
 
 

src/Functions/CRC.cpp

@@ -140,7 +140,7 @@ using FunctionCRC64ECMA = FunctionCRC<CRC64ECMAImpl>;
 template <class T>
 void registerFunctionCRCImpl(FunctionFactory & factory)
 {
-    factory.registerFunction<T>(T::name, FunctionFactory::CaseInsensitive);
+    factory.registerFunction<T>(T::name, {}, FunctionFactory::CaseInsensitive);
 }
 
 REGISTER_FUNCTION(CRC)

src/Functions/CastOverloadResolver.cpp

@@ -7,10 +7,10 @@ namespace DB
 
 REGISTER_FUNCTION(CastOverloadResolvers)
 {
-    factory.registerFunction<CastInternalOverloadResolver<CastType::nonAccurate>>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<CastInternalOverloadResolver<CastType::nonAccurate>>({}, FunctionFactory::CaseInsensitive);
     /// Note: "internal" (not affected by null preserving setting) versions of accurate cast functions are unneeded.
 
-    factory.registerFunction<CastOverloadResolver<CastType::nonAccurate>>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<CastOverloadResolver<CastType::nonAccurate>>({}, FunctionFactory::CaseInsensitive);
     factory.registerFunction<CastOverloadResolver<CastType::accurate>>();
     factory.registerFunction<CastOverloadResolver<CastType::accurateOrNull>>();
 }

src/Functions/FunctionChar.cpp

@@ -115,7 +115,7 @@ private:
 
 REGISTER_FUNCTION(Char)
 {
-    factory.registerFunction<FunctionChar>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionChar>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/FunctionFQDN.cpp

@@ -46,7 +46,7 @@ public:
 
 REGISTER_FUNCTION(FQDN)
 {
-    factory.registerFunction<FunctionFQDN>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionFQDN>({}, FunctionFactory::CaseInsensitive);
     factory.registerFunction<FunctionFQDN>("fullHostName");
 }
 

src/Functions/FunctionFactory.cpp

@@ -28,10 +28,11 @@ const String & getFunctionCanonicalNameIfAny(const String & name)
 
 void FunctionFactory::registerFunction(
     const std::string & name,
-    Value creator,
+    FunctionCreator creator,
+    Documentation doc,
     CaseSensitiveness case_sensitiveness)
 {
-    if (!functions.emplace(name, creator).second)
+    if (!functions.emplace(name, FunctionFactoryData{creator, doc}).second)
         throw Exception("FunctionFactory: the function name '" + name + "' is not unique",
                         ErrorCodes::LOGICAL_ERROR);
 
@@ -42,7 +43,7 @@ void FunctionFactory::registerFunction(
 
     if (case_sensitiveness == CaseInsensitive)
     {
-        if (!case_insensitive_functions.emplace(function_name_lowercase, creator).second)
+        if (!case_insensitive_functions.emplace(function_name_lowercase, FunctionFactoryData{creator, doc}).second)
             throw Exception("FunctionFactory: the case insensitive function name '" + name + "' is not unique",
                 ErrorCodes::LOGICAL_ERROR);
         case_insensitive_name_mapping[function_name_lowercase] = name;
@@ -105,13 +106,13 @@ FunctionOverloadResolverPtr FunctionFactory::tryGetImpl(
 
     auto it = functions.find(name);
     if (functions.end() != it)
-        res = it->second(context);
+        res = it->second.first(context);
     else
     {
         name = Poco::toLower(name);
         it = case_insensitive_functions.find(name);
         if (case_insensitive_functions.end() != it)
-            res = it->second(context);
+            res = it->second.first(context);
     }
 
     if (!res)
@@ -141,4 +142,13 @@ FunctionFactory & FunctionFactory::instance()
     return ret;
 }
 
+Documentation FunctionFactory::getDocumentation(const std::string & name) const
+{
+    auto it = functions.find(name);
+    if (it == functions.end())
+        throw Exception(ErrorCodes::UNKNOWN_FUNCTION, "Unknown function {}", name);
+
+    return it->second.second;
+}
+
 }

src/Functions/FunctionFactory.h

@@ -3,6 +3,7 @@
 #include <Interpreters/Context_fwd.h>
 #include <Common/register_objects.h>
 #include <Common/IFactoryWithAliases.h>
+#include <Common/Documentation.h>
 #include <Functions/IFunction.h>
 #include <Functions/IFunctionAdaptors.h>
 
@@ -15,30 +16,32 @@
 namespace DB
 {
 
+using FunctionCreator = std::function<FunctionOverloadResolverPtr(ContextPtr)>;
+using FunctionFactoryData = std::pair<FunctionCreator, Documentation>;
+
 /** Creates function by name.
   * Function could use for initialization (take ownership of shared_ptr, for example)
   *  some dictionaries from Context.
   */
-class FunctionFactory : private boost::noncopyable,
-                        public IFactoryWithAliases<std::function<FunctionOverloadResolverPtr(ContextPtr)>>
+class FunctionFactory : private boost::noncopyable, public IFactoryWithAliases<FunctionFactoryData>
 {
 public:
     static FunctionFactory & instance();
 
     template <typename Function>
-    void registerFunction(CaseSensitiveness case_sensitiveness = CaseSensitive)
+    void registerFunction(Documentation doc = {}, CaseSensitiveness case_sensitiveness = CaseSensitive)
     {
-        registerFunction<Function>(Function::name, case_sensitiveness);
+        registerFunction<Function>(Function::name, std::move(doc), case_sensitiveness);
     }
 
     template <typename Function>
-    void registerFunction(const std::string & name, CaseSensitiveness case_sensitiveness = CaseSensitive)
+    void registerFunction(const std::string & name, Documentation doc = {}, CaseSensitiveness case_sensitiveness = CaseSensitive)
     {
 
         if constexpr (std::is_base_of_v<IFunction, Function>)
-            registerFunction(name, &adaptFunctionToOverloadResolver<Function>, case_sensitiveness);
+            registerFunction(name, &adaptFunctionToOverloadResolver<Function>, std::move(doc), case_sensitiveness);
         else
-            registerFunction(name, &Function::create, case_sensitiveness);
+            registerFunction(name, &Function::create, std::move(doc), case_sensitiveness);
     }
 
     /// This function is used by YQL - innovative transactional DBMS that depends on ClickHouse by source code.
@@ -60,9 +63,12 @@ public:
     /// No locking, you must register all functions before usage of get.
     void registerFunction(
         const std::string & name,
-        Value creator,
+        FunctionCreator creator,
+        Documentation doc = {},
         CaseSensitiveness case_sensitiveness = CaseSensitive);
 
+    Documentation getDocumentation(const std::string & name) const;
+
 private:
     using Functions = std::unordered_map<std::string, Value>;
 

src/Functions/FunctionsBinaryRepresentation.cpp

@@ -623,10 +623,10 @@ public:
 
 REGISTER_FUNCTION(BinaryRepr)
 {
-    factory.registerFunction<EncodeToBinaryRepresentation<HexImpl>>(FunctionFactory::CaseInsensitive);
-    factory.registerFunction<DecodeFromBinaryRepresentation<UnhexImpl>>(FunctionFactory::CaseInsensitive);
-    factory.registerFunction<EncodeToBinaryRepresentation<BinImpl>>(FunctionFactory::CaseInsensitive);
-    factory.registerFunction<DecodeFromBinaryRepresentation<UnbinImpl>>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<EncodeToBinaryRepresentation<HexImpl>>({}, FunctionFactory::CaseInsensitive);
+    factory.registerFunction<DecodeFromBinaryRepresentation<UnhexImpl>>({}, FunctionFactory::CaseInsensitive);
+    factory.registerFunction<EncodeToBinaryRepresentation<BinImpl>>({}, FunctionFactory::CaseInsensitive);
+    factory.registerFunction<DecodeFromBinaryRepresentation<UnbinImpl>>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/FunctionsConversion.cpp

@@ -28,8 +28,12 @@ REGISTER_FUNCTION(Conversion)
     factory.registerFunction<FunctionToDecimal256>();
 
     factory.registerFunction<FunctionToDate>();
-    /// MySQL compatibility alias.
-    factory.registerFunction<FunctionToDate>("DATE", FunctionFactory::CaseInsensitive);
+
+    /// MySQL compatibility alias. Cannot be registered as alias,
+    /// because we don't want it to be normalized to toDate in queries,
+    /// otherwise CREATE DICTIONARY query breaks.
+    factory.registerFunction<FunctionToDate>("DATE", {}, FunctionFactory::CaseInsensitive);
+
     factory.registerFunction<FunctionToDate32>();
     factory.registerFunction<FunctionToDateTime>();
     factory.registerFunction<FunctionToDateTime32>();

src/Functions/FunctionsLogical.cpp

@@ -27,7 +27,7 @@ REGISTER_FUNCTION(Logical)
     factory.registerFunction<FunctionAnd>();
     factory.registerFunction<FunctionOr>();
     factory.registerFunction<FunctionXor>();
-    factory.registerFunction<FunctionNot>(FunctionFactory::CaseInsensitive); /// Operator NOT(x) can be parsed as a function.
+    factory.registerFunction<FunctionNot>({}, FunctionFactory::CaseInsensitive); /// Operator NOT(x) can be parsed as a function.
 }
 
 namespace ErrorCodes

src/Functions/FunctionsRound.cpp

@@ -7,11 +7,11 @@ namespace DB
 
 REGISTER_FUNCTION(Round)
 {
-    factory.registerFunction<FunctionRound>("round", FunctionFactory::CaseInsensitive);
-    factory.registerFunction<FunctionRoundBankers>("roundBankers", FunctionFactory::CaseSensitive);
-    factory.registerFunction<FunctionFloor>("floor", FunctionFactory::CaseInsensitive);
-    factory.registerFunction<FunctionCeil>("ceil", FunctionFactory::CaseInsensitive);
-    factory.registerFunction<FunctionTrunc>("trunc", FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionRound>("round", {}, FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionRoundBankers>("roundBankers", {}, FunctionFactory::CaseSensitive);
+    factory.registerFunction<FunctionFloor>("floor", {}, FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionCeil>("ceil", {}, FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionTrunc>("trunc", {}, FunctionFactory::CaseInsensitive);
     factory.registerFunction<FunctionRoundDown>();
 
     /// Compatibility aliases.

src/Functions/abs.cpp

@@ -52,7 +52,7 @@ template <> struct FunctionUnaryArithmeticMonotonicity<NameAbs>
 
 REGISTER_FUNCTION(Abs)
 {
-    factory.registerFunction<FunctionAbs>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionAbs>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/acos.cpp

@@ -14,7 +14,7 @@ using FunctionAcos = FunctionMathUnary<UnaryFunctionVectorized<AcosName, acos>>;
 
 REGISTER_FUNCTION(Acos)
 {
-    factory.registerFunction<FunctionAcos>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionAcos>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/array/length.cpp

@@ -55,7 +55,42 @@ using FunctionLength = FunctionStringOrArrayToT<LengthImpl, NameLength, UInt64,
 
 REGISTER_FUNCTION(Length)
 {
-    factory.registerFunction<FunctionLength>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionLength>(
+        {
+            R"(
+Calculates the length of the string or array.
+
+For String or FixedString argument: calculates the number of bytes in string.
+[example:string1]
+
+For Array argument: calculates the number of elements in the array.
+[example:arr1]
+
+If applied for FixedString argument, the function is a constant expression:
+[example:constexpr]
+
+Please note that the number of bytes in a string is not the same as the number of Unicode "code points"
+and it is not the same as the number of Unicode "grapheme clusters" (what we usually call "characters")
+and it is not the same as the visible string width.
+[example:unicode]
+
+It is ok to have ASCII NUL bytes in strings, and they will be counted as well.
+[example:nul]
+)",
+            Documentation::Examples{
+                {"string1", "SELECT length('Hello, world!')"},
+                {"arr1", "SELECT length(['Hello'], ['world'])"},
+                {"constexpr", "WITH 'hello' || toString(number) AS str\n"
+                              "SELECT str, \n"
+                              "       isConstant(length(str)) AS str_length_is_constant, \n"
+                              "       isConstant(length(str::FixedString(6))) AS fixed_str_length_is_constant\n"
+                              "FROM numbers(3)"},
+                {"unicode", "SELECT 'ёлка' AS str1, length(str1), lengthUTF8(str1), normalizeUTF8NFKD(str1) AS str2, length(str2), lengthUTF8(str2)"},
+                {"nul", R"(SELECT 'abc\0\0\0' AS str, length(str))"},
+                },
+            Documentation::Categories{"String", "Array"}
+        },
+        FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/asin.cpp

@@ -14,7 +14,34 @@ using FunctionAsin = FunctionMathUnary<UnaryFunctionVectorized<AsinName, asin>>;
 
 REGISTER_FUNCTION(Asin)
 {
-    factory.registerFunction<FunctionAsin>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionAsin>(
+        {
+            R"(
+Calculates the arcsine of the argument.
+
+Takes arbitrary numeric type, which includes floating point and integer numbers, as well as big integers and decimals and returns Float64.
+
+For arguments in range [-1, 1] it returns the value in range of [-pi() / 2, pi() / 2].
+
+It represents an inverse function to function 'sin' on this range:
+[example:inverse]
+
+It always returns Float64, even if the argument has Float32 type:
+[example:float32]
+
+For arguments outside of this range, it returns nan:
+[example:nan]
+
+Every self-respectful data scientist knows how to apply arcsine to improve ads click-through rate with ClickHouse.
+For more details, see [https://en.wikipedia.org/wiki/Inverse_trigonometric_functions].
+)",
+            Documentation::Examples{
+                {"inverse", "SELECT asin(1.0) = pi() / 2, sin(asin(1)), asin(sin(1))"},
+                {"float32", "SELECT toTypeName(asin(1.0::Float32))"},
+                {"nan", "SELECT asin(1.1), asin(-2), asin(inf), asin(nan)"}},
+            Documentation::Categories{"Mathematical", "Trigonometric"}
+        },
+        FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/atan.cpp

@@ -14,7 +14,7 @@ using FunctionAtan = FunctionMathUnary<UnaryFunctionVectorized<AtanName, atan>>;
 
 REGISTER_FUNCTION(Atan)
 {
-    factory.registerFunction<FunctionAtan>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionAtan>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/atan2.cpp

@@ -15,7 +15,7 @@ namespace
 
 REGISTER_FUNCTION(Atan2)
 {
-    factory.registerFunction<FunctionAtan2>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionAtan2>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/base64Decode.cpp

@@ -12,7 +12,7 @@ REGISTER_FUNCTION(Base64Decode)
     factory.registerFunction<FunctionBase64Conversion<Base64Decode>>();
 
     /// MysQL compatibility alias.
-    factory.registerFunction<FunctionBase64Conversion<Base64Decode>>("FROM_BASE64", FunctionFactory::CaseInsensitive);
+    factory.registerAlias("FROM_BASE64", "base64Decode", FunctionFactory::CaseInsensitive);
 }
 }
 #endif

src/Functions/base64Encode.cpp

@@ -14,7 +14,7 @@ REGISTER_FUNCTION(Base64Encode)
     factory.registerFunction<FunctionBase64Conversion<Base64Encode>>();
 
     /// MysQL compatibility alias.
-    factory.registerFunction<FunctionBase64Conversion<Base64Encode>>("TO_BASE64", FunctionFactory::CaseInsensitive);
+    factory.registerAlias("TO_BASE64", "base64Encode", FunctionFactory::CaseInsensitive);
 }
 }
 #endif

src/Functions/coalesce.cpp

@@ -176,7 +176,7 @@ private:
 
 REGISTER_FUNCTION(Coalesce)
 {
-    factory.registerFunction<FunctionCoalesce>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionCoalesce>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/concat.cpp

@@ -230,7 +230,7 @@ private:
 
 REGISTER_FUNCTION(Concat)
 {
-    factory.registerFunction<ConcatOverloadResolver>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<ConcatOverloadResolver>({}, FunctionFactory::CaseInsensitive);
     factory.registerFunction<FunctionConcatAssumeInjective>();
 }
 

src/Functions/connectionId.cpp

@@ -33,7 +33,7 @@ public:
 
 REGISTER_FUNCTION(ConnectionId)
 {
-    factory.registerFunction<FunctionConnectionId>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionConnectionId>({}, FunctionFactory::CaseInsensitive);
     factory.registerAlias("connection_id", "connectionID", FunctionFactory::CaseInsensitive);
 }
 

src/Functions/cos.cpp

@@ -13,7 +13,7 @@ using FunctionCos = FunctionMathUnary<UnaryFunctionVectorized<CosName, cos>>;
 
 REGISTER_FUNCTION(Cos)
 {
-    factory.registerFunction<FunctionCos>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionCos>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/countMatches.cpp

@@ -22,8 +22,8 @@ namespace DB
 
 REGISTER_FUNCTION(CountMatches)
 {
-    factory.registerFunction<FunctionCountMatches<FunctionCountMatchesCaseSensitive>>(FunctionFactory::CaseSensitive);
-    factory.registerFunction<FunctionCountMatches<FunctionCountMatchesCaseInsensitive>>(FunctionFactory::CaseSensitive);
+    factory.registerFunction<FunctionCountMatches<FunctionCountMatchesCaseSensitive>>({}, FunctionFactory::CaseSensitive);
+    factory.registerFunction<FunctionCountMatches<FunctionCountMatchesCaseInsensitive>>({}, FunctionFactory::CaseSensitive);
 }
 
 }

src/Functions/countSubstrings.cpp

@@ -19,6 +19,6 @@ using FunctionCountSubstrings = FunctionsStringSearch<CountSubstringsImpl<NameCo
 
 REGISTER_FUNCTION(CountSubstrings)
 {
-    factory.registerFunction<FunctionCountSubstrings>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionCountSubstrings>({}, FunctionFactory::CaseInsensitive);
 }
 }

src/Functions/currentDatabase.cpp

@@ -54,7 +54,7 @@ public:
 REGISTER_FUNCTION(CurrentDatabase)
 {
     factory.registerFunction<FunctionCurrentDatabase>();
-    factory.registerFunction<FunctionCurrentDatabase>("DATABASE", FunctionFactory::CaseInsensitive);
+    factory.registerAlias("DATABASE", "currentDatabase", FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/dateDiff.cpp

@@ -263,8 +263,7 @@ private:
 
 REGISTER_FUNCTION(DateDiff)
 {
-    factory.registerFunction<FunctionDateDiff>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionDateDiff>({}, FunctionFactory::CaseInsensitive);
 }
 
 }
-

src/Functions/dateName.cpp

@@ -345,7 +345,7 @@ private:
 
 REGISTER_FUNCTION(DateName)
 {
-    factory.registerFunction<FunctionDateNameImpl>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionDateNameImpl>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/date_trunc.cpp

@@ -23,7 +23,7 @@ namespace
 class FunctionDateTrunc : public IFunction
 {
 public:
-    static constexpr auto name = "date_trunc";
+    static constexpr auto name = "dateTrunc";
 
     explicit FunctionDateTrunc(ContextPtr context_) : context(context_) {}
 
@@ -153,12 +153,13 @@ private:
 
 }
 
+
 REGISTER_FUNCTION(DateTrunc)
 {
-    factory.registerFunction<FunctionDateTrunc>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionDateTrunc>();
 
     /// Compatibility alias.
-    factory.registerAlias("dateTrunc", FunctionDateTrunc::name);
+    factory.registerAlias("DATE_TRUNC", "dateTrunc", FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/degrees.cpp

@@ -23,7 +23,7 @@ namespace
 
 REGISTER_FUNCTION(Degrees)
 {
-    factory.registerFunction<FunctionDegrees>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionDegrees>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/exp.cpp

@@ -36,7 +36,7 @@ using FunctionExp = FunctionMathUnary<UnaryFunctionVectorized<ExpName, exp>>;
 
 REGISTER_FUNCTION(Exp)
 {
-    factory.registerFunction<FunctionExp>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionExp>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/formatDateTime.cpp

@@ -722,19 +722,19 @@ struct NameFormatDateTime
 
 struct NameFromUnixTime
 {
-    static constexpr auto name = "FROM_UNIXTIME";
+    static constexpr auto name = "fromUnixTimestamp";
 };
 
 using FunctionFormatDateTime = FunctionFormatDateTimeImpl<NameFormatDateTime, false>;
-using FunctionFROM_UNIXTIME = FunctionFormatDateTimeImpl<NameFromUnixTime, true>;
+using FunctionFromUnixTimestamp = FunctionFormatDateTimeImpl<NameFromUnixTime, true>;
 
 }
 
 REGISTER_FUNCTION(FormatDateTime)
 {
     factory.registerFunction<FunctionFormatDateTime>();
-    factory.registerFunction<FunctionFROM_UNIXTIME>();
-    factory.registerAlias("fromUnixTimestamp", "FROM_UNIXTIME");
+    factory.registerFunction<FunctionFromUnixTimestamp>();
+    factory.registerAlias("FROM_UNIXTIME", "fromUnixTimestamp");
 }
 
 }

src/Functions/greatest.cpp

@@ -65,7 +65,7 @@ using FunctionGreatest = FunctionBinaryArithmetic<GreatestImpl, NameGreatest>;
 
 REGISTER_FUNCTION(Greatest)
 {
-    factory.registerFunction<LeastGreatestOverloadResolver<LeastGreatest::Greatest, FunctionGreatest>>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<LeastGreatestOverloadResolver<LeastGreatest::Greatest, FunctionGreatest>>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/hypot.cpp

@@ -15,7 +15,7 @@ namespace
 
 REGISTER_FUNCTION(Hypot)
 {
-    factory.registerFunction<FunctionHypot>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionHypot>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/if.cpp

@@ -1122,7 +1122,7 @@ public:
 
 REGISTER_FUNCTION(If)
 {
-    factory.registerFunction<FunctionIf>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionIf>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/ifNull.cpp

@@ -91,7 +91,7 @@ private:
 
 REGISTER_FUNCTION(IfNull)
 {
-    factory.registerFunction<FunctionIfNull>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionIfNull>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/isNull.cpp

@@ -74,7 +74,7 @@ public:
 
 REGISTER_FUNCTION(IsNull)
 {
-    factory.registerFunction<FunctionIsNull>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionIsNull>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/least.cpp

@@ -65,7 +65,7 @@ using FunctionLeast = FunctionBinaryArithmetic<LeastImpl, NameLeast>;
 
 REGISTER_FUNCTION(Least)
 {
-    factory.registerFunction<LeastGreatestOverloadResolver<LeastGreatest::Least, FunctionLeast>>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<LeastGreatestOverloadResolver<LeastGreatest::Least, FunctionLeast>>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/left.cpp

@@ -6,8 +6,8 @@ namespace DB
 
 REGISTER_FUNCTION(Left)
 {
-    factory.registerFunction<FunctionLeftRight<false, SubstringDirection::Left>>(FunctionFactory::CaseInsensitive);
-    factory.registerFunction<FunctionLeftRight<true, SubstringDirection::Left>>(FunctionFactory::CaseSensitive);
+    factory.registerFunction<FunctionLeftRight<false, SubstringDirection::Left>>({}, FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionLeftRight<true, SubstringDirection::Left>>({}, FunctionFactory::CaseSensitive);
 }
 
 }

src/Functions/lemmatize.cpp

@@ -122,7 +122,7 @@ public:
 
 REGISTER_FUNCTION(Lemmatize)
 {
-    factory.registerFunction<FunctionLemmatize>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionLemmatize>();
 }
 
 }

src/Functions/lengthUTF8.cpp

@@ -73,8 +73,8 @@ REGISTER_FUNCTION(LengthUTF8)
     factory.registerFunction<FunctionLengthUTF8>();
 
     /// Compatibility aliases.
-    factory.registerFunction<FunctionLengthUTF8>("CHAR_LENGTH", FunctionFactory::CaseInsensitive);
-    factory.registerFunction<FunctionLengthUTF8>("CHARACTER_LENGTH", FunctionFactory::CaseInsensitive);
+    factory.registerAlias("CHAR_LENGTH", "lengthUTF8", FunctionFactory::CaseInsensitive);
+    factory.registerAlias("CHARACTER_LENGTH", "lengthUTF8", FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/log.cpp

@@ -34,7 +34,7 @@ using FunctionLog = FunctionMathUnary<UnaryFunctionVectorized<LogName, log>>;
 
 REGISTER_FUNCTION(Log)
 {
-    factory.registerFunction<FunctionLog>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionLog>({}, FunctionFactory::CaseInsensitive);
     factory.registerAlias("ln", "log", FunctionFactory::CaseInsensitive);
 }
 

src/Functions/log10.cpp

@@ -13,7 +13,7 @@ using FunctionLog10 = FunctionMathUnary<UnaryFunctionVectorized<Log10Name, log10
 
 REGISTER_FUNCTION(Log10)
 {
-    factory.registerFunction<FunctionLog10>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionLog10>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/log2.cpp

@@ -13,7 +13,7 @@ using FunctionLog2 = FunctionMathUnary<UnaryFunctionVectorized<Log2Name, log2>>;
 
 REGISTER_FUNCTION(Log2)
 {
-    factory.registerFunction<FunctionLog2>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionLog2>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/lower.cpp

@@ -19,7 +19,7 @@ using FunctionLower = FunctionStringToString<LowerUpperImpl<'A', 'Z'>, NameLower
 
 REGISTER_FUNCTION(Lower)
 {
-    factory.registerFunction<FunctionLower>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionLower>({}, FunctionFactory::CaseInsensitive);
     factory.registerAlias("lcase", NameLower::name, FunctionFactory::CaseInsensitive);
 }
 

src/Functions/mathConstants.cpp

@@ -41,7 +41,7 @@ REGISTER_FUNCTION(E)
 
 REGISTER_FUNCTION(Pi)
 {
-    factory.registerFunction<FunctionPi>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionPi>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/max2.cpp

@@ -21,6 +21,6 @@ namespace
 
 REGISTER_FUNCTION(Max2)
 {
-    factory.registerFunction<FunctionMax2>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionMax2>({}, FunctionFactory::CaseInsensitive);
 }
 }

src/Functions/min2.cpp

@@ -22,6 +22,6 @@ namespace
 
 REGISTER_FUNCTION(Min2)
 {
-    factory.registerFunction<FunctionMin2>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionMin2>({}, FunctionFactory::CaseInsensitive);
 }
 }

src/Functions/monthName.cpp

@@ -74,7 +74,7 @@ private:
 
 REGISTER_FUNCTION(MonthName)
 {
-    factory.registerFunction<FunctionMonthName>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionMonthName>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/now.cpp

@@ -128,7 +128,7 @@ public:
 
 REGISTER_FUNCTION(Now)
 {
-    factory.registerFunction<NowOverloadResolver>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<NowOverloadResolver>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/now64.cpp

@@ -160,7 +160,7 @@ public:
 
 REGISTER_FUNCTION(Now64)
 {
-    factory.registerFunction<Now64OverloadResolver>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<Now64OverloadResolver>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/nullIf.cpp

@@ -69,8 +69,7 @@ public:
 
 REGISTER_FUNCTION(NullIf)
 {
-    factory.registerFunction<FunctionNullIf>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionNullIf>({}, FunctionFactory::CaseInsensitive);
 }
 
 }
-

src/Functions/position.cpp

@@ -19,7 +19,7 @@ using FunctionPosition = FunctionsStringSearch<PositionImpl<NamePosition, Positi
 
 REGISTER_FUNCTION(Position)
 {
-    factory.registerFunction<FunctionPosition>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionPosition>({}, FunctionFactory::CaseInsensitive);
     factory.registerAlias("locate", NamePosition::name, FunctionFactory::CaseInsensitive);
 }
 }

src/Functions/pow.cpp

@@ -13,7 +13,7 @@ using FunctionPow = FunctionMathBinaryFloat64<BinaryFunctionVectorized<PowName,
 
 REGISTER_FUNCTION(Pow)
 {
-    factory.registerFunction<FunctionPow>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionPow>({}, FunctionFactory::CaseInsensitive);
     factory.registerAlias("power", "pow", FunctionFactory::CaseInsensitive);
 }
 

src/Functions/radians.cpp

@@ -23,7 +23,7 @@ namespace
 
 REGISTER_FUNCTION(Radians)
 {
-    factory.registerFunction<FunctionRadians>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionRadians>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/rand.cpp

@@ -13,9 +13,8 @@ using FunctionRand = FunctionRandom<UInt32, NameRand>;
 
 REGISTER_FUNCTION(Rand)
 {
-    factory.registerFunction<FunctionRand>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionRand>({}, FunctionFactory::CaseInsensitive);
     factory.registerAlias("rand32", NameRand::name);
 }
 
 }
-

src/Functions/repeat.cpp

@@ -254,7 +254,7 @@ public:
 
 REGISTER_FUNCTION(Repeat)
 {
-    factory.registerFunction<FunctionRepeat>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionRepeat>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/reverse.cpp

@@ -150,7 +150,7 @@ private:
 
 REGISTER_FUNCTION(Reverse)
 {
-    factory.registerFunction<ReverseOverloadResolver>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<ReverseOverloadResolver>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/right.cpp

@@ -6,8 +6,8 @@ namespace DB
 
 REGISTER_FUNCTION(Right)
 {
-    factory.registerFunction<FunctionLeftRight<false, SubstringDirection::Right>>(FunctionFactory::CaseInsensitive);
-    factory.registerFunction<FunctionLeftRight<true, SubstringDirection::Right>>(FunctionFactory::CaseSensitive);
+    factory.registerFunction<FunctionLeftRight<false, SubstringDirection::Right>>({}, FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionLeftRight<true, SubstringDirection::Right>>({}, FunctionFactory::CaseSensitive);
 }
 
 }

src/Functions/serverConstants.cpp

@@ -153,12 +153,12 @@ REGISTER_FUNCTION(Uptime)
 
 REGISTER_FUNCTION(Version)
 {
-    factory.registerFunction<FunctionVersion>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionVersion>({}, FunctionFactory::CaseInsensitive);
 }
 
 REGISTER_FUNCTION(Revision)
 {
-    factory.registerFunction<FunctionRevision>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionRevision>({}, FunctionFactory::CaseInsensitive);
 }
 
 REGISTER_FUNCTION(ZooKeeperSessionUptime)
@@ -174,4 +174,3 @@ REGISTER_FUNCTION(GetOSKernelVersion)
 
 
 }
-

src/Functions/sign.cpp

@@ -45,7 +45,7 @@ struct FunctionUnaryArithmeticMonotonicity<NameSign>
 
 REGISTER_FUNCTION(Sign)
 {
-    factory.registerFunction<FunctionSign>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionSign>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/sin.cpp

@@ -13,7 +13,7 @@ using FunctionSin = FunctionMathUnary<UnaryFunctionVectorized<SinName, sin>>;
 
 REGISTER_FUNCTION(Sin)
 {
-    factory.registerFunction<FunctionSin>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionSin>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/sqrt.cpp

@@ -13,7 +13,7 @@ using FunctionSqrt = FunctionMathUnary<UnaryFunctionVectorized<SqrtName, sqrt>>;
 
 REGISTER_FUNCTION(Sqrt)
 {
-    factory.registerFunction<FunctionSqrt>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionSqrt>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/stem.cpp

@@ -127,7 +127,7 @@ public:
 
 REGISTER_FUNCTION(Stem)
 {
-    factory.registerFunction<FunctionStem>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionStem>();
 }
 
 }

src/Functions/substring.cpp

@@ -188,11 +188,11 @@ public:
 
 REGISTER_FUNCTION(Substring)
 {
-    factory.registerFunction<FunctionSubstring<false>>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionSubstring<false>>({}, FunctionFactory::CaseInsensitive);
     factory.registerAlias("substr", "substring", FunctionFactory::CaseInsensitive);
     factory.registerAlias("mid", "substring", FunctionFactory::CaseInsensitive); /// from MySQL dialect
 
-    factory.registerFunction<FunctionSubstring<true>>(FunctionFactory::CaseSensitive);
+    factory.registerFunction<FunctionSubstring<true>>({}, FunctionFactory::CaseSensitive);
 }
 
 }

src/Functions/synonyms.cpp

@@ -120,7 +120,7 @@ public:
 
 REGISTER_FUNCTION(Synonyms)
 {
-    factory.registerFunction<FunctionSynonyms>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionSynonyms>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/tan.cpp

@@ -13,7 +13,7 @@ using FunctionTan = FunctionMathUnary<UnaryFunctionVectorized<TanName, tan>>;
 
 REGISTER_FUNCTION(Tan)
 {
-    factory.registerFunction<FunctionTan>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionTan>({}, FunctionFactory::CaseInsensitive);
 }
 
 }

src/Functions/tanh.cpp

@@ -39,9 +39,7 @@ using FunctionTanh = FunctionMathUnary<UnaryFunctionVectorized<TanhName, tanh>>;
 
 REGISTER_FUNCTION(Tanh)
 {
-    factory.registerFunction<FunctionTanh>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionTanh>({}, FunctionFactory::CaseInsensitive);
 }
 
 }
-
-

src/Functions/toDayOfMonth.cpp

@@ -14,10 +14,8 @@ REGISTER_FUNCTION(ToDayOfMonth)
     factory.registerFunction<FunctionToDayOfMonth>();
 
     /// MysQL compatibility alias.
-    factory.registerFunction<FunctionToDayOfMonth>("DAY", FunctionFactory::CaseInsensitive);
-    factory.registerFunction<FunctionToDayOfMonth>("DAYOFMONTH", FunctionFactory::CaseInsensitive);
+    factory.registerAlias("DAY", "toDayOfMonth", FunctionFactory::CaseInsensitive);
+    factory.registerAlias("DAYOFMONTH", "toDayOfMonth", FunctionFactory::CaseInsensitive);
 }
 
 }
-
-

src/Functions/toDayOfWeek.cpp

@@ -14,9 +14,7 @@ REGISTER_FUNCTION(ToDayOfWeek)
     factory.registerFunction<FunctionToDayOfWeek>();
 
     /// MysQL compatibility alias.
-    factory.registerFunction<FunctionToDayOfWeek>("DAYOFWEEK", FunctionFactory::CaseInsensitive);
+    factory.registerAlias("DAYOFWEEK", "toDayOfWeek", FunctionFactory::CaseInsensitive);
 }
 
 }
-
-

src/Functions/toDayOfYear.cpp

@@ -14,9 +14,7 @@ REGISTER_FUNCTION(ToDayOfYear)
     factory.registerFunction<FunctionToDayOfYear>();
 
     /// MysQL compatibility alias.
-    factory.registerFunction<FunctionToDayOfYear>("DAYOFYEAR", FunctionFactory::CaseInsensitive);
+    factory.registerAlias("DAYOFYEAR", "toDayOfYear", FunctionFactory::CaseInsensitive);
 }
 
 }
-
-

src/Functions/toHour.cpp

@@ -14,9 +14,7 @@ REGISTER_FUNCTION(ToHour)
     factory.registerFunction<FunctionToHour>();
 
     /// MysQL compatibility alias.
-    factory.registerFunction<FunctionToHour>("HOUR", FunctionFactory::CaseInsensitive);
+    factory.registerAlias("HOUR", "toHour", FunctionFactory::CaseInsensitive);
 }
 
 }
-
-

src/Functions/toLastDayOfMonth.cpp

@@ -13,9 +13,7 @@ REGISTER_FUNCTION(ToLastDayOfMonth)
     factory.registerFunction<FunctionToLastDayOfMonth>();
 
     /// MySQL compatibility alias.
-    factory.registerFunction<FunctionToLastDayOfMonth>("LAST_DAY", FunctionFactory::CaseInsensitive);
+    factory.registerAlias("LAST_DAY", "toLastDayOfMonth", FunctionFactory::CaseInsensitive);
 }
 
 }
-
-

src/Functions/toMinute.cpp

@@ -12,10 +12,9 @@ using FunctionToMinute = FunctionDateOrDateTimeToSomething<DataTypeUInt8, ToMinu
 REGISTER_FUNCTION(ToMinute)
 {
     factory.registerFunction<FunctionToMinute>();
+
     /// MysQL compatibility alias.
-    factory.registerFunction<FunctionToMinute>("MINUTE", FunctionFactory::CaseInsensitive);
+    factory.registerAlias("MINUTE", "toMinute", FunctionFactory::CaseInsensitive);
 }
 
 }
-
-

src/Functions/toMonth.cpp

@@ -13,9 +13,7 @@ REGISTER_FUNCTION(ToMonth)
 {
     factory.registerFunction<FunctionToMonth>();
     /// MysQL compatibility alias.
-    factory.registerFunction<FunctionToMonth>("MONTH", FunctionFactory::CaseInsensitive);
+    factory.registerAlias("MONTH", "toMonth", FunctionFactory::CaseInsensitive);
 }
 
 }
-
-

src/Functions/toQuarter.cpp

@@ -13,9 +13,7 @@ REGISTER_FUNCTION(ToQuarter)
 {
     factory.registerFunction<FunctionToQuarter>();
     /// MysQL compatibility alias.
-    factory.registerFunction<FunctionToQuarter>("QUARTER", FunctionFactory::CaseInsensitive);
+    factory.registerAlias("QUARTER", "toQuarter", FunctionFactory::CaseInsensitive);
 }
 
 }
-
-

src/Functions/toSecond.cpp

@@ -12,10 +12,9 @@ using FunctionToSecond = FunctionDateOrDateTimeToSomething<DataTypeUInt8, ToSeco
 REGISTER_FUNCTION(ToSecond)
 {
     factory.registerFunction<FunctionToSecond>();
+
     /// MysQL compatibility alias.
-    factory.registerFunction<FunctionToSecond>("SECOND", FunctionFactory::CaseInsensitive);
+    factory.registerAlias("SECOND", "toSecond", FunctionFactory::CaseInsensitive);
 }
 
 }
-
-

src/Functions/toYear.cpp

@@ -12,10 +12,9 @@ using FunctionToYear = FunctionDateOrDateTimeToSomething<DataTypeUInt16, ToYearI
 REGISTER_FUNCTION(ToYear)
 {
     factory.registerFunction<FunctionToYear>();
+
     /// MysQL compatibility alias.
-    factory.registerFunction<FunctionToYear>("YEAR", FunctionFactory::CaseInsensitive);
+    factory.registerAlias("YEAR", "toYear", FunctionFactory::CaseInsensitive);
 }
 
 }
-
-

src/Functions/upper.cpp

@@ -18,7 +18,7 @@ using FunctionUpper = FunctionStringToString<LowerUpperImpl<'a', 'z'>, NameUpper
 
 REGISTER_FUNCTION(Upper)
 {
-    factory.registerFunction<FunctionUpper>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionUpper>({}, FunctionFactory::CaseInsensitive);
     factory.registerAlias("ucase", FunctionUpper::name, FunctionFactory::CaseInsensitive);
 }
 

src/Functions/visitParamExtractBool.cpp

@@ -16,16 +16,13 @@ struct ExtractBool
     }
 };
 
-struct NameVisitParamExtractBool   { static constexpr auto name = "visitParamExtractBool"; };
-using FunctionVisitParamExtractBool = FunctionsStringSearch<ExtractParamImpl<NameVisitParamExtractBool, ExtractBool>>;
-
-struct NameSimpleJSONExtractBool   { static constexpr auto name = "simpleJSONExtractBool"; };
+struct NameSimpleJSONExtractBool { static constexpr auto name = "simpleJSONExtractBool"; };
 using FunctionSimpleJSONExtractBool = FunctionsStringSearch<ExtractParamImpl<NameSimpleJSONExtractBool, ExtractBool>>;
 
 REGISTER_FUNCTION(VisitParamExtractBool)
 {
-    factory.registerFunction<FunctionVisitParamExtractBool>();
     factory.registerFunction<FunctionSimpleJSONExtractBool>();
+    factory.registerAlias("visitParamExtractBool", "simpleJSONExtractBool");
 }
 
 }

src/Functions/visitParamExtractFloat.cpp

@@ -6,16 +6,13 @@
 namespace DB
 {
 
-struct NameVisitParamExtractFloat  { static constexpr auto name = "visitParamExtractFloat"; };
-using FunctionVisitParamExtractFloat = FunctionsStringSearch<ExtractParamImpl<NameVisitParamExtractFloat, ExtractNumericType<Float64>>>;
-
-struct NameSimpleJSONExtractFloat  { static constexpr auto name = "simpleJSONExtractFloat"; };
+struct NameSimpleJSONExtractFloat { static constexpr auto name = "simpleJSONExtractFloat"; };
 using FunctionSimpleJSONExtractFloat = FunctionsStringSearch<ExtractParamImpl<NameSimpleJSONExtractFloat, ExtractNumericType<Float64>>>;
 
 REGISTER_FUNCTION(VisitParamExtractFloat)
 {
-    factory.registerFunction<FunctionVisitParamExtractFloat>();
     factory.registerFunction<FunctionSimpleJSONExtractFloat>();
+    factory.registerAlias("visitParamExtractFloat", "simpleJSONExtractFloat");
 }
 
 }

src/Functions/visitParamExtractInt.cpp

@@ -6,16 +6,13 @@
 namespace DB
 {
 
-struct NameVisitParamExtractInt    { static constexpr auto name = "visitParamExtractInt"; };
-using FunctionVisitParamExtractInt = FunctionsStringSearch<ExtractParamImpl<NameVisitParamExtractInt, ExtractNumericType<Int64>>>;
-
-struct NameSimpleJSONExtractInt    { static constexpr auto name = "simpleJSONExtractInt"; };
+struct NameSimpleJSONExtractInt { static constexpr auto name = "simpleJSONExtractInt"; };
 using FunctionSimpleJSONExtractInt = FunctionsStringSearch<ExtractParamImpl<NameSimpleJSONExtractInt, ExtractNumericType<Int64>>>;
 
 REGISTER_FUNCTION(VisitParamExtractInt)
 {
-    factory.registerFunction<FunctionVisitParamExtractInt>();
     factory.registerFunction<FunctionSimpleJSONExtractInt>();
+    factory.registerAlias("visitParamExtractInt", "simpleJSONExtractInt");
 }
 
 }

src/Functions/visitParamExtractRaw.cpp

@@ -56,16 +56,13 @@ struct ExtractRaw
     }
 };
 
-struct NameVisitParamExtractRaw    { static constexpr auto name = "visitParamExtractRaw"; };
-using FunctionVisitParamExtractRaw = FunctionsStringSearchToString<ExtractParamToStringImpl<ExtractRaw>, NameVisitParamExtractRaw>;
-
 struct NameSimpleJSONExtractRaw    { static constexpr auto name = "simpleJSONExtractRaw"; };
 using FunctionSimpleJSONExtractRaw = FunctionsStringSearchToString<ExtractParamToStringImpl<ExtractRaw>, NameSimpleJSONExtractRaw>;
 
 REGISTER_FUNCTION(VisitParamExtractRaw)
 {
-    factory.registerFunction<FunctionVisitParamExtractRaw>();
     factory.registerFunction<FunctionSimpleJSONExtractRaw>();
+    factory.registerAlias("visitParamExtractRaw", "simpleJSONExtractRaw");
 }
 
 }

src/Functions/visitParamExtractString.cpp

@@ -17,16 +17,13 @@ struct ExtractString
     }
 };
 
-struct NameVisitParamExtractString { static constexpr auto name = "visitParamExtractString"; };
-using FunctionVisitParamExtractString = FunctionsStringSearchToString<ExtractParamToStringImpl<ExtractString>, NameVisitParamExtractString>;
-
 struct NameSimpleJSONExtractString { static constexpr auto name = "simpleJSONExtractString"; };
 using FunctionSimpleJSONExtractString = FunctionsStringSearchToString<ExtractParamToStringImpl<ExtractString>, NameSimpleJSONExtractString>;
 
 REGISTER_FUNCTION(VisitParamExtractString)
 {
-    factory.registerFunction<FunctionVisitParamExtractString>();
     factory.registerFunction<FunctionSimpleJSONExtractString>();
+    factory.registerAlias("visitParamExtractString", "simpleJSONExtractString");
 }
 
 }

src/Functions/visitParamExtractUInt.cpp

@@ -6,17 +6,14 @@
 namespace DB
 {
 
-struct NameVisitParamExtractUInt   { static constexpr auto name = "visitParamExtractUInt"; };
-using FunctionVisitParamExtractUInt = FunctionsStringSearch<ExtractParamImpl<NameVisitParamExtractUInt, ExtractNumericType<UInt64>>>;
-
-struct NameSimpleJSONExtractUInt   { static constexpr auto name = "simpleJSONExtractUInt"; };
+struct NameSimpleJSONExtractUInt { static constexpr auto name = "simpleJSONExtractUInt"; };
 using FunctionSimpleJSONExtractUInt = FunctionsStringSearch<ExtractParamImpl<NameSimpleJSONExtractUInt, ExtractNumericType<UInt64>>>;
 
 
 REGISTER_FUNCTION(VisitParamExtractUInt)
 {
-    factory.registerFunction<FunctionVisitParamExtractUInt>();
     factory.registerFunction<FunctionSimpleJSONExtractUInt>();
+    factory.registerAlias("visitParamExtractUInt", "simpleJSONExtractUInt");
 }
 
 }

src/Functions/visitParamHas.cpp

@@ -16,16 +16,13 @@ struct HasParam
     }
 };
 
-struct NameVisitParamHas           { static constexpr auto name = "visitParamHas"; };
-using FunctionVisitParamHas = FunctionsStringSearch<ExtractParamImpl<NameVisitParamHas, HasParam>>;
-
-struct NameSimpleJSONHas           { static constexpr auto name = "simpleJSONHas"; };
+struct NameSimpleJSONHas { static constexpr auto name = "simpleJSONHas"; };
 using FunctionSimpleJSONHas = FunctionsStringSearch<ExtractParamImpl<NameSimpleJSONHas, HasParam>>;
 
 REGISTER_FUNCTION(VisitParamHas)
 {
-    factory.registerFunction<FunctionVisitParamHas>();
     factory.registerFunction<FunctionSimpleJSONHas>();
+    factory.registerAlias("visitParamHas", "simpleJSONHas");
 }
 
 }

src/Parsers/ASTFunction.cpp

@@ -12,7 +12,6 @@
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTSubquery.h>
-#include <Parsers/ASTWithAlias.h>
 #include <Parsers/queryToString.h>
 #include <Parsers/ASTSetQuery.h>
 

src/Parsers/ParserCreateQuery.cpp

@@ -31,6 +31,7 @@ namespace ErrorCodes
 
 namespace
 {
+
 ASTPtr parseComment(IParser::Pos & pos, Expected & expected)
 {
     ParserKeyword s_comment("COMMENT");
@@ -41,8 +42,10 @@ ASTPtr parseComment(IParser::Pos & pos, Expected & expected)
 
     return comment;
 }
+
 }
 
+
 bool ParserNestedTable::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     ParserToken open(TokenType::OpeningRoundBracket);

src/Parsers/ParserCreateQuery.h

@@ -53,7 +53,8 @@ bool IParserNameTypePair<NameParser>::parseImpl(Pos & pos, ASTPtr & node, Expect
     NameParser name_parser;
     ParserDataType type_parser;
 
-    ASTPtr name, type;
+    ASTPtr name;
+    ASTPtr type;
     if (name_parser.parse(pos, name, expected)
         && type_parser.parse(pos, type, expected))
     {

src/Storages/System/StorageSystemFunctions.cpp

@@ -38,7 +38,13 @@ namespace ErrorCodes
 namespace
 {
     template <typename Factory>
-    void fillRow(MutableColumns & res_columns, const String & name, UInt64 is_aggregate, const String & create_query, FunctionOrigin function_origin, const Factory & f)
+    void fillRow(
+        MutableColumns & res_columns,
+        const String & name,
+        UInt64 is_aggregate,
+        const String & create_query,
+        FunctionOrigin function_origin,
+        const Factory & factory)
     {
         res_columns[0]->insert(name);
         res_columns[1]->insert(is_aggregate);
@@ -50,15 +56,25 @@ namespace
         }
         else
         {
-            res_columns[2]->insert(f.isCaseInsensitive(name));
-            if (f.isAlias(name))
-                res_columns[3]->insert(f.aliasTo(name));
+            res_columns[2]->insert(factory.isCaseInsensitive(name));
+            if (factory.isAlias(name))
+                res_columns[3]->insert(factory.aliasTo(name));
             else
                 res_columns[3]->insertDefault();
         }
 
         res_columns[4]->insert(create_query);
         res_columns[5]->insert(static_cast<Int8>(function_origin));
+
+        if constexpr (std::is_same_v<Factory, FunctionFactory>)
+        {
+            if (factory.isAlias(name))
+                res_columns[6]->insertDefault();
+            else
+                res_columns[6]->insert(factory.getDocumentation(name).description);
+        }
+        else
+            res_columns[6]->insertDefault();
     }
 }
 
@@ -79,7 +95,8 @@ NamesAndTypesList StorageSystemFunctions::getNamesAndTypes()
         {"case_insensitive", std::make_shared<DataTypeUInt8>()},
         {"alias_to", std::make_shared<DataTypeString>()},
         {"create_query", std::make_shared<DataTypeString>()},
-        {"origin", std::make_shared<DataTypeEnum8>(getOriginEnumsAndValues())}
+        {"origin", std::make_shared<DataTypeEnum8>(getOriginEnumsAndValues())},
+        {"description", std::make_shared<DataTypeString>()},
     };
 }
 

src/TableFunctions/TableFunctionFactory.cpp

@@ -17,14 +17,15 @@ namespace ErrorCodes
 }
 
 
-void TableFunctionFactory::registerFunction(const std::string & name, TableFunctionCreator creator, Doc doc, CaseSensitiveness case_sensitiveness)
+void TableFunctionFactory::registerFunction(
+    const std::string & name, TableFunctionCreator creator, Documentation doc, CaseSensitiveness case_sensitiveness)
 {
-    if (!table_functions.emplace(name, TableFunctionData{creator, doc}).second)
+    if (!table_functions.emplace(name, TableFunctionFactoryData{creator, doc}).second)
         throw Exception("TableFunctionFactory: the table function name '" + name + "' is not unique",
             ErrorCodes::LOGICAL_ERROR);
 
     if (case_sensitiveness == CaseInsensitive
-        && !case_insensitive_table_functions.emplace(Poco::toLower(name), TableFunctionData{creator, doc}).second)
+        && !case_insensitive_table_functions.emplace(Poco::toLower(name), TableFunctionFactoryData{creator, doc}).second)
         throw Exception("TableFunctionFactory: the case insensitive table function name '" + name + "' is not unique",
                         ErrorCodes::LOGICAL_ERROR);
 }
@@ -85,7 +86,7 @@ bool TableFunctionFactory::isTableFunctionName(const std::string & name) const
     return table_functions.contains(name);
 }
 
-Doc TableFunctionFactory::getDocumentation(const std::string & name) const
+Documentation TableFunctionFactory::getDocumentation(const std::string & name) const
 {
     auto it = table_functions.find(name);
     if (it == table_functions.end())

src/TableFunctions/TableFunctionFactory.h

@@ -18,21 +18,25 @@ namespace DB
 class Context;
 
 using TableFunctionCreator = std::function<TableFunctionPtr()>;
-using TableFunctionData = std::pair<TableFunctionCreator, Doc>;
+using TableFunctionFactoryData = std::pair<TableFunctionCreator, Documentation>;
 
 /** Lets you get a table function by its name.
   */
-class TableFunctionFactory final: private boost::noncopyable, public IFactoryWithAliases<TableFunctionData>
+class TableFunctionFactory final: private boost::noncopyable, public IFactoryWithAliases<TableFunctionFactoryData>
 {
 public:
     static TableFunctionFactory & instance();
 
     /// Register a function by its name.
     /// No locking, you must register all functions before usage of get.
-    void registerFunction(const std::string & name, TableFunctionCreator creator, Doc doc = {}, CaseSensitiveness case_sensitiveness = CaseSensitive);
+    void registerFunction(
+        const std::string & name,
+        TableFunctionCreator creator,
+        Documentation doc = {},
+        CaseSensitiveness case_sensitiveness = CaseSensitive);
 
     template <typename Function>
-    void registerFunction(Doc doc = {}, CaseSensitiveness case_sensitiveness = CaseSensitive)
+    void registerFunction(Documentation doc = {}, CaseSensitiveness case_sensitiveness = CaseSensitive)
     {
         auto creator = []() -> TableFunctionPtr { return std::make_shared<Function>(); };
         registerFunction(Function::name, std::move(creator), std::move(doc), case_sensitiveness);
@@ -44,7 +48,7 @@ public:
     /// Returns nullptr if not found.
     TableFunctionPtr tryGet(const std::string & name, ContextPtr context) const;
 
-    Doc getDocumentation(const std::string & name) const;
+    Documentation getDocumentation(const std::string & name) const;
 
     bool isTableFunctionName(const std::string & name) const;