thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-10 09:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
artpaul 2016-12-15 23:56:31 +05:00
parent 945f879765
commit 0b0dc43e9b
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dbms/src/Functions/FunctionsURL.cpp
View File

@ -1,3 +1,4 @@
#include <DB/Common/hex.h>
#include <DB/Functions/FunctionFactory.h> #include <DB/Functions/FunctionFactory.h>
#include <DB/Functions/FunctionsURL.h> #include <DB/Functions/FunctionsURL.h>
#include <common/find_first_symbols.h> #include <common/find_first_symbols.h>
@ -6,12 +7,12 @@ namespace DB
{ {
/// We assume that size of the buf isn't less than url.size(). /// We assume that size of the buf isn't less than url.size().
static size_t decodeUrl(const StringView & url, char* dst) static size_t decodeURL(const StringView & url, char * dst)
{ {
const char* p = url.data(); const char * p = url.data();
const char* st = url.data(); const char * st = url.data();
const char* const end = url.data() + url.size(); const char * const end = url.data() + url.size();
char* buf = dst; char * buf = dst;
while (true) while (true)
{ {
@ -93,7 +94,7 @@ void DecodeURLComponentImpl::vector(const ColumnString::Chars_t & data, const Co
size_t prev_size = res_data.size(); size_t prev_size = res_data.size();
res_data.resize(prev_size + url.size() + 1); res_data.resize(prev_size + url.size() + 1);
size_t len = decodeUrl(url, reinterpret_cast<char *>(res_data.data() + res_offset)); size_t len = decodeURL(url, reinterpret_cast<char *>(res_data.data() + res_offset));
res_data.resize(prev_size + len); res_data.resize(prev_size + len);
res_offset += len; res_offset += len;
res_data[res_offset] = 0; res_data[res_offset] = 0;
@ -109,7 +110,7 @@ void DecodeURLComponentImpl::constant(const std::string & data,
std::string & res_data) std::string & res_data)
{ {
res_data.resize(data.size()); res_data.resize(data.size());
size_t len = decodeUrl(data, &res_data[0]); size_t len = decodeURL(data, &res_data[0]);
res_data.resize(len); res_data.resize(len);
} }
@ -144,6 +145,7 @@ void registerFunctionsURL(FunctionFactory & factory)
factory.registerFunction<FunctionCutFragment>(); factory.registerFunction<FunctionCutFragment>();
factory.registerFunction<FunctionCutQueryStringAndFragment>(); factory.registerFunction<FunctionCutQueryStringAndFragment>();
factory.registerFunction<FunctionCutURLParameter>(); factory.registerFunction<FunctionCutURLParameter>();
factory.registerFunction<FunctionDecodeURLComponent>();
} }
} }