thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 16:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLICKHOUSE-3943: Change naming

Browse Source
This commit is contained in:
alesapin 2018-10-04 11:52:56 +03:00
parent 252f9d0080
commit 5a218a7363
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/src/Storages/MergeTree/MergeTreeThreadBlockInputStream.cpp
View File

@ -92,7 +92,7 @@ bool MergeTreeThreadBlockInputStream::getNewTask()
else
{
/// in other case we can reuse readers, they stopped exactly at required position
if (last_task_end_mark != current_task_first_mark || path != last_readed_part)
if (last_task_end_mark != current_task_first_mark || path != last_readed_part_path)
{
/// retain avg_value_size_hints
reader = std::make_unique<MergeTreeReader>(
@ -107,7 +107,7 @@ bool MergeTreeThreadBlockInputStream::getNewTask()
max_read_buffer_size, pre_reader->getAvgValueSizeHints(), profile_callback);
}
}
last_readed_part = path;
last_readed_part_path = path;
last_task_end_mark = current_task_end_mark;
return true;

2
dbms/src/Storages/MergeTree/MergeTreeThreadBlockInputStream.h
View File

@ -47,7 +47,7 @@ private:
/// Last readed mark in task for this thread
size_t last_task_end_mark;
/// Last part readed in this thread
std::string last_readed_part;
std::string last_readed_part_path;
/// Names from header. Used in order to order columns in read blocks.
Names ordered_names;
};