thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-10-05 08:00:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

polymorphic parts (development)

Browse Source
This commit is contained in:
CurtizJ 2019-11-21 20:05:03 +03:00
parent 94abf3691c
commit 43b4c4c5f4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dbms/src/Storages/MergeTree/MergeTreeReaderStream.cpp
View File

@ -108,13 +108,13 @@ void MergeTreeReaderStream::initMarksLoader()
if (marks_loader.initialized())
return;
std::string mrk_path = index_granularity_info->getMarksFilePath(path_prefix);
auto load = [&]() -> MarkCache::MappedPtr
auto load = [this]() -> MarkCache::MappedPtr
{
/// Memory for marks must not be accounted as memory usage for query, because they are stored in shared cache.
auto temporarily_disable_memory_tracker = getCurrentMemoryTrackerActionLock();
std::string mrk_path = index_granularity_info->getMarksFilePath(path_prefix);
size_t file_size = Poco::File(mrk_path).getSize();
size_t expected_file_size = index_granularity_info->mark_size_in_bytes * marks_count;
if (expected_file_size != file_size)
@ -150,6 +150,7 @@ void MergeTreeReaderStream::initMarksLoader()
return res;
};
auto mrk_path = index_granularity_info->getMarksFilePath(path_prefix);
marks_loader = MergeTreeMarksLoader{mark_cache, mrk_path, load, save_marks_in_cache};
}