Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Better exception message while loading tables for database ordinary #9527

Merged
merged 4 commits into from
Mar 5, 2020
Merged

Better exception message while loading tables for database ordinary #9527

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3cad682
Better exception message while loading tables for database ordinary
alexey-milovidov Mar 5, 2020
66f8e99
Update DatabaseOrdinary.cpp
alexey-milovidov Mar 5, 2020
67d202a
Addition to prev. revision
alexey-milovidov Mar 5, 2020
92cb5fa
Merge branch 'better-exception-message-cannot-load-table' of github.c…
alexey-milovidov Mar 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions dbms/src/Databases/DatabaseOrdinary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ namespace
const ASTCreateQuery & query,
DatabaseOrdinary & database,
const String & database_name,
const String & metadata_path,
bool has_force_restore_data_flag)
{
assert(!query.is_dictionary);
Expand All @@ -64,7 +65,9 @@ namespace
}
catch (Exception & e)
{
e.addMessage("Cannot attach table '" + backQuote(query.table) + "' from query " + serializeAST(query));
e.addMessage("Cannot attach table " + backQuote(database_name) + "." + backQuote(query.table)
+ " from metadata file " + metadata_path
+ " from query " + serializeAST(query));
throw;
}
}
Expand Down Expand Up @@ -110,7 +113,6 @@ void DatabaseOrdinary::loadStoredObjects(
Context & context,
bool has_force_restore_data_flag)
{

/** Tables load faster if they are loaded in sorted (by name) order.
* Otherwise (for the ext4 filesystem), `DirectoryIterator` iterates through them in some order,
* which does not correspond to order tables creation and does not correspond to order of their location on disk.
Expand All @@ -124,7 +126,7 @@ void DatabaseOrdinary::loadStoredObjects(
String full_path = getMetadataPath() + file_name;
try
{
auto ast = parseQueryFromMetadata(context, full_path, /*throw_on_error*/ true, /*remove_empty*/false);
auto ast = parseQueryFromMetadata(context, full_path, /*throw_on_error*/ true, /*remove_empty*/ false);
if (ast)
{
auto * create_query = ast->as<ASTCreateQuery>();
Expand Down Expand Up @@ -157,7 +159,7 @@ void DatabaseOrdinary::loadStoredObjects(
if (!create_query.is_dictionary)
pool.scheduleOrThrowOnError([&]()
{
tryAttachTable(context, create_query, *this, getDatabaseName(), has_force_restore_data_flag);
tryAttachTable(context, create_query, *this, getDatabaseName(), getMetadataPath() + name_with_query.first, has_force_restore_data_flag);

/// Messages, so that it's not boring to wait for the server to load for a long time.
logAboutProgress(log, ++tables_processed, total_tables, watch);
Expand Down