thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-17 21:24:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
Vxider 2019-12-17 16:18:17 +08:00
parent f31d61e450
commit 0490510b0b
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dbms/src/Interpreters/InterpreterInsertQuery.cpp
View File

@ -99,6 +99,7 @@ BlockIO InterpreterInsertQuery::execute()
const auto & query = query_ptr->as<ASTInsertQuery &>();
checkAccess(query);
BlockIO res;
StoragePtr table = getTable(query);
auto table_lock = table->lockStructureForShare(true, context.getInitialQueryId());
@ -176,9 +177,6 @@ BlockIO InterpreterInsertQuery::execute()
res.in = std::make_shared<NullAndDoCopyBlockInputStream>(in_streams, out_streams);
res.in = std::make_shared<ConvertingBlockInputStream>(context, res.in, out->getHeader(), ConvertingBlockInputStream::MatchColumnsMode::Position);
res.in = std::make_shared<NullAndDoCopyBlockInputStream>(res.in, out);
if (!allow_materialized)
{
for (const auto & column : table->getColumns())
@ -190,7 +188,7 @@ BlockIO InterpreterInsertQuery::execute()
{
res.out = std::move(out_streams.at(0));
res.in = std::make_shared<InputStreamFromASTInsertQuery>(query_ptr, nullptr, query_sample_block, context, nullptr);
res.in = std::make_shared<NullAndDoCopyBlockInputStream>(res.in, out);
res.in = std::make_shared<NullAndDoCopyBlockInputStream>(res.in, res.out);
}
else
res.out = std::move(out_streams.at(0));