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

ISSUES-2581 fix name

Browse Source
This commit is contained in:
VadimPE 2018-10-10 19:20:15 +03:00
parent cc2686cdf1
commit 4db6eab5a3
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
View File

@ -137,11 +137,11 @@ BlockInputStreams MergeTreeDataSelectExecutor::read(
const Context & context,
const size_t max_block_size,
const unsigned num_streams,
const PartitionIdToMaxBlock * max_blocks_number_to_read) const
const PartitionIdToMaxBlock * max_block_numbers_to_read) const
{
return readFromParts(
data.getDataPartsVector(), column_names_to_return, query_info, context,
max_block_size, num_streams, max_blocks_number_to_read);
max_block_size, num_streams, max_block_numbers_to_read);
}
BlockInputStreams MergeTreeDataSelectExecutor::readFromParts(
@ -151,7 +151,7 @@ BlockInputStreams MergeTreeDataSelectExecutor::readFromParts(
const Context & context,
const size_t max_block_size,
const unsigned num_streams,
const PartitionIdToMaxBlock * max_blocks_number_to_read) const
const PartitionIdToMaxBlock * max_block_numbers_to_read) const
{
size_t part_index = 0;
@ -271,10 +271,10 @@ BlockInputStreams MergeTreeDataSelectExecutor::readFromParts(
part->minmax_idx.parallelogram, data.minmax_idx_column_types))
continue;
if (max_blocks_number_to_read)
if (max_block_numbers_to_read)
{
auto blocks_iterator = max_blocks_number_to_read->find(part->info.partition_id);
if (blocks_iterator == max_blocks_number_to_read->end() || part->info.max_block > blocks_iterator->second)
auto blocks_iterator = max_block_numbers_to_read->find(part->info.partition_id);
if (blocks_iterator == max_block_numbers_to_read->end() || part->info.max_block > blocks_iterator->second)
continue;
}

6
dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
View File

@ -20,7 +20,7 @@ public:
MergeTreeDataSelectExecutor(MergeTreeData & data_);
/** When reading, selects a set of parts that covers the desired range of the index.
* max_blocks_number_to_read - if not empty, do not read all the parts whose right border is greater than max_block in partition.
* max_blocks_number_to_read - if not nullptr, do not read all the parts whose right border is greater than max_block in partition.
*/
using PartitionIdToMaxBlock = std::unordered_map<String, Int64>;
@ -30,7 +30,7 @@ public:
const Context & context,
size_t max_block_size,
unsigned num_streams,
const PartitionIdToMaxBlock * max_blocks_number_to_read = nullptr) const;
const PartitionIdToMaxBlock * max_block_numbers_to_read = nullptr) const;
BlockInputStreams readFromParts(
MergeTreeData::DataPartsVector parts,
@ -39,7 +39,7 @@ public:
const Context & context,
size_t max_block_size,
unsigned num_streams,
const PartitionIdToMaxBlock * max_blocks_number_to_read = nullptr) const;
const PartitionIdToMaxBlock * max_block_numbers_to_read = nullptr) const;
private:
MergeTreeData & data;