Merge pull request #18033 from ClickHouse/encode-xml-rename-files

encodeXMLComponent: rename files after #17659
This commit is contained in:
alexey-milovidov 2020-12-13 18:28:52 +03:00 committed by GitHub
commit d8484d9c31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 8 deletions

View File

@ -3,6 +3,7 @@
#include <Functions/FunctionStringToString.h>
#include <common/find_symbols.h>
namespace DB
{
namespace ErrorCodes
@ -12,12 +13,12 @@ namespace ErrorCodes
namespace
{
struct EncodeXMLName
struct EncodeXMLComponentName
{
static constexpr auto name = "encodeXMLComponent";
};
class FunctionEncodeXMLImpl
class FunctionEncodeXMLComponentImpl
{
public:
static void vector(
@ -132,12 +133,12 @@ namespace
}
};
using FunctionEncodeXML = FunctionStringToString<FunctionEncodeXMLImpl, EncodeXMLName>;
using FunctionEncodeXMLComponent = FunctionStringToString<FunctionEncodeXMLComponentImpl, EncodeXMLComponentName>;
}
void registerFunctionEncodeXML(FunctionFactory & factory)
void registerFunctionEncodeXMLComponent(FunctionFactory & factory)
{
factory.registerFunction<FunctionEncodeXML>();
factory.registerFunction<FunctionEncodeXMLComponent>();
}
}

View File

@ -33,7 +33,7 @@ void registerFunctionRegexpQuoteMeta(FunctionFactory &);
void registerFunctionNormalizeQuery(FunctionFactory &);
void registerFunctionNormalizedQueryHash(FunctionFactory &);
void registerFunctionCountMatches(FunctionFactory &);
void registerFunctionEncodeXML(FunctionFactory & factory);
void registerFunctionEncodeXMLComponent(FunctionFactory & factory);
#if USE_BASE64
void registerFunctionBase64Encode(FunctionFactory &);
@ -69,7 +69,7 @@ void registerFunctionsString(FunctionFactory & factory)
registerFunctionNormalizeQuery(factory);
registerFunctionNormalizedQueryHash(factory);
registerFunctionCountMatches(factory);
registerFunctionEncodeXML(factory);
registerFunctionEncodeXMLComponent(factory);
#if USE_BASE64
registerFunctionBase64Encode(factory);
registerFunctionBase64Decode(factory);

View File

@ -226,7 +226,7 @@ SRCS(
dumpColumnStructure.cpp
e.cpp
empty.cpp
encodeXML.cpp
encodeXMLComponent.cpp
encrypt.cpp
endsWith.cpp
equals.cpp

View File

@ -0,0 +1,7 @@
<test>
<preconditions>
<table_exists>test.hits</table_exists>
</preconditions>
<query>SELECT count() FROM test.hits WHERE NOT ignore(encodeXMLComponent(URL))</query>
</test>