thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-29 19:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build

Browse Source
This commit is contained in:
Maksim Kita 2022-01-17 20:35:52 +00:00
parent 886512694c
commit 3ca17afa00
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Dictionaries/IDictionary.h
View File

@ -58,7 +58,7 @@ public:
std::string getFullName() const std::string getFullName() const
{ {
std::lock_guard lock{name_mutex}; std::lock_guard lock{name_mutex};
return dictionary_id.getNameForLogs(); return dictionary_id.getInternalDictionaryName();
} }
StorageID getDictionaryID() const StorageID getDictionaryID() const

8
src/Storages/StorageDictionary.cpp
View File

@ -222,8 +222,8 @@ void StorageDictionary::renameInMemory(const StorageID & new_table_id)
/// It's DDL dictionary, need to update configuration and reload /// It's DDL dictionary, need to update configuration and reload
[[maybe_unused]] bool move_to_atomic = old_table_id.uuid == UUIDHelpers::Nil && new_table_id.uuid != UUIDHelpers::Nil; bool move_to_atomic = old_table_id.uuid == UUIDHelpers::Nil && new_table_id.uuid != UUIDHelpers::Nil;
[[maybe_unused]] bool move_to_ordinary = old_table_id.uuid != UUIDHelpers::Nil && new_table_id.uuid == UUIDHelpers::Nil; bool move_to_ordinary = old_table_id.uuid != UUIDHelpers::Nil && new_table_id.uuid == UUIDHelpers::Nil;
assert(old_table_id.uuid == new_table_id.uuid || move_to_atomic || move_to_ordinary); assert(old_table_id.uuid == new_table_id.uuid || move_to_atomic || move_to_ordinary);
{ {
@ -231,6 +231,10 @@ void StorageDictionary::renameInMemory(const StorageID & new_table_id)
configuration->setString("dictionary.database", new_table_id.database_name); configuration->setString("dictionary.database", new_table_id.database_name);
configuration->setString("dictionary.name", new_table_id.table_name); configuration->setString("dictionary.name", new_table_id.table_name);
if (move_to_atomic)
configuration->setString("dictionary.uuid", toString(new_table_id.uuid));
else if (move_to_ordinary)
configuration->remove("dictionary.uuid");
} }
/// Dictionary is moving between databases of different engines or is renaming inside Ordinary database /// Dictionary is moving between databases of different engines or is renaming inside Ordinary database