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

Remove check_columns argument from MergeTree code (false was never passed)

Browse Source
This commit is contained in:
Azat Khuzhin 2021-10-21 00:56:17 +03:00
parent fa1b587635
commit 496aa43a9f
7 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Processors/QueryPlan/ReadFromMergeTree.cpp
View File

@ -135,7 +135,6 @@ Pipe ReadFromMergeTree::readFromPool(
data,
metadata_snapshot,
prewhere_info,
true,
required_columns,
backoff_settings,
settings.preferred_block_size_bytes,
@ -174,7 +173,7 @@ ProcessorPtr ReadFromMergeTree::createSource(
return std::make_shared<TSource>(
data, metadata_snapshot, part.data_part, max_block_size, preferred_block_size_bytes,
preferred_max_column_in_block_size_bytes, required_columns, part.ranges, use_uncompressed_cache, prewhere_info,
actions_settings, true, reader_settings, virt_column_names, part.part_index_in_query, has_limit_below_one_block);
actions_settings, reader_settings, virt_column_names, part.part_index_in_query, has_limit_below_one_block);
}
Pipe ReadFromMergeTree::readInOrder(

14
src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
View File

@ -260,8 +260,7 @@ MergeTreeReadTaskColumns getReadTaskColumns(
const StorageMetadataPtr & metadata_snapshot,
const MergeTreeData::DataPartPtr & data_part,
const Names & required_columns,
const PrewhereInfoPtr & prewhere_info,
bool check_columns)
const PrewhereInfoPtr & prewhere_info)
{
Names column_names = required_columns;
Names pre_column_names;
@ -308,18 +307,9 @@ MergeTreeReadTaskColumns getReadTaskColumns(
MergeTreeReadTaskColumns result;
if (check_columns)
{
const auto & columns = metadata_snapshot->getColumns();
auto columns = metadata_snapshot->getColumns();
result.pre_columns = columns.getByNames(ColumnsDescription::All, pre_column_names, true);
result.columns = columns.getByNames(ColumnsDescription::All, column_names, true);
}
else
{
result.pre_columns = data_part->getColumns().addTypes(pre_column_names);
result.columns = data_part->getColumns().addTypes(column_names);
}
result.should_reorder = should_reorder;
return result;

3
src/Storages/MergeTree/MergeTreeBlockReadUtils.h
View File

@ -78,8 +78,7 @@ MergeTreeReadTaskColumns getReadTaskColumns(
const StorageMetadataPtr & metadata_snapshot,
const MergeTreeData::DataPartPtr & data_part,
const Names & required_columns,
const PrewhereInfoPtr & prewhere_info,
bool check_columns);
const PrewhereInfoPtr & prewhere_info);
struct MergeTreeBlockSizePredictor
{

8
src/Storages/MergeTree/MergeTreeReadPool.cpp
View File

@ -25,7 +25,6 @@ MergeTreeReadPool::MergeTreeReadPool(
const MergeTreeData & data_,
const StorageMetadataPtr & metadata_snapshot_,
const PrewhereInfoPtr & prewhere_info_,
const bool check_columns_,
const Names & column_names_,
const BackoffSettings & backoff_settings_,
size_t preferred_block_size_bytes_,
@ -41,7 +40,7 @@ MergeTreeReadPool::MergeTreeReadPool(
, parts_ranges{std::move(parts_)}
{
/// parts don't contain duplicate MergeTreeDataPart's.
const auto per_part_sum_marks = fillPerPartInfo(parts_ranges, check_columns_);
const auto per_part_sum_marks = fillPerPartInfo(parts_ranges);
fillPerThreadInfo(threads_, sum_marks_, per_part_sum_marks, parts_ranges, min_marks_for_concurrent_read_);
}
@ -187,8 +186,7 @@ void MergeTreeReadPool::profileFeedback(const ReadBufferFromFileBase::ProfileInf
}
std::vector<size_t> MergeTreeReadPool::fillPerPartInfo(
const RangesInDataParts & parts, const bool check_columns)
std::vector<size_t> MergeTreeReadPool::fillPerPartInfo(const RangesInDataParts & parts)
{
std::vector<size_t> per_part_sum_marks;
Block sample_block = metadata_snapshot->getSampleBlock();
@ -204,7 +202,7 @@ std::vector<size_t> MergeTreeReadPool::fillPerPartInfo(
per_part_sum_marks.push_back(sum_marks);
auto task_columns = getReadTaskColumns(data, metadata_snapshot, part.data_part, column_names, prewhere_info, check_columns);
auto task_columns = getReadTaskColumns(data, metadata_snapshot, part.data_part, column_names, prewhere_info);
auto size_predictor = !predict_block_size_bytes ? nullptr
: MergeTreeBaseSelectProcessor::getSizePredictor(part.data_part, task_columns, sample_block);

5
src/Storages/MergeTree/MergeTreeReadPool.h
View File

@ -73,7 +73,7 @@ public:
const size_t threads_, const size_t sum_marks_, const size_t min_marks_for_concurrent_read_,
RangesInDataParts && parts_, const MergeTreeData & data_, const StorageMetadataPtr & metadata_snapshot_,
const PrewhereInfoPtr & prewhere_info_,
const bool check_columns_, const Names & column_names_,
const Names & column_names_,
const BackoffSettings & backoff_settings_, size_t preferred_block_size_bytes_,
const bool do_not_steal_tasks_ = false);
@ -88,8 +88,7 @@ public:
Block getHeader() const;
private:
std::vector<size_t> fillPerPartInfo(
const RangesInDataParts & parts, const bool check_columns);
std::vector<size_t> fillPerPartInfo(const RangesInDataParts & parts);
void fillPerThreadInfo(
const size_t threads, const size_t sum_marks, std::vector<size_t> per_part_sum_marks,

4
src/Storages/MergeTree/MergeTreeSelectProcessor.cpp
View File

@ -19,7 +19,6 @@ MergeTreeSelectProcessor::MergeTreeSelectProcessor(
bool use_uncompressed_cache_,
const PrewhereInfoPtr & prewhere_info_,
ExpressionActionsSettings actions_settings,
bool check_columns_,
const MergeTreeReaderSettings & reader_settings_,
const Names & virt_column_names_,
size_t part_index_in_query_,
@ -35,7 +34,6 @@ MergeTreeSelectProcessor::MergeTreeSelectProcessor(
all_mark_ranges(std::move(mark_ranges_)),
part_index_in_query(part_index_in_query_),
has_limit_below_one_block(has_limit_below_one_block_),
check_columns(check_columns_),
total_rows(data_part->index_granularity.getRowsCountInRanges(all_mark_ranges))
{
addTotalRowsApprox(total_rows);
@ -46,7 +44,7 @@ void MergeTreeSelectProcessor::initializeReaders()
{
task_columns = getReadTaskColumns(
storage, metadata_snapshot, data_part,
required_columns, prewhere_info, check_columns);
required_columns, prewhere_info);
/// Will be used to distinguish between PREWHERE and WHERE columns when applying filter
const auto & column_names = task_columns.columns.getNames();

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

@ -28,7 +28,6 @@ public:
bool use_uncompressed_cache,
const PrewhereInfoPtr & prewhere_info,
ExpressionActionsSettings actions_settings,
bool check_columns_,
const MergeTreeReaderSettings & reader_settings,
const Names & virt_column_names = {},
size_t part_index_in_query_ = 0,
@ -66,7 +65,6 @@ protected:
/// It reduces amount of read data for queries with small LIMIT.
bool has_limit_below_one_block = false;
bool check_columns;
size_t total_rows = 0;
};