mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-28 12:40:49 +00:00
remove unrelated changes
This commit is contained in:
parent
608b6e3a25
commit
99915fa444
@ -39,11 +39,8 @@ public:
|
|||||||
const char * name() const throw() override { return "DB::Exception"; }
|
const char * name() const throw() override { return "DB::Exception"; }
|
||||||
const char * what() const throw() override { return message().data(); }
|
const char * what() const throw() override { return message().data(); }
|
||||||
|
|
||||||
template <typename ...Fmt>
|
/// Add something to the existing message.
|
||||||
void addMessage(Fmt&&... fmt)
|
void addMessage(const std::string & arg) { extendedMessage(arg); }
|
||||||
{
|
|
||||||
extendedMessage(fmt::format(std::forward<Fmt>(fmt)...));
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string getStackTraceString() const;
|
std::string getStackTraceString() const;
|
||||||
|
|
||||||
|
@ -389,8 +389,6 @@ String BaseSettings<Traits_>::valueToStringUtil(const std::string_view & name, c
|
|||||||
|
|
||||||
template <typename Traits_>
|
template <typename Traits_>
|
||||||
Field BaseSettings<Traits_>::stringToValueUtil(const std::string_view & name, const String & str)
|
Field BaseSettings<Traits_>::stringToValueUtil(const std::string_view & name, const String & str)
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
{
|
||||||
const auto & accessor = Traits::Accessor::instance();
|
const auto & accessor = Traits::Accessor::instance();
|
||||||
if (size_t index = accessor.find(name); index != static_cast<size_t>(-1))
|
if (size_t index = accessor.find(name); index != static_cast<size_t>(-1))
|
||||||
@ -400,12 +398,6 @@ Field BaseSettings<Traits_>::stringToValueUtil(const std::string_view & name, co
|
|||||||
else
|
else
|
||||||
BaseSettingsHelpers::throwSettingNotFound(name);
|
BaseSettingsHelpers::throwSettingNotFound(name);
|
||||||
}
|
}
|
||||||
catch (Exception & e)
|
|
||||||
{
|
|
||||||
e.addMessage("while parsing value '{}' for setting '{}'", str, name);
|
|
||||||
throw;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename Traits_>
|
template <typename Traits_>
|
||||||
void BaseSettings<Traits_>::write(WriteBuffer & out, SettingsWriteFormat format) const
|
void BaseSettings<Traits_>::write(WriteBuffer & out, SettingsWriteFormat format) const
|
||||||
|
Loading…
Reference in New Issue
Block a user