thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-28 02:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with merging configs

Browse Source
This commit is contained in:
Alexey Milovidov 2021-09-21 21:51:59 +03:00
parent 196442a8ec
commit 213ecaedde
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Common/Config/ConfigProcessor.cpp
View File

@ -230,8 +230,19 @@ void ConfigProcessor::merge(XMLDocumentPtr config, XMLDocumentPtr with)
Node * config_root = getRootNode(config.get()); Node * config_root = getRootNode(config.get());
Node * with_root = getRootNode(with.get()); Node * with_root = getRootNode(with.get());
if (config_root->nodeName() != with_root->nodeName()) std::string config_root_node_name = config_root->nodeName();
throw Poco::Exception("Root element doesn't have the corresponding root element as the config file. It must be <" + config_root->nodeName() + ">"); std::string merged_root_node_name = with_root->nodeName();
/// For compatibility, we treat 'yandex' and 'clickhouse' equivalent.
/// See https://clickhouse.com/blog/en/2021/clickhouse-inc/
if (config_root_node_name == merged_root_node_name
|| ((config_root_node_name == "yandex" || config_root_node_name == "clickhouse")
&& (merged_root_node_name == "yandex" || merged_root_node_name == "clickhouse")))
{
throw Poco::Exception("Root element doesn't have the corresponding root element as the config file."
" It must be <" + config_root->nodeName() + ">");
}
mergeRecursive(config, config_root, with_root); mergeRecursive(config, config_root, with_root);
} }