thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-28 12:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove unrelated changes

Browse Source
This commit is contained in:
Alexander Kuzmenkov 2020-10-01 14:00:58 +03:00
parent 608b6e3a25
commit 99915fa444
2 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Common/Exception.h
View File

@ -39,11 +39,8 @@ public:
const char * name() const throw() override { return "DB::Exception"; }
const char * what() const throw() override { return message().data(); }
template <typename ...Fmt>
void addMessage(Fmt&&... fmt)
{
extendedMessage(fmt::format(std::forward<Fmt>(fmt)...));
}
/// Add something to the existing message.
void addMessage(const std::string & arg) { extendedMessage(arg); }
std::string getStackTraceString() const;

22
src/Core/BaseSettings.h
View File

@ -390,21 +390,13 @@ String BaseSettings<Traits_>::valueToStringUtil(const std::string_view & name, c
template <typename Traits_>
Field BaseSettings<Traits_>::stringToValueUtil(const std::string_view & name, const String & str)
{
try
{
const auto & accessor = Traits::Accessor::instance();
if (size_t index = accessor.find(name); index != static_cast<size_t>(-1))
return accessor.stringToValueUtil(index, str);
if constexpr (Traits::allow_custom_settings)
return Field::restoreFromDump(str);
else
BaseSettingsHelpers::throwSettingNotFound(name);
}
catch (Exception & e)
{
e.addMessage("while parsing value '{}' for setting '{}'", str, name);
throw;
}
const auto & accessor = Traits::Accessor::instance();
if (size_t index = accessor.find(name); index != static_cast<size_t>(-1))
return accessor.stringToValueUtil(index, str);
if constexpr (Traits::allow_custom_settings)
return Field::restoreFromDump(str);
else
BaseSettingsHelpers::throwSettingNotFound(name);
}
template <typename Traits_>