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

dbms: tiny improvement [#METR-10931].

Browse Source
This commit is contained in:
Alexey Milovidov 2014-04-23 02:58:05 +04:00 committed by Sergey Magidovich
parent bd5845338b
commit 5d8435c079
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dbms/include/DB/Storages/MergeTree/MergeTreeBlockInputStream.h
View File

@ -85,9 +85,9 @@ protected:
if (!reader)
{
UncompressedCache * uncompressed_cache = use_uncompressed_cache ? storage.context.getUncompressedCache() : NULL;
reader = new MergeTreeReader(path, column_names, uncompressed_cache, storage);
reader.reset(new MergeTreeReader(path, column_names, uncompressed_cache, storage));
if (prewhere_actions)
pre_reader = new MergeTreeReader(path, pre_column_names, uncompressed_cache, storage);
pre_reader.reset(new MergeTreeReader(path, pre_column_names, uncompressed_cache, storage));
}
if (prewhere_actions)
@ -245,7 +245,7 @@ protected:
* Чтобы при создании многих источников, но одновременном чтении только из нескольких,
* буферы не висели в памяти.
*/
reader = nullptr;
reader.reset();
}
return res;
@ -263,8 +263,8 @@ private:
MarkRanges remaining_mark_ranges; /// В каких диапазонах засечек еще не прочли.
/// В порядке убывания номеров, чтобы можно было выбрасывать из конца.
bool use_uncompressed_cache;
Poco::SharedPtr<MergeTreeReader> reader;
Poco::SharedPtr<MergeTreeReader> pre_reader;
std::unique_ptr<MergeTreeReader> reader;
std::unique_ptr<MergeTreeReader> pre_reader;
ExpressionActionsPtr prewhere_actions;
String prewhere_column;
bool remove_prewhere_column;