thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-10-23 08:50:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small enhancements. [#CLICKHOUSE-3452]

Browse Source
This commit is contained in:
Vitaliy Lyudvichenko 2017-11-29 14:54:37 +03:00
parent 9229961721
commit 2afbd8bcee
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp
View File

@ -187,7 +187,7 @@ bool MergeTreeDataMerger::selectPartsToMerge(
if (prev_part && part->info.partition_id == (*prev_part)->info.partition_id
&& part->info.min_block < (*prev_part)->info.max_block)
{
LOG_ERROR(log, "Part " << part->getNameWithState() << " intersects previous part " << (*prev_part)->getNameWithState());
LOG_ERROR(log, "Part " << part->name << " intersects previous part " << (*prev_part)->name);
}
prev_part = &part;

19
dbms/src/Storages/System/StorageSystemParts.cpp
View File

@ -53,11 +53,22 @@ BlockInputStreams StorageSystemParts::read(
const size_t max_block_size,
const unsigned num_streams)
{
//check(column_names);
processed_stage = QueryProcessingStage::FetchColumns;
bool has_state_column = false;
Names real_column_names;
auto it_state_column = std::find(column_names.begin(), column_names.end(), "_state");
bool has_state_column = it_state_column != column_names.end();
for (const String & column_name : column_names)
{
if (column_name == "_state")
has_state_column = true;
else
real_column_names.emplace_back(column_name);
}
/// Do not check if only _state column is requested
if (!(has_state_column && real_column_names.empty()))
check(real_column_names);
processed_stage = QueryProcessingStage::FetchColumns;
/// Will apply WHERE to subset of columns and then add more columns.
/// This is kind of complicated, but we use WHERE to do less work.