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

some fix for errors with shadowing name

Browse Source
This commit is contained in:
Артем Стрельцов 2020-04-02 01:10:22 +03:00
parent 1176b5777e
commit 5f561af792
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/src/Dictionaries/DictionaryStructure.cpp
View File

@ -364,7 +364,7 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
void DictionaryStructure::getSettings( void DictionaryStructure::getSettings(
const Poco::Util::AbstractConfiguration & config, const Poco::Util::AbstractConfiguration & config,
const std::string & config_prefix, const std::string & config_prefix,
Settings & settings) Settings & dict_settings)
{ {
Poco::Util::AbstractConfiguration::Keys config_elems; Poco::Util::AbstractConfiguration::Keys config_elems;
config.keys(config_prefix, config_elems); config.keys(config_prefix, config_elems);
@ -379,7 +379,7 @@ void DictionaryStructure::getSettings(
const auto prefix = config_prefix + '.' + config_elem; const auto prefix = config_prefix + '.' + config_elem;
Poco::Util::AbstractConfiguration::Keys setting_keys; Poco::Util::AbstractConfiguration::Keys setting_keys;
config.keys(prefix, setting_keys); config.keys(prefix, setting_keys);
settings.loadSettingsFromConfig(prefix, config); dict_settings.loadSettingsFromConfig(prefix, config);
} }
} }

2
dbms/src/Dictionaries/DictionaryStructure.h
View File

@ -124,7 +124,7 @@ private:
void getSettings( void getSettings(
const Poco::Util::AbstractConfiguration & config, const Poco::Util::AbstractConfiguration & config,
const std::string & config_prefix, const std::string & config_prefix,
Settings & settings); Settings & dict_settings);
}; };
} }