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

StorageDictionary fix potential configuration race

Browse Source
This commit is contained in:
Maksim Kita 2021-10-21 17:25:53 +03:00
parent a9ac7fb394
commit 8885748a6c
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Storages/StorageDictionary.cpp
View File

@ -212,11 +212,20 @@ void StorageDictionary::renameInMemory(const StorageID & new_table_id)
auto old_table_id = getStorageID(); auto old_table_id = getStorageID();
IStorage::renameInMemory(new_table_id); IStorage::renameInMemory(new_table_id);
if (configuration) bool has_configuration = false;
{ {
configuration->setString("dictionary.database", new_table_id.database_name); std::lock_guard<std::mutex> lock(dictionary_config_mutex);
configuration->setString("dictionary.name", new_table_id.table_name);
if (configuration)
{
has_configuration = true;
configuration->setString("dictionary.database", new_table_id.database_name);
configuration->setString("dictionary.name", new_table_id.table_name);
}
}
if (has_configuration)
{
const auto & external_dictionaries_loader = getContext()->getExternalDictionariesLoader(); const auto & external_dictionaries_loader = getContext()->getExternalDictionariesLoader();
auto result = external_dictionaries_loader.getLoadResult(old_table_id.getInternalDictionaryName()); auto result = external_dictionaries_loader.getLoadResult(old_table_id.getInternalDictionaryName());