From 706eeb67a8b4dad06a721e385bb28789fe841e4b Mon Sep 17 00:00:00 2001 From: Vxider Date: Fri, 20 Mar 2020 01:04:59 +0800 Subject: [PATCH] update setting name --- dbms/src/Core/Settings.h | 2 +- dbms/src/Interpreters/InterpreterInsertQuery.cpp | 2 +- ...rence => 01099_parallel_distributed_insert_select.reference} | 0 ..._select.sql => 01099_parallel_distributed_insert_select.sql} | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename dbms/tests/queries/0_stateless/{01099_distributed_insert_select.reference => 01099_parallel_distributed_insert_select.reference} (100%) rename dbms/tests/queries/0_stateless/{01099_distributed_insert_select.sql => 01099_parallel_distributed_insert_select.sql} (98%) diff --git a/dbms/src/Core/Settings.h b/dbms/src/Core/Settings.h index a61dce49a75..7dab0924771 100644 --- a/dbms/src/Core/Settings.h +++ b/dbms/src/Core/Settings.h @@ -112,7 +112,7 @@ struct Settings : public SettingsCollection 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_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(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) \ \ diff --git a/dbms/src/Interpreters/InterpreterInsertQuery.cpp b/dbms/src/Interpreters/InterpreterInsertQuery.cpp index 6b51360b714..2e6a39b9bd1 100644 --- a/dbms/src/Interpreters/InterpreterInsertQuery.cpp +++ b/dbms/src/Interpreters/InterpreterInsertQuery.cpp @@ -118,7 +118,7 @@ BlockIO InterpreterInsertQuery::execute() BlockOutputStreams out_streams; 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 std::shared_ptr storage_src; diff --git a/dbms/tests/queries/0_stateless/01099_distributed_insert_select.reference b/dbms/tests/queries/0_stateless/01099_parallel_distributed_insert_select.reference similarity index 100% rename from dbms/tests/queries/0_stateless/01099_distributed_insert_select.reference rename to dbms/tests/queries/0_stateless/01099_parallel_distributed_insert_select.reference diff --git a/dbms/tests/queries/0_stateless/01099_distributed_insert_select.sql b/dbms/tests/queries/0_stateless/01099_parallel_distributed_insert_select.sql similarity index 98% rename from dbms/tests/queries/0_stateless/01099_distributed_insert_select.sql rename to dbms/tests/queries/0_stateless/01099_parallel_distributed_insert_select.sql index 66a46d0ec2c..6e2146ad68c 100644 --- a/dbms/tests/queries/0_stateless/01099_distributed_insert_select.sql +++ b/dbms/tests/queries/0_stateless/01099_parallel_distributed_insert_select.sql @@ -3,7 +3,7 @@ DROP TABLE IF EXISTS local_01099_b; DROP TABLE IF EXISTS distributed_01099_a; DROP TABLE IF EXISTS distributed_01099_b; -SET distributed_insert_select=1; +SET parallel_distributed_insert_select=1; -- -- test_shard_localhost