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

Merge

Browse Source
This commit is contained in:
Michael Kolupaev 2014-07-07 16:23:59 +04:00
parent c5c63b6111
commit cdc937b31a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Storages/tests/MergeLogicTester.cpp
View File

@ -253,7 +253,7 @@ void updateStat(int time)
/// выбрать кого мерджить, оценить время и добавить событие об окончании
bool makeMerge(int cur_time) {
if (getThreads(data_parts) >= settings.merging_threads) return 0;
if (getThreads(data_parts) >= DBMS_DEFAULT_BACKGROUND_POOL_SIZE) return 0;
if (mergeScheduled == 0) return 0;
mergeScheduled --;
std::vector<DataPtr> e;