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

Merge

Browse Source
This commit is contained in:
Michael Kolupaev 2013-02-11 09:48:01 +00:00
parent dc15d81295
commit d1cb4373b3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dbms/src/Storages/StorageChunkMerger.cpp
View File

@ -340,6 +340,7 @@ void StorageChunkMerger::mergeChunks(const Storages & chunks)
for (size_t chunk_index = 0; chunk_index < chunks.size(); ++chunk_index)
{
StoragePtr src_storage = chunks[chunk_index];
std::string src_name = src_storage->getTableName();
/// Если таблицу успели удалить, ничего не делаем.
if (!context.getDatabases()[source_database].count(src_storage->getTableName()))
@ -365,7 +366,7 @@ void StorageChunkMerger::mergeChunks(const Storages & chunks)
create_query->attach = false;
create_query->if_not_exists = false;
create_query->database = source_database;
create_query->table = src_storage->getTableName();
create_query->table = src_name;
ASTFunction * ast_storage = new ASTFunction;
create_query->storage = ast_storage;
@ -381,7 +382,7 @@ void StorageChunkMerger::mergeChunks(const Storages & chunks)
}
catch(...)
{
LOG_ERROR(log, "Chunk " + src_storage->getTableName() + " was removed but not replaced: data is lost!");
LOG_ERROR(log, "Chunk " + src_name + " was removed but not replaced. Its data is stored in table " << new_table_name << ". You may need to resolve this manually.");
throw;
}