thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 23:52:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixup #ci_set_analyzer

Browse Source
This commit is contained in:
Dmitry Novik 2024-03-15 14:22:46 +00:00
parent 1cae77997a
commit 061cd5a53d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Storages/StorageMerge.cpp
View File

@ -1056,7 +1056,7 @@ QueryPipelineBuilderPtr ReadFromMerge::createSources(
String table_column = table_alias.empty() || processed_stage == QueryProcessingStage::FetchColumns ? "_table" : table_alias + "._table";
if (has_database_virtual_column && common_header.has(database_column)
&& (storage_stage == QueryProcessingStage::FetchColumns || (dynamic_cast<const StorageDistributed *>(&storage_snapshot_->storage) != nullptr && !pipe_header.has("'" + database_name + "'_String"))))
&& (storage_stage == QueryProcessingStage::FetchColumns || !pipe_header.has("'" + database_name + "'_String")))
{
ColumnWithTypeAndName column;
column.name = database_column;
@ -1072,7 +1072,7 @@ QueryPipelineBuilderPtr ReadFromMerge::createSources(
}
if (has_table_virtual_column && common_header.has(table_column)
&& (storage_stage == QueryProcessingStage::FetchColumns || (dynamic_cast<const StorageDistributed *>(&storage_snapshot_->storage) != nullptr && !pipe_header.has("'" + table_name + "'_String"))))
&& (storage_stage == QueryProcessingStage::FetchColumns || !pipe_header.has("'" + table_name + "'_String")))
{
ColumnWithTypeAndName column;
column.name = table_column;
@ -1121,7 +1121,7 @@ QueryPipelineBuilderPtr ReadFromMerge::createSources(
/// Subordinary tables could have different but convertible types, like numeric types of different width.
/// We must return streams with structure equals to structure of Merge table.
convertAndFilterSourceStream(
header, modified_query_info, storage_snapshot_, aliases, row_policy_data_opt, context, *builder, processed_stage);
header, modified_query_info, storage_snapshot_, aliases, row_policy_data_opt, context, *builder, storage_stage);
}
return builder;