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

fix build

Browse Source
This commit is contained in:
yariks5s 2024-05-17 15:58:40 +00:00
parent 6b835522b3
commit ef9bfbd85a
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Interpreters/InterpreterInsertQuery.cpp
View File

@ -630,10 +630,7 @@ BlockIO InterpreterInsertQuery::execute()
pipeline.addSimpleTransform([&](const Block & in_header) -> ProcessorPtr pipeline.addSimpleTransform([&](const Block & in_header) -> ProcessorPtr
{ {
return std::make_shared<ApplySquashingTransform>( return std::make_shared<ApplySquashingTransform>(in_header);
in_header,
table_prefers_large_blocks ? settings.min_insert_block_size_rows : settings.max_block_size,
table_prefers_large_blocks ? settings.min_insert_block_size_bytes : 0ULL);
}); });
} }
else else
@ -699,10 +696,7 @@ BlockIO InterpreterInsertQuery::execute()
if (settings.allow_insert_threads_reduction_optimizaion) if (settings.allow_insert_threads_reduction_optimizaion)
{ {
auto squashing = std::make_shared<ApplySquashingTransform>( auto squashing = std::make_shared<ApplySquashingTransform>(chain.getInputHeader());
chain.getInputHeader(),
table_prefers_large_blocks ? settings.min_insert_block_size_rows : settings.max_block_size,
table_prefers_large_blocks ? settings.min_insert_block_size_bytes : 0ULL);
chain.addSource(std::move(squashing)); chain.addSource(std::move(squashing));

10
src/Processors/Transforms/buildPushingToViewsChain.cpp
View File

@ -374,10 +374,7 @@ std::optional<Chain> generateViewChain(
if (settings.allow_insert_threads_reduction_optimizaion) if (settings.allow_insert_threads_reduction_optimizaion)
{ {
out.addSource(std::make_shared<ApplySquashingTransform>( out.addSource(std::make_shared<ApplySquashingTransform>(out.getInputHeader()));
out.getInputHeader(),
table_prefers_large_blocks ? settings.min_insert_block_size_rows : settings.max_block_size,
table_prefers_large_blocks ? settings.min_insert_block_size_bytes : 0ULL));
out.addSource(std::make_shared<PlanSquashingTransform>( out.addSource(std::make_shared<PlanSquashingTransform>(
out.getInputHeader(), out.getInputHeader(),
@ -643,10 +640,7 @@ static QueryPipeline process(Block block, ViewRuntimeData & view, const ViewsDat
context->getSettingsRef().min_insert_block_size_rows, context->getSettingsRef().min_insert_block_size_rows,
context->getSettingsRef().min_insert_block_size_bytes, context->getSettingsRef().min_insert_block_size_bytes,
pipeline.getNumStreams())); pipeline.getNumStreams()));
pipeline.addTransform(std::make_shared<ApplySquashingTransform>( pipeline.addTransform(std::make_shared<ApplySquashingTransform>(pipeline.getHeader()));
pipeline.getHeader(),
context->getSettingsRef().min_insert_block_size_rows,
context->getSettingsRef().min_insert_block_size_bytes));
auto converting = ActionsDAG::makeConvertingActions( auto converting = ActionsDAG::makeConvertingActions(
pipeline.getHeader().getColumnsWithTypeAndName(), pipeline.getHeader().getColumnsWithTypeAndName(),

2
src/Storages/ProjectionsDescription.cpp
View File

@ -314,7 +314,7 @@ Block ProjectionDescription::calculate(const Block & block, ContextPtr context)
if (mut_context->getSettings().allow_insert_threads_reduction_optimizaion) if (mut_context->getSettings().allow_insert_threads_reduction_optimizaion)
{ {
builder.addTransform(std::make_shared<PlanSquashingTransform>(builder.getHeader(), block.rows(), 0, 1)); builder.addTransform(std::make_shared<PlanSquashingTransform>(builder.getHeader(), block.rows(), 0, 1));
builder.addTransform(std::make_shared<ApplySquashingTransform>(builder.getHeader(), block.rows(), 0)); builder.addTransform(std::make_shared<ApplySquashingTransform>(builder.getHeader()));
} }
else else
{ {