thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-02 20:42:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
serxa 2023-05-23 17:04:40 +00:00
parent edbc9ba104
commit a9db6bd830
2 changed files with 20 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/Databases/DatabaseOrdinary.cpp
View File

@ -40,38 +40,6 @@ namespace ErrorCodes
static constexpr size_t METADATA_FILE_BUFFER_SIZE = 32768;
namespace
{
void tryAttachTable(
ContextMutablePtr context,
const ASTCreateQuery & query,
DatabaseOrdinary & database,
const String & database_name,
const String & metadata_path,
bool force_restore)
{
try
{
auto [table_name, table] = createTableFromAST(
query,
database_name,
database.getTableDataPath(query),
context,
force_restore);
database.attachTable(context, table_name, table, database.getTableDataPath(query));
}
catch (Exception & e)
{
e.addMessage(
"Cannot attach table " + backQuote(database_name) + "." + backQuote(query.getTable()) + " from metadata file " + metadata_path
+ " from query " + serializeAST(query));
throw;
}
}
}
DatabaseOrdinary::DatabaseOrdinary(const String & name_, const String & metadata_path_, ContextPtr context_)
: DatabaseOrdinary(name_, metadata_path_, "data/" + escapeForFileName(name_) + "/", "DatabaseOrdinary (" + name_ + ")", context_)
{
@ -167,15 +135,26 @@ void DatabaseOrdinary::loadTableFromMetadata(
LoadingStrictnessLevel mode)
{
assert(name.database == TSA_SUPPRESS_WARNING_FOR_READ(database_name));
const auto & create_query = ast->as<const ASTCreateQuery &>();
const auto & query = ast->as<const ASTCreateQuery &>();
tryAttachTable(
local_context,
create_query,
*this,
name.database,
file_path,
LoadingStrictnessLevel::FORCE_RESTORE <= mode);
try
{
auto [table_name, table] = createTableFromAST(
query,
name.database,
getTableDataPath(query),
local_context,
LoadingStrictnessLevel::FORCE_RESTORE <= mode);
attachTable(local_context, table_name, table, getTableDataPath(query));
}
catch (Exception & e)
{
e.addMessage(
"Cannot attach table " + backQuote(name.database) + "." + backQuote(query.getTable()) + " from metadata file " + file_path
+ " from query " + serializeAST(query));
throw;
}
}
LoadTaskPtr DatabaseOrdinary::loadTableFromMetadataAsync(

2
src/Databases/TablesLoader.cpp
View File

@ -36,7 +36,7 @@ LoadTaskPtrs TablesLoader::loadTablesAsync(LoadJobSet load_after)
{
bool need_resolve_dependencies = !global_context->getConfigRef().has("ignore_table_dependencies_on_metadata_loading");
/// Load all Lazy, MySQl, PostgreSQL, SQLite, etc databases first.
/// Load all Lazy, MySQL, PostgreSQL, SQLite, etc databases first.
/// Note that this loading is NOT async because it should be fast and it cannot have any dependencies
for (auto & database : databases)
{