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

fixes

Browse Source
This commit is contained in:
Alexander Tokmakov 2020-02-21 16:44:44 +03:00
parent e1f5a620b5
commit e117e5838e
7 changed files with 63 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dbms/src/Interpreters/getClusterName.cpp
View File

@ -45,4 +45,12 @@ std::string getClusterName(const IAST & node)
throw Exception("Illegal expression instead of cluster name.", ErrorCodes::BAD_ARGUMENTS); throw Exception("Illegal expression instead of cluster name.", ErrorCodes::BAD_ARGUMENTS);
} }
String getClusterNameAndMakeLiteral(ASTPtr & node)
{
String cluster_name = getClusterName(*node);
node = std::make_shared<ASTLiteral>(cluster_name);
return cluster_name;
}
} }

8
dbms/src/Interpreters/getClusterName.h
View File

@ -1,13 +1,11 @@
#pragma once #pragma once
#include <string> #include <string>
#include <Parsers/IAST_fwd.h>
namespace DB namespace DB
{ {
class IAST;
/// Get the cluster name from AST. /// Get the cluster name from AST.
/** The name of the cluster is the name of the tag in the xml configuration. /** The name of the cluster is the name of the tag in the xml configuration.
* Usually it is parsed as an identifier. That is, it can contain underscores, but can not contain hyphens, * Usually it is parsed as an identifier. That is, it can contain underscores, but can not contain hyphens,
@ -16,6 +14,8 @@ class IAST;
* This name will be parsed as an expression with an operator minus - not at all what you need. * This name will be parsed as an expression with an operator minus - not at all what you need.
* Therefore, consider this case separately. * Therefore, consider this case separately.
*/ */
std::string getClusterName(const IAST & node); String getClusterName(const IAST & node);
String getClusterNameAndMakeLiteral(ASTPtr & node);
} }

73
dbms/src/Storages/MergeTree/registerStorageMergeTree.cpp
View File

@ -446,8 +446,10 @@ static StoragePtr create(const StorageFactory::Arguments & args)
} }
ASTs & engine_args = args.engine_args; ASTs & engine_args = args.engine_args;
size_t arg_num = 0;
size_t arg_cnt = engine_args.size();
if (engine_args.size() < min_num_params || engine_args.size() > max_num_params) if (arg_cnt < min_num_params || arg_cnt > max_num_params)
{ {
String msg; String msg;
if (is_extended_storage_def) if (is_extended_storage_def)
@ -477,15 +479,16 @@ static StoragePtr create(const StorageFactory::Arguments & args)
if (replicated) if (replicated)
{ {
const auto * ast = engine_args[0]->as<ASTLiteral>(); const auto * ast = engine_args[arg_num]->as<ASTLiteral>();
if (ast && ast->value.getType() == Field::Types::String) if (ast && ast->value.getType() == Field::Types::String)
zookeeper_path = safeGet<String>(ast->value); zookeeper_path = safeGet<String>(ast->value);
else else
throw Exception( throw Exception(
"Path in ZooKeeper must be a string literal" + getMergeTreeVerboseHelp(is_extended_storage_def), "Path in ZooKeeper must be a string literal" + getMergeTreeVerboseHelp(is_extended_storage_def),
ErrorCodes::BAD_ARGUMENTS); ErrorCodes::BAD_ARGUMENTS);
++arg_num;
ast = engine_args[1]->as<ASTLiteral>(); ast = engine_args[arg_num]->as<ASTLiteral>();
if (ast && ast->value.getType() == Field::Types::String) if (ast && ast->value.getType() == Field::Types::String)
replica_name = safeGet<String>(ast->value); replica_name = safeGet<String>(ast->value);
else else
@ -497,39 +500,36 @@ static StoragePtr create(const StorageFactory::Arguments & args)
throw Exception( throw Exception(
"No replica name in config" + getMergeTreeVerboseHelp(is_extended_storage_def), "No replica name in config" + getMergeTreeVerboseHelp(is_extended_storage_def),
ErrorCodes::NO_REPLICA_NAME_GIVEN); ErrorCodes::NO_REPLICA_NAME_GIVEN);
++arg_num;
engine_args.erase(engine_args.begin(), engine_args.begin() + 2);
} }
if (merging_params.mode == MergeTreeData::MergingParams::Collapsing) if (merging_params.mode == MergeTreeData::MergingParams::Collapsing)
{ {
if (!tryGetIdentifierNameInto(engine_args.back(), merging_params.sign_column)) if (!tryGetIdentifierNameInto(engine_args[arg_cnt - 1], merging_params.sign_column))
throw Exception( throw Exception(
"Sign column name must be an unquoted string" + getMergeTreeVerboseHelp(is_extended_storage_def), "Sign column name must be an unquoted string" + getMergeTreeVerboseHelp(is_extended_storage_def),
ErrorCodes::BAD_ARGUMENTS); ErrorCodes::BAD_ARGUMENTS);
--arg_cnt;
engine_args.pop_back();
} }
else if (merging_params.mode == MergeTreeData::MergingParams::Replacing) else if (merging_params.mode == MergeTreeData::MergingParams::Replacing)
{ {
/// If the last element is not index_granularity or replica_name (a literal), then this is the name of the version column. /// If the last element is not index_granularity or replica_name (a literal), then this is the name of the version column.
if (!engine_args.empty() && !engine_args.back()->as<ASTLiteral>()) if (arg_cnt && !engine_args[arg_cnt - 1]->as<ASTLiteral>())
{ {
if (!tryGetIdentifierNameInto(engine_args.back(), merging_params.version_column)) if (!tryGetIdentifierNameInto(engine_args[arg_cnt - 1], merging_params.version_column))
throw Exception( throw Exception(
"Version column name must be an unquoted string" + getMergeTreeVerboseHelp(is_extended_storage_def), "Version column name must be an unquoted string" + getMergeTreeVerboseHelp(is_extended_storage_def),
ErrorCodes::BAD_ARGUMENTS); ErrorCodes::BAD_ARGUMENTS);
--arg_cnt;
engine_args.pop_back();
} }
} }
else if (merging_params.mode == MergeTreeData::MergingParams::Summing) else if (merging_params.mode == MergeTreeData::MergingParams::Summing)
{ {
/// If the last element is not index_granularity or replica_name (a literal), then this is a list of summable columns. /// If the last element is not index_granularity or replica_name (a literal), then this is a list of summable columns.
if (!engine_args.empty() && !engine_args.back()->as<ASTLiteral>()) if (arg_cnt && !engine_args[arg_cnt - 1]->as<ASTLiteral>())
{ {
merging_params.columns_to_sum = extractColumnNames(engine_args.back()); merging_params.columns_to_sum = extractColumnNames(engine_args[arg_cnt - 1]);
engine_args.pop_back(); --arg_cnt;
} }
} }
else if (merging_params.mode == MergeTreeData::MergingParams::Graphite) else if (merging_params.mode == MergeTreeData::MergingParams::Graphite)
@ -538,7 +538,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
String error_msg = "Last parameter of GraphiteMergeTree must be name (in single quotes) of element in configuration file with Graphite options"; String error_msg = "Last parameter of GraphiteMergeTree must be name (in single quotes) of element in configuration file with Graphite options";
error_msg += getMergeTreeVerboseHelp(is_extended_storage_def); error_msg += getMergeTreeVerboseHelp(is_extended_storage_def);
if (const auto * ast = engine_args.back()->as<ASTLiteral>()) if (const auto * ast = engine_args[arg_cnt - 1]->as<ASTLiteral>())
{ {
if (ast->value.getType() != Field::Types::String) if (ast->value.getType() != Field::Types::String)
throw Exception(error_msg, ErrorCodes::BAD_ARGUMENTS); throw Exception(error_msg, ErrorCodes::BAD_ARGUMENTS);
@ -548,24 +548,24 @@ static StoragePtr create(const StorageFactory::Arguments & args)
else else
throw Exception(error_msg, ErrorCodes::BAD_ARGUMENTS); throw Exception(error_msg, ErrorCodes::BAD_ARGUMENTS);
engine_args.pop_back(); --arg_cnt;
setGraphitePatternsFromConfig(args.context, graphite_config_name, merging_params.graphite_params); setGraphitePatternsFromConfig(args.context, graphite_config_name, merging_params.graphite_params);
} }
else if (merging_params.mode == MergeTreeData::MergingParams::VersionedCollapsing) else if (merging_params.mode == MergeTreeData::MergingParams::VersionedCollapsing)
{ {
if (!tryGetIdentifierNameInto(engine_args.back(), merging_params.version_column)) if (!tryGetIdentifierNameInto(engine_args[arg_cnt - 1], merging_params.version_column))
throw Exception( throw Exception(
"Version column name must be an unquoted string" + getMergeTreeVerboseHelp(is_extended_storage_def), "Version column name must be an unquoted string" + getMergeTreeVerboseHelp(is_extended_storage_def),
ErrorCodes::BAD_ARGUMENTS); ErrorCodes::BAD_ARGUMENTS);
engine_args.pop_back(); --arg_cnt;
if (!tryGetIdentifierNameInto(engine_args.back(), merging_params.sign_column)) if (!tryGetIdentifierNameInto(engine_args[arg_cnt - 1], merging_params.sign_column))
throw Exception( throw Exception(
"Sign column name must be an unquoted string" + getMergeTreeVerboseHelp(is_extended_storage_def), "Sign column name must be an unquoted string" + getMergeTreeVerboseHelp(is_extended_storage_def),
ErrorCodes::BAD_ARGUMENTS); ErrorCodes::BAD_ARGUMENTS);
engine_args.pop_back(); --arg_cnt;
} }
String date_column_name; String date_column_name;
@ -614,31 +614,38 @@ static StoragePtr create(const StorageFactory::Arguments & args)
} }
else else
{ {
/// If there is an expression for sampling. MergeTree(date, [sample_key], primary_key, index_granularity) /// Syntax: *MergeTree(..., date, [sample_key], primary_key, index_granularity, ...)
if (engine_args.size() == 4) /// Get date:
{ if (!tryGetIdentifierNameInto(engine_args[arg_num], date_column_name))
sample_by_ast = engine_args[1];
engine_args.erase(engine_args.begin() + 1);
}
/// Now only three parameters remain - date (or partitioning expression), primary_key, index_granularity.
if (!tryGetIdentifierNameInto(engine_args[0], date_column_name))
throw Exception( throw Exception(
"Date column name must be an unquoted string" + getMergeTreeVerboseHelp(is_extended_storage_def), "Date column name must be an unquoted string" + getMergeTreeVerboseHelp(is_extended_storage_def),
ErrorCodes::BAD_ARGUMENTS); ErrorCodes::BAD_ARGUMENTS);
++arg_num;
order_by_ast = engine_args[1]; /// If there is an expression for sampling
if (arg_cnt - arg_num == 3)
{
sample_by_ast = engine_args[arg_num];
++arg_num;
}
const auto * ast = engine_args.back()->as<ASTLiteral>(); /// Now only two parameters remain - primary_key, index_granularity.
order_by_ast = engine_args[arg_num];
++arg_num;
const auto * ast = engine_args[arg_num]->as<ASTLiteral>();
if (ast && ast->value.getType() == Field::Types::UInt64) if (ast && ast->value.getType() == Field::Types::UInt64)
storage_settings->index_granularity = safeGet<UInt64>(ast->value); storage_settings->index_granularity = safeGet<UInt64>(ast->value);
else else
throw Exception( throw Exception(
"Index granularity must be a positive integer" + getMergeTreeVerboseHelp(is_extended_storage_def), "Index granularity must be a positive integer" + getMergeTreeVerboseHelp(is_extended_storage_def),
ErrorCodes::BAD_ARGUMENTS); ErrorCodes::BAD_ARGUMENTS);
++arg_num;
} }
if (arg_num != arg_cnt)
throw Exception("Wrong number of engine arguments.", ErrorCodes::BAD_ARGUMENTS);
if (!args.attach && !indices_description.empty() && !args.local_context.getSettingsRef().allow_experimental_data_skipping_indices) if (!args.attach && !indices_description.empty() && !args.local_context.getSettingsRef().allow_experimental_data_skipping_indices)
throw Exception("You must set the setting `allow_experimental_data_skipping_indices` to 1 " \ throw Exception("You must set the setting `allow_experimental_data_skipping_indices` to 1 " \
"before using data skipping indices.", ErrorCodes::BAD_ARGUMENTS); "before using data skipping indices.", ErrorCodes::BAD_ARGUMENTS);

9
dbms/src/Storages/StorageDistributed.cpp
View File

@ -253,10 +253,6 @@ StorageDistributed::StorageDistributed(
if (num_local_shards && remote_database == id_.database_name && remote_table == id_.table_name) if (num_local_shards && remote_database == id_.database_name && remote_table == id_.table_name)
throw Exception("Distributed table " + id_.table_name + " looks at itself", ErrorCodes::INFINITE_LOOP); throw Exception("Distributed table " + id_.table_name + " looks at itself", ErrorCodes::INFINITE_LOOP);
} }
if (remote_database.empty())
{
LOG_WARNING(log, "Name of remote database is empty. Default database will be used implicitly.");
}
} }
@ -480,6 +476,9 @@ void StorageDistributed::alter(const AlterCommands & params, const Context & con
void StorageDistributed::startup() void StorageDistributed::startup()
{ {
if (remote_database.empty() && !remote_table_function_ptr)
LOG_WARNING(log, "Name of remote database is empty. Default database will be used implicitly.");
if (!volume) if (!volume)
return; return;
@ -723,7 +722,7 @@ void registerStorageDistributed(StorageFactory & factory)
"policy to store data in (optional).", "policy to store data in (optional).",
ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH); ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
String cluster_name = getClusterName(*engine_args[0]); String cluster_name = getClusterNameAndMakeLiteral(engine_args[0]);
engine_args[1] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[1], args.local_context); engine_args[1] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[1], args.local_context);
engine_args[2] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[2], args.local_context); engine_args[2] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[2], args.local_context);

2
dbms/tests/queries/0_stateless/01033_storage_odbc_parsing_exception_check.reference
View File

@ -1 +1 @@
CREATE TABLE default.BannerDict (`BannerID` UInt64, `CompaignID` UInt64) ENGINE = ODBC(\'DSN=pgconn;Database=postgres\', somedb, bannerdict) CREATE TABLE default.BannerDict (`BannerID` UInt64, `CompaignID` UInt64) ENGINE = ODBC(\'DSN=pgconn;Database=postgres\', \'somedb\', \'bannerdict\')

6
dbms/tests/queries/0_stateless/01083_expressions_in_engine_arguments.reference
View File

@ -2,10 +2,10 @@ CREATE TABLE test_01083.file (`n` Int8) ENGINE = File(\'TSVWithNamesAndTypes\')
CREATE TABLE test_01083.buffer (`n` Int8) ENGINE = Buffer(\'test_01083\', \'file\', 16, 10, 200, 10000, 1000000, 10000000, 1000000000) CREATE TABLE test_01083.buffer (`n` Int8) ENGINE = Buffer(\'test_01083\', \'file\', 16, 10, 200, 10000, 1000000, 10000000, 1000000000)
CREATE TABLE test_01083.merge (`n` Int8) ENGINE = Merge(\'test_01083\', \'distributed\') CREATE TABLE test_01083.merge (`n` Int8) ENGINE = Merge(\'test_01083\', \'distributed\')
CREATE TABLE test_01083.merge_tf AS merge(\'test_01083\', \'.*\') CREATE TABLE test_01083.merge_tf AS merge(\'test_01083\', \'.*\')
CREATE TABLE test_01083.distributed (`n` Int8) ENGINE = Distributed(test_cluster, \'test_01083\', \'file\') CREATE TABLE test_01083.distributed (`n` Int8) ENGINE = Distributed(\'test_shard_localhost\', \'test_01083\', \'file\')
CREATE TABLE test_01083.distributed_tf AS cluster(\'test_cluster\', \'test_01083\', \'file\') CREATE TABLE test_01083.distributed_tf AS cluster(\'test_shard_localhost\', \'test_01083\', \'file\')
CREATE TABLE test_01083.url (`n` UInt64, `_path` String) ENGINE = URL(\'http://localhost:8123/?query=select+n,+_path+from+test_01083.file+format+CSV\', \'CSV\') CREATE TABLE test_01083.url (`n` UInt64, `_path` String) ENGINE = URL(\'http://localhost:8123/?query=select+n,+_path+from+test_01083.file+format+CSV\', \'CSV\')
CREATE TABLE test_01083.rich_syntax AS remote(\'localhos{x|y|t}\', cluster(\'test_cluster\', remote(\'127.0.0.{1..4}\', \'test_01083\', \'url\'))) CREATE TABLE test_01083.rich_syntax AS remote(\'localhos{x|y|t}\', cluster(\'test_shard_localhost\', remote(\'127.0.0.{1..4}\', \'test_01083\', \'url\')))
1 1
1 1
1 1

6
dbms/tests/queries/0_stateless/01083_expressions_in_engine_arguments.sql
View File

@ -6,8 +6,8 @@ CREATE TABLE file (n Int8) ENGINE = File(upper('tsv') || 'WithNames' || 'AndType
CREATE TABLE buffer (n Int8) ENGINE = Buffer(currentDatabase(), file, 16, 10, 200, 10000, 1000000, 10000000, 1000000000); CREATE TABLE buffer (n Int8) ENGINE = Buffer(currentDatabase(), file, 16, 10, 200, 10000, 1000000, 10000000, 1000000000);
CREATE TABLE merge (n Int8) ENGINE = Merge('', lower('DISTRIBUTED')); CREATE TABLE merge (n Int8) ENGINE = Merge('', lower('DISTRIBUTED'));
CREATE TABLE merge_tf as merge(currentDatabase(), '.*'); CREATE TABLE merge_tf as merge(currentDatabase(), '.*');
CREATE TABLE distributed (n Int8) ENGINE = Distributed(test_cluster, currentDatabase(), 'fi' || 'le'); CREATE TABLE distributed (n Int8) ENGINE = Distributed(test_shard_localhost, currentDatabase(), 'fi' || 'le');
CREATE TABLE distributed_tf as cluster('test' || '_' || 'cluster', '', 'fi' || 'le'); CREATE TABLE distributed_tf as cluster('test' || '_' || 'shard_localhost', '', 'fi' || 'le');
INSERT INTO file VALUES (1); INSERT INTO file VALUES (1);
CREATE TABLE url (n UInt64, _path String) ENGINE=URL CREATE TABLE url (n UInt64, _path String) ENGINE=URL
@ -31,7 +31,7 @@ CREATE TABLE rich_syntax as remote
'localhos{x|y|t}', 'localhos{x|y|t}',
cluster cluster
( (
'test' || '_' || 'cluster', 'test' || '_' || 'shard_localhost',
remote remote
( (
'127.0.0.{1..4}', '127.0.0.{1..4}',