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

Merge

Browse Source
This commit is contained in:
Michael Kolupaev 2012-12-06 13:07:29 +00:00
parent 35184afdc2
commit 2b9f4ca2bf
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dbms/include/DB/Storages/StorageMergeTree.h
View File

@ -152,6 +152,9 @@ private:
ASTPtr primary_expr_ast;
String date_column_name;
size_t index_granularity;
size_t min_marks_for_seek;
size_t min_marks_for_concurrent_read;
/// Для схлопывания записей об изменениях, если это требуется.
String sign_column;

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

@ -523,7 +523,7 @@ public:
if (may_be_true)
{
/// Увидели полезный промежуток между соседними засечками. Либо добавим его к последнему диапазону, либо начнем новый диапазон.
if (res.empty() || (current_mark_number - 1) - res.back().end > storage.settings.min_rows_for_seek)
if (res.empty() || (current_mark_number - 1) - res.back().end > storage.min_marks_for_seek)
{
res.push_back(MarkRange(current_mark_number - 1, current_mark_number));
}
@ -741,6 +741,9 @@ StorageMergeTree::StorageMergeTree(
settings(settings_),
increment(full_path + "increment.txt"), log(&Logger::get("StorageMergeTree: " + name))
{
min_marks_for_seek = (settings.min_rows_for_seek + index_granularity - 1) / index_granularity;
min_marks_for_concurrent_read = (settings.min_rows_for_concurrent_read + index_granularity - 1) / index_granularity;
/// создаём директорию, если её нет
Poco::File(full_path).createDirectories();
@ -874,13 +877,13 @@ BlockInputStreams StorageMergeTree::spreadMarkRangesAmongThreads(RangesInDataPar
size_t & marks_in_part = sum_marks_in_parts.back();
/// Не будем брать из куска слишком мало строк.
if (marks_in_part >= settings.min_rows_for_concurrent_read &&
need_marks < settings.min_rows_for_concurrent_read)
need_marks = settings.min_rows_for_concurrent_read;
if (marks_in_part >= min_marks_for_concurrent_read &&
need_marks < min_marks_for_concurrent_read)
need_marks = min_marks_for_concurrent_read;
/// Не будем оставлять в куске слишком мало строк.
if (marks_in_part > need_marks &&
marks_in_part - need_marks < settings.min_rows_for_concurrent_read)
marks_in_part - need_marks < min_marks_for_concurrent_read)
need_marks = marks_in_part;
/// Возьмем весь кусок, если он достаточно мал.