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

Fix build after merge

Browse Source
This commit is contained in:
Alexander Gololobov 2023-02-12 22:48:28 +01:00
parent 3ad0683de9
commit a89465d1cb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Storages/MergeTree/MergeTreePrefetchedReadPool.cpp
View File

@ -31,6 +31,7 @@ MergeTreePrefetchedReadPool::MergeTreePrefetchedReadPool(
RangesInDataParts && parts_, RangesInDataParts && parts_,
const StorageSnapshotPtr & storage_snapshot_, const StorageSnapshotPtr & storage_snapshot_,
const PrewhereInfoPtr & prewhere_info_, const PrewhereInfoPtr & prewhere_info_,
const ExpressionActionsSettings & actions_settings_,
const Names & column_names_, const Names & column_names_,
const Names & virtual_column_names_, const Names & virtual_column_names_,
size_t preferred_block_size_bytes_, size_t preferred_block_size_bytes_,
@ -45,6 +46,8 @@ MergeTreePrefetchedReadPool::MergeTreePrefetchedReadPool(
virtual_column_names_, virtual_column_names_,
min_marks_for_concurrent_read_, min_marks_for_concurrent_read_,
prewhere_info_, prewhere_info_,
actions_settings_,
reader_settings_,
parts_, parts_,
(preferred_block_size_bytes_ > 0), (preferred_block_size_bytes_ > 0),
/*do_not_steal_tasks_*/false) /*do_not_steal_tasks_*/false)
@ -53,7 +56,6 @@ MergeTreePrefetchedReadPool::MergeTreePrefetchedReadPool(
, header(storage_snapshot_->getSampleBlockForColumns(column_names_)) , header(storage_snapshot_->getSampleBlockForColumns(column_names_))
, mark_cache(context_->getGlobalContext()->getMarkCache().get()) , mark_cache(context_->getGlobalContext()->getMarkCache().get())
, uncompressed_cache(use_uncompressed_cache_ ? context_->getGlobalContext()->getUncompressedCache().get() : nullptr) , uncompressed_cache(use_uncompressed_cache_ ? context_->getGlobalContext()->getUncompressedCache().get() : nullptr)
, reader_settings(reader_settings_)
, profile_callback([this](ReadBufferFromFileBase::ProfileInfo info_) { profileFeedback(info_); }) , profile_callback([this](ReadBufferFromFileBase::ProfileInfo info_) { profileFeedback(info_); })
, index_granularity_bytes(storage_settings_.index_granularity_bytes) , index_granularity_bytes(storage_settings_.index_granularity_bytes)
, fixed_index_granularity(storage_settings_.index_granularity) , fixed_index_granularity(storage_settings_.index_granularity)
@ -326,6 +328,8 @@ MergeTreePrefetchedReadPool::PartsInfos MergeTreePrefetchedReadPool::getPartsInf
column_names, column_names,
virtual_column_names, virtual_column_names,
prewhere_info, prewhere_info,
actions_settings,
reader_settings,
/* with_subcolumns */true); /* with_subcolumns */true);
part_info->size_predictor = !predict_block_size_bytes part_info->size_predictor = !predict_block_size_bytes

2
src/Storages/MergeTree/MergeTreePrefetchedReadPool.h
View File

@ -25,6 +25,7 @@ public:
RangesInDataParts && parts_, RangesInDataParts && parts_,
const StorageSnapshotPtr & storage_snapshot_, const StorageSnapshotPtr & storage_snapshot_,
const PrewhereInfoPtr & prewhere_info_, const PrewhereInfoPtr & prewhere_info_,
const ExpressionActionsSettings & actions_settings_,
const Names & column_names_, const Names & column_names_,
const Names & virtual_column_names_, const Names & virtual_column_names_,
size_t preferred_block_size_bytes_, size_t preferred_block_size_bytes_,
@ -80,7 +81,6 @@ private:
Block header; Block header;
MarkCache * mark_cache; MarkCache * mark_cache;
UncompressedCache * uncompressed_cache; UncompressedCache * uncompressed_cache;
MergeTreeReaderSettings reader_settings;
ReadBufferFromFileBase::ProfileCallback profile_callback; ReadBufferFromFileBase::ProfileCallback profile_callback;
size_t index_granularity_bytes; size_t index_granularity_bytes;
size_t fixed_index_granularity; size_t fixed_index_granularity;