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

update setting name

Browse Source
This commit is contained in:
Vxider 2020-03-20 01:04:59 +08:00
parent 28dd543973
commit 706eeb67a8
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Core/Settings.h
View File

@ -112,7 +112,7 @@ struct Settings : public SettingsCollection<Settings>
M(SettingBool, skip_unavailable_shards, false, "If 1, ClickHouse silently skips unavailable shards and nodes unresolvable through DNS. Shard is marked as unavailable when none of the replicas can be reached.", 0) \ M(SettingBool, skip_unavailable_shards, false, "If 1, ClickHouse silently skips unavailable shards and nodes unresolvable through DNS. Shard is marked as unavailable when none of the replicas can be reached.", 0) \
\ \
M(SettingBool, distributed_group_by_no_merge, false, "Do not merge aggregation states from different servers for distributed query processing - in case it is for certain that there are different keys on different shards.", 0) \ M(SettingBool, distributed_group_by_no_merge, false, "Do not merge aggregation states from different servers for distributed query processing - in case it is for certain that there are different keys on different shards.", 0) \
M(SettingBool, distributed_insert_select, false, "If true, distributed insert select query in the same cluster will be processed on local tables on every shard", 0) \ M(SettingBool, parallel_distributed_insert_select, false, "If true, distributed insert select query in the same cluster will be processed on local tables on every shard", 0) \
M(SettingBool, optimize_skip_unused_shards, false, "Assumes that data is distributed by sharding_key. Optimization to skip unused shards if SELECT query filters by sharding_key.", 0) \ M(SettingBool, optimize_skip_unused_shards, false, "Assumes that data is distributed by sharding_key. Optimization to skip unused shards if SELECT query filters by sharding_key.", 0) \
M(SettingUInt64, force_optimize_skip_unused_shards, 0, "Throw an exception if unused shards cannot be skipped (1 - throw only if the table has the sharding key, 2 - always throw.", 0) \ M(SettingUInt64, force_optimize_skip_unused_shards, 0, "Throw an exception if unused shards cannot be skipped (1 - throw only if the table has the sharding key, 2 - always throw.", 0) \
\ \

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

@ -118,7 +118,7 @@ BlockIO InterpreterInsertQuery::execute()
BlockOutputStreams out_streams; BlockOutputStreams out_streams;
bool is_distributed_insert_select = false; bool is_distributed_insert_select = false;
if (query.select && table->isRemote() && settings.distributed_insert_select) if (query.select && table->isRemote() && settings.parallel_distributed_insert_select)
{ {
// Distributed INSERT SELECT // Distributed INSERT SELECT
std::shared_ptr<StorageDistributed> storage_src; std::shared_ptr<StorageDistributed> storage_src;

0
dbms/tests/queries/0_stateless/01099_distributed_insert_select.reference → dbms/tests/queries/0_stateless/01099_parallel_distributed_insert_select.reference
View File

2
dbms/tests/queries/0_stateless/01099_distributed_insert_select.sql → dbms/tests/queries/0_stateless/01099_parallel_distributed_insert_select.sql
View File

@ -3,7 +3,7 @@ DROP TABLE IF EXISTS local_01099_b;
DROP TABLE IF EXISTS distributed_01099_a; DROP TABLE IF EXISTS distributed_01099_a;
DROP TABLE IF EXISTS distributed_01099_b; DROP TABLE IF EXISTS distributed_01099_b;
SET distributed_insert_select=1; SET parallel_distributed_insert_select=1;
-- --
-- test_shard_localhost -- test_shard_localhost