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

Better

Browse Source
This commit is contained in:
kssenii 2021-10-18 06:06:38 +00:00
parent d34d752688
commit ab9d5d8cc7
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
programs/local/LocalServer.cpp
View File

@ -579,11 +579,6 @@ void LocalServer::processConfig()
{
String path = global_context->getPath();
/// When tables are loaded from .sql we initialize background executors
/// regardless there are MergeTree tables or not, because no better place was found.
/// In other cases it will be initialized only when there are mergeTree tables.
global_context->initializeBackgroundExecutors();
/// Lock path directory before read
status.emplace(fs::path(path) / "status", StatusFile::write_full_info);

9
src/Databases/DatabaseOnDisk.cpp
View File

@ -53,6 +53,15 @@ std::pair<String, StoragePtr> createTableFromAST(
ast_create_query.attach = true;
ast_create_query.database = database_name;
auto global_context = context->getGlobalContext();
if (global_context
&& global_context->getApplicationType() == Context::ApplicationType::LOCAL
&& !global_context->isBackgroundExecutorsInitialized()
&& ast_create_query.storage && endsWith(ast_create_query.storage->engine->name, "MergeTree"))
{
global_context->initializeBackgroundExecutors();
}
if (ast_create_query.as_table_function)
{
const auto & factory = TableFunctionFactory::instance();

2
src/Interpreters/loadMetadata.cpp
View File

@ -161,7 +161,7 @@ void loadMetadata(ContextMutablePtr context, const String & default_database_nam
bool create_default_db_if_not_exists = !default_database_name.empty();
bool metadata_dir_for_default_db_already_exists = databases.count(default_database_name);
if (create_default_db_if_not_exists && !metadata_dir_for_default_db_already_exists)
databases.emplace(default_database_name, path + "/" + escapeForFileName(default_database_name));
databases.emplace(default_database_name, std::filesystem::path(path) / escapeForFileName(default_database_name));
TablesLoader::Databases loaded_databases;
for (const auto & [name, db_path] : databases)