Fix mark cache settings initialization.

Before this change setting mark_cache_min_lifetime wasn't applied from the user settings, but only from the default.
There reason was that corresponding Settings initialization was after creation of the MarkCache.
This fix moves Settings initialization above creation of the MarkCache.
This commit is contained in:
Alex Bocharov 2017-12-13 20:32:26 +00:00
parent a6fef4f398
commit 3a320733f3

View File

@ -253,17 +253,17 @@ int Server::main(const std::vector<std::string> & /*args*/)
if (uncompressed_cache_size)
global_context->setUncompressedCache(uncompressed_cache_size);
/// Size of cache for marks (index of MergeTree family of tables). It is necessary.
size_t mark_cache_size = config().getUInt64("mark_cache_size");
if (mark_cache_size)
global_context->setMarkCache(mark_cache_size);
/// Load global settings from default profile.
Settings & settings = global_context->getSettingsRef();
String default_profile_name = config().getString("default_profile", "default");
global_context->setDefaultProfileName(default_profile_name);
global_context->setSetting("profile", default_profile_name);
/// Size of cache for marks (index of MergeTree family of tables). It is necessary.
size_t mark_cache_size = config().getUInt64("mark_cache_size");
if (mark_cache_size)
global_context->setMarkCache(mark_cache_size);
/// Set path for format schema files
auto format_schema_path = Poco::File(config().getString("format_schema_path", path + "format_schemas/"));
global_context->setFormatSchemaPath(format_schema_path.path() + "/");