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

To support "incl" directive in the dictionaries config ConfigProcessor is now used to parse external modules configuration.

Browse Source 
"include_from" directive also works if the config has "<yandex>" as the root element. Otherwise default include file will be used.

To enable substitutions in a dictionary config one needs to have it in the following form:
<yandex>
	<include_from>...</include_from>
	<dictionary>
		<name incl="dict_name"></name>
		...
	</dictionary>
</yandex>

instead of

<dictionaries>
        <include_from>...</include_from>
        <dictionary>
                ...
        </dictionary>
</dictionaries>

The latter form will still work if no substitutions are used or if the default includes file exist. So no outright configuration change is necessary on the existing installations.
This commit is contained in:
Pavel Yakunin 2017-11-19 09:33:20 +03:00
parent 748f3e796b
commit bd62ea2535
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dbms/src/Interpreters/ExternalLoader.cpp
View File

@ -10,6 +10,7 @@
#include <Poco/File.h>
#include <cmath>
#include <Poco/Util/XMLConfiguration.h>
#include <Common/ConfigProcessor.h>
namespace DB
{
@ -277,7 +278,10 @@ void ExternalLoader::reloadFromConfigFile(const std::string & config_path, const
const auto last_modified = config_file.getLastModified();
if (force_reload || last_modified > config_last_modified)
{
Poco::AutoPtr<Poco::Util::XMLConfiguration> config = new Poco::Util::XMLConfiguration(config_path);
ConfigProcessor config_processor = ConfigProcessor();
ConfigProcessor::LoadedConfig cfg = config_processor.loadConfig(config_path);
Poco::AutoPtr<Poco::Util::AbstractConfiguration> config = cfg.configuration;
/// Definitions of loadable objects may have changed, recreate all of them
@ -296,7 +300,7 @@ void ExternalLoader::reloadFromConfigFile(const std::string & config_path, const
if (!startsWith(key, config_settings.external_config))
{
if (!startsWith(key, "comment"))
if (!startsWith(key, "comment") && !startsWith(key, "include_from"))
LOG_WARNING(log, config_path << ": unknown node in file: '" << key
<< "', expected '" << config_settings.external_config << "'");
continue;