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

Merge pull request #16373 from ClickHouse/better-rethrow

Browse Source 
Better exceptions rethrow
This commit is contained in:
Alexander Kuzmenkov 2020-10-27 16:38:32 +03:00 committed by GitHub
commit 60544ad46e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Databases/MySQL/MaterializeMySQLSettings.cpp
View File

@ -8,7 +8,6 @@ namespace DB
namespace ErrorCodes
{
extern const int BAD_ARGUMENTS;
extern const int UNKNOWN_SETTING;
}
@ -25,9 +24,8 @@ void MaterializeMySQLSettings::loadFromQuery(ASTStorage & storage_def)
catch (Exception & e)
{
if (e.code() == ErrorCodes::UNKNOWN_SETTING)
throw Exception(e.message() + " for database " + storage_def.engine->name, ErrorCodes::BAD_ARGUMENTS);
else
e.rethrow();
e.addMessage("for database " + storage_def.engine->name);
throw;
}
}
else

4
src/Interpreters/ActionsVisitor.cpp
View File

@ -744,12 +744,12 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
{
function_builder = FunctionFactory::instance().get(node.name, data.context);
}
catch (DB::Exception & e)
catch (Exception & e)
{
auto hints = AggregateFunctionFactory::instance().getHints(node.name);
if (!hints.empty())
e.addMessage("Or unknown aggregate function " + node.name + ". Maybe you meant: " + toString(hints));
e.rethrow();
throw;
}
Names argument_names;

6
src/Storages/JoinSettings.cpp
View File

@ -10,7 +10,6 @@ namespace DB
namespace ErrorCodes
{
extern const int BAD_ARGUMENTS;
extern const int UNKNOWN_SETTING;
}
@ -27,9 +26,8 @@ void JoinSettings::loadFromQuery(ASTStorage & storage_def)
catch (Exception & e)
{
if (e.code() == ErrorCodes::UNKNOWN_SETTING)
throw Exception(e.message() + " for storage " + storage_def.engine->name, ErrorCodes::BAD_ARGUMENTS);
else
e.rethrow();
e.addMessage("for storage " + storage_def.engine->name);
throw;
}
}
else

6
src/Storages/Kafka/KafkaSettings.cpp
View File

@ -10,7 +10,6 @@ namespace DB
namespace ErrorCodes
{
extern const int BAD_ARGUMENTS;
extern const int UNKNOWN_SETTING;
}
@ -27,9 +26,8 @@ void KafkaSettings::loadFromQuery(ASTStorage & storage_def)
catch (Exception & e)
{
if (e.code() == ErrorCodes::UNKNOWN_SETTING)
throw Exception(e.message() + " for storage " + storage_def.engine->name, ErrorCodes::BAD_ARGUMENTS);
else
e.rethrow();
e.addMessage("for storage " + storage_def.engine->name);
throw;
}
}
else

13
src/Storages/MergeTree/MergeTreeSettings.cpp
View File

@ -11,9 +11,8 @@ namespace DB
namespace ErrorCodes
{
extern const int INVALID_CONFIG_PARAMETER;
extern const int BAD_ARGUMENTS;
extern const int UNKNOWN_SETTING;
extern const int BAD_ARGUMENTS;
}
IMPLEMENT_SETTINGS_TRAITS(MergeTreeSettingsTraits, LIST_OF_MERGE_TREE_SETTINGS)
@ -34,9 +33,8 @@ void MergeTreeSettings::loadFromConfig(const String & config_elem, const Poco::U
catch (Exception & e)
{
if (e.code() == ErrorCodes::UNKNOWN_SETTING)
throw Exception(e.message() + " in MergeTree config", ErrorCodes::INVALID_CONFIG_PARAMETER);
else
e.rethrow();
e.addMessage("in MergeTree config");
throw;
}
}
@ -51,9 +49,8 @@ void MergeTreeSettings::loadFromQuery(ASTStorage & storage_def)
catch (Exception & e)
{
if (e.code() == ErrorCodes::UNKNOWN_SETTING)
throw Exception(e.message() + " for storage " + storage_def.engine->name, ErrorCodes::BAD_ARGUMENTS);
else
e.rethrow();
e.addMessage("for storage " + storage_def.engine->name);
throw;
}
}
else

6
src/Storages/RabbitMQ/RabbitMQSettings.cpp
View File

@ -9,7 +9,6 @@ namespace DB
namespace ErrorCodes
{
extern const int BAD_ARGUMENTS;
extern const int UNKNOWN_SETTING;
}
@ -26,9 +25,8 @@ void RabbitMQSettings::loadFromQuery(ASTStorage & storage_def)
catch (Exception & e)
{
if (e.code() == ErrorCodes::UNKNOWN_SETTING)
throw Exception(e.message() + " for storage " + storage_def.engine->name, ErrorCodes::BAD_ARGUMENTS);
else
e.rethrow();
e.addMessage("for storage " + storage_def.engine->name);
throw;
}
}
else

6
src/Storages/SetSettings.cpp
View File

@ -10,7 +10,6 @@ namespace DB
namespace ErrorCodes
{
extern const int BAD_ARGUMENTS;
extern const int UNKNOWN_SETTING;
}
@ -27,9 +26,8 @@ void SetSettings::loadFromQuery(ASTStorage & storage_def)
catch (Exception & e)
{
if (e.code() == ErrorCodes::UNKNOWN_SETTING)
throw Exception(e.message() + " for storage " + storage_def.engine->name, ErrorCodes::BAD_ARGUMENTS);
else
e.rethrow();
e.addMessage("for storage " + storage_def.engine->name);
throw;
}
}
else