thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-04 05:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix custom settings

Browse Source
This commit is contained in:
Michael Kolupaev 2024-12-03 11:09:08 +00:00
parent bc267d4427
commit 96a961583c
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Client/Connection.cpp
View File

@ -841,7 +841,8 @@ void Connection::sendQuery(
modified_settings.emplace(*settings);
for (const SettingChange & change : settings_from_server)
{
if (settings->get(change.name) == change.value)
Field value;
if (settings->tryGet(change.name, value) && value == change.value)
{
// Mark as unchanged so it's not sent.
modified_settings->setDefaultValue(change.name);

6
src/Core/BaseSettings.h
View File

@ -339,7 +339,13 @@ void BaseSettings<TTraits>::resetToDefault(std::string_view name)
name = TTraits::resolveName(name);
const auto & accessor = Traits::Accessor::instance();
if (size_t index = accessor.find(name); index != static_cast<size_t>(-1))
{
accessor.resetValueToDefault(*this, index);
return;
}
if constexpr (Traits::allow_custom_settings)
custom_settings_map.erase(name);
}
template <typename TTraits>