thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 07:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds percent encoding for "update_field" parameter

Browse Source 
Handles cases when url has fragment
This commit is contained in:
Arsen Hakobyan 2018-05-11 22:14:15 +04:00 committed by proller
parent 4b093e3e0a
commit ad9659574f
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dbms/src/Dictionaries/HTTPDictionarySource.cpp
View File

@ -32,9 +32,12 @@ HTTPDictionarySource::HTTPDictionarySource(const DictionaryStructure & dict_stru
if (update_field.empty())
return;
/// TODO This code is totally wrong and ignorant.
/// What if URL contains fragment (#). What if update_field contains characters that must be %-encoded.
std::string::size_type option = url.find("?");
std::string tmp_update_field;
Poco::URI::encode(update_field, "&", tmp_update_field);
update_field = tmp_update_field;
std::string::size_type option = url.substr(0, url.find("#", 0)).find("?");
if (option == std::string::npos)
update_field = '?' + update_field;
else
@ -66,12 +69,12 @@ std::string HTTPDictionarySource::getUpdateFieldAndDate()
timeinfo = localtime (&hr_time);
strftime(buffer, 80, "=%Y-%m-%d%%20%H:%M:%S", timeinfo);
std::string str_time(buffer);
return url + update_field + str_time;
return url.substr(0, url.find("#", 0)) + update_field + str_time;
}
else
{
update_time = std::chrono::system_clock::now();
return url + update_field + "=0000-00-00%2000:00:00"; ///for initial load
return url.substr(0, url.find("#", 0)) + update_field + "=0000-00-00%2000:00:00"; ///for initial load
}
}