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

Use function getSampleBlockNonMaterialized() to simplify the solution

Browse Source
This commit is contained in:
Vitaly Baranov 2019-05-31 21:31:09 +03:00 committed by GitHub
parent e527def18a
commit 421c6a90e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dbms/src/Storages/StorageDistributed.cpp
View File

@ -84,21 +84,17 @@ ASTPtr rewriteSelectQuery(const ASTPtr & query, const std::string & database, co
/// The columns list in the original INSERT query is incorrect because inserted blocks are transformed /// The columns list in the original INSERT query is incorrect because inserted blocks are transformed
/// to the form of the sample block of the Distributed table. So we rewrite it and add all columns from /// to the form of the sample block of the Distributed table. So we rewrite it and add all columns from
/// the sample block instead. /// the sample block instead.
ASTPtr createInsertToRemoteTableQuery(const std::string & database, const std::string & table, const Block & sample_block, const ColumnsDescription & columns) ASTPtr createInsertToRemoteTableQuery(const std::string & database, const std::string & table, const Block & sample_block_non_materialized)
{ {
auto query = std::make_shared<ASTInsertQuery>(); auto query = std::make_shared<ASTInsertQuery>();
query->database = database; query->database = database;
query->table = table; query->table = table;
auto block_columns = std::make_shared<ASTExpressionList>(); auto columns = std::make_shared<ASTExpressionList>();
query->columns = block_columns; query->columns = columns;
query->children.push_back(block_columns); query->children.push_back(columns);
for (const auto & col : sample_block) for (const auto & col : sample_block_non_materialized)
{ columns->children.push_back(std::make_shared<ASTIdentifier>(col.name));
if (columns.get(col.name).default_desc.kind == DB::ColumnDefaultKind::Materialized)
continue;
block_columns->children.push_back(std::make_shared<ASTIdentifier>(col.name));
}
return query; return query;
} }
@ -335,11 +331,9 @@ BlockOutputStreamPtr StorageDistributed::write(const ASTPtr &, const Context & c
bool insert_sync = settings.insert_distributed_sync || owned_cluster; bool insert_sync = settings.insert_distributed_sync || owned_cluster;
auto timeout = settings.insert_distributed_timeout; auto timeout = settings.insert_distributed_timeout;
const ColumnsDescription & columns = getColumns();
/// DistributedBlockOutputStream will not own cluster, but will own ConnectionPools of the cluster /// DistributedBlockOutputStream will not own cluster, but will own ConnectionPools of the cluster
return std::make_shared<DistributedBlockOutputStream>( return std::make_shared<DistributedBlockOutputStream>(
context, *this, createInsertToRemoteTableQuery(remote_database, remote_table, getSampleBlock(), columns), cluster, context, *this, createInsertToRemoteTableQuery(remote_database, remote_table, getSampleBlockNonMaterialized()), cluster,
insert_sync, timeout); insert_sync, timeout);
} }