thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-23 02:00:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Michael Kolupaev 2014-02-28 14:32:07 +04:00
parent 60a03ff451
commit 89e91f3dc4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dbms/src/Storages/StorageMergeTree.cpp
View File

@ -102,6 +102,7 @@ StorageMergeTree::StorageMergeTree(
merge_threads = new boost::threadpool::pool(settings.merging_threads);
loadDataParts();
clearOldParts();
UInt64 max_part_id = 0;
for (DataParts::iterator it = data_parts.begin(); it != data_parts.end(); ++it)
@ -769,7 +770,7 @@ void StorageMergeTree::mergeThread(bool while_can, bool aggressive)
{
while (!shutdown_called)
{
/// Удаляем старые куски.
/// Удаляем старые куски. На случай, если в слиянии что-то сломано, и из следующего блока вылетит исключение.
clearOldParts();
{
@ -785,6 +786,9 @@ void StorageMergeTree::mergeThread(bool while_can, bool aggressive)
if (shutdown_called)
break;
/// Удаляем куски, которые мы только что сливали.
clearOldParts();
if (!while_can)
break;
}