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

Fix error

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

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

@ -236,8 +236,8 @@ void ConfigProcessor::merge(XMLDocumentPtr config, XMLDocumentPtr with)
/// 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")
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."