thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 16:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:yandex/ClickHouse

Browse Source
This commit is contained in:
Alexey Milovidov 2017-07-26 00:07:13 +03:00
commit de1f4f4c5b
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -952,7 +952,7 @@ void InterpreterSelectQuery::executeAggregation(ExpressionActionsPtr expression,
max_streams,
settings.aggregation_memory_efficient_merge_threads
? static_cast<size_t>(settings.aggregation_memory_efficient_merge_threads)
: max_streams);
: static_cast<size_t>(settings.max_threads));
stream_with_non_joined_data = nullptr;
streams.resize(1);
@ -1013,8 +1013,8 @@ void InterpreterSelectQuery::executeMergeAggregated(bool overflow_row, bool fina
streams[0] = std::make_shared<MergingAggregatedMemoryEfficientBlockInputStream>(streams, params, final,
max_streams,
settings.aggregation_memory_efficient_merge_threads
? size_t(settings.aggregation_memory_efficient_merge_threads)
: size_t(settings.max_threads));
? static_cast<size_t>(settings.aggregation_memory_efficient_merge_threads)
: static_cast<size_t>(settings.max_threads));
streams.resize(1);
}

8
dbms/tests/integration/test_insert_into_distributed/configs/enable_distributed_inserts_batching.xml Normal file
View File

@ -0,0 +1,8 @@
<yandex>
<profiles>
<default>
<distributed_directory_monitor_batch_inserts>1</distributed_directory_monitor_batch_inserts>
<min_insert_block_size_rows>3</min_insert_block_size_rows>
</default>
</profiles>
</yandex>

7
dbms/tests/integration/test_insert_into_distributed/configs/forbid_background_merges.xml Normal file
View File

@ -0,0 +1,7 @@
<yandex>
<profiles>
<default>
<background_pool_size>0</background_pool_size>
</default>
</profiles>
</yandex>