thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-30 03:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
Alexander Tokmakov 2020-09-19 15:59:37 +03:00 committed by alesapin
parent 52a13a7180
commit a7c595ab7a
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Settings.h
View File

@ -155,8 +155,6 @@ class IColumn;
M(UInt64, max_concurrent_queries_for_user, 0, "The maximum number of concurrent requests per user.", 0) \ M(UInt64, max_concurrent_queries_for_user, 0, "The maximum number of concurrent requests per user.", 0) \
\ \
M(Bool, insert_deduplicate, true, "For INSERT queries in the replicated table, specifies that deduplication of insertings blocks should be performed", 0) \ M(Bool, insert_deduplicate, true, "For INSERT queries in the replicated table, specifies that deduplication of insertings blocks should be performed", 0) \
M(String, default_replica_path, "", "Default replica path for ReplicatedMergeTree. Allow to omit arguments for Replicated table engine if default_replica_path and default_replica_name are specified.", 0) \
M(String, default_replica_name, "", "Default replica name for ReplicatedMergeTree. Allow to omit arguments for Replicated table engine if default_replica_path and default_replica_name are specified.", 0) \
\ \
M(UInt64, insert_quorum, 0, "For INSERT queries in the replicated table, wait writing for the specified number of replicas and linearize the addition of the data. 0 - disabled.", 0) \ M(UInt64, insert_quorum, 0, "For INSERT queries in the replicated table, wait writing for the specified number of replicas and linearize the addition of the data. 0 - disabled.", 0) \
M(Milliseconds, insert_quorum_timeout, 600000, "", 0) \ M(Milliseconds, insert_quorum_timeout, 600000, "", 0) \

20
src/Storages/MergeTree/registerStorageMergeTree.cpp
View File

@ -293,13 +293,8 @@ static StoragePtr create(const StorageFactory::Arguments & args)
String name_part = args.engine_name.substr(0, args.engine_name.size() - strlen("MergeTree")); String name_part = args.engine_name.substr(0, args.engine_name.size() - strlen("MergeTree"));
bool replicated = startsWith(name_part, "Replicated"); bool replicated = startsWith(name_part, "Replicated");
bool has_replicated_default_args = false;
if (replicated) if (replicated)
{
name_part = name_part.substr(strlen("Replicated")); name_part = name_part.substr(strlen("Replicated"));
has_replicated_default_args = args.context.getSettingsRef().default_replica_path.value != ""
&& args.context.getSettingsRef().default_replica_name.value != "";
}
MergeTreeData::MergingParams merging_params; MergeTreeData::MergingParams merging_params;
merging_params.mode = MergeTreeData::MergingParams::Ordinary; merging_params.mode = MergeTreeData::MergingParams::Ordinary;
@ -343,7 +338,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
if (replicated) if (replicated)
{ {
if (is_extended_storage_def || has_replicated_default_args) if (is_extended_storage_def)
{ {
add_optional_param("path in ZooKeeper"); add_optional_param("path in ZooKeeper");
add_optional_param("replica name"); add_optional_param("replica name");
@ -446,18 +441,13 @@ static StoragePtr create(const StorageFactory::Arguments & args)
"No replica name in config" + getMergeTreeVerboseHelp(is_extended_storage_def), ErrorCodes::NO_REPLICA_NAME_GIVEN); "No replica name in config" + getMergeTreeVerboseHelp(is_extended_storage_def), ErrorCodes::NO_REPLICA_NAME_GIVEN);
++arg_num; ++arg_num;
} }
else if (has_replicated_default_args && !has_arguments)
{
zookeeper_path
= args.context.getSettingsRef().default_replica_path.value + "/" + args.table_id.database_name + "." + args.table_id.table_name;
replica_name = args.context.getSettingsRef().default_replica_name;
}
else if (is_extended_storage_def && !has_arguments) else if (is_extended_storage_def && !has_arguments)
{ {
/// Try use default values if arguments are not specified. /// Try use default values if arguments are not specified.
/// It works for ON CLUSTER queries when database engine is Atomic and there are {shard} and {replica} in config. /// Note: {uuid} macro works for ON CLUSTER queries when database engine is Atomic.
zookeeper_path = "/clickhouse/tables/{uuid}/{shard}"; zookeeper_path = args.context.getConfigRef().getString("default_replica_path", "/clickhouse/tables/{uuid}/{shard}");
replica_name = "{replica}"; /// TODO maybe use hostname if {replica} is not defined? /// TODO maybe use hostname if {replica} is not defined?
replica_name = args.context.getConfigRef().getString("default_replica_name", "{replica}");
} }
else else
throw Exception("Expected two string literal arguments: zookeper_path and replica_name", ErrorCodes::BAD_ARGUMENTS); throw Exception("Expected two string literal arguments: zookeper_path and replica_name", ErrorCodes::BAD_ARGUMENTS);