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

Merge

Browse Source
This commit is contained in:
Andrey Mironov 2015-08-31 23:22:06 +03:00
parent 7b818fe243
commit bc5007fc36
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dbms/include/DB/Storages/MergeTree/MergeTreeReader.h
View File

@ -156,7 +156,6 @@ private:
struct Stream
{
MarkCache::MappedPtr marks;
Memory & memory;
ReadBuffer * data_buffer;
std::unique_ptr<CachedCompressedReadBuffer> cached_buffer;
std::unique_ptr<CompressedReadBufferFromFile> non_cached_buffer;
@ -169,7 +168,7 @@ private:
Stream(
const String & path_prefix_, UncompressedCache * uncompressed_cache, MarkCache * mark_cache,
const MarkRanges & all_mark_ranges, size_t aio_threshold, size_t max_read_buffer_size, Memory & memory)
: memory(memory), path_prefix(path_prefix_)
: path_prefix(path_prefix_)
{
loadMarks(mark_cache);
size_t max_mark_range = 0;