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

clickhouse: addition to previous commit [#CONV-6705].

Browse Source
This commit is contained in:
Michael Kolupaev 2013-05-15 13:45:44 +00:00
parent c0b803d204
commit 8bc64303be
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,8 +215,7 @@ bool StorageChunkMerger::maybeMergeSomething()
Storages chunks = selectChunksToMerge();
if (chunks.empty())
return false;
mergeChunks(chunks);
return true;
return mergeChunks(chunks);
}
StorageChunkMerger::Storages StorageChunkMerger::selectChunksToMerge()
@ -276,7 +275,7 @@ static std::string FormatColumnsForCreateQuery(NamesAndTypesList & columns)
return res;
}
void StorageChunkMerger::mergeChunks(const Storages & chunks)
bool StorageChunkMerger::mergeChunks(const Storages & chunks)
{
typedef std::map<std::string, DataTypePtr> ColumnsMap;
@ -327,7 +326,7 @@ void StorageChunkMerger::mergeChunks(const Storages & chunks)
if (currently_written_groups.count(new_table_full_name))
{
LOG_WARNING(log, "Table " + new_table_full_name + " is already being written. Aborting merge.");
return;
return false;
}
currently_written_groups.insert(new_table_full_name);
@ -478,6 +477,8 @@ void StorageChunkMerger::mergeChunks(const Storages & chunks)
new_storage->removeReference();
LOG_TRACE(log, "Merged chunks.");
return true;
}
catch(...)
{