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

Merge pull request #7086 from nikvas0/nikvas0/little_odb_impr

Browse Source 
little improvement in DatabaseOrdinary code
This commit is contained in:
alexey-milovidov 2019-09-25 02:04:34 +03:00 committed by GitHub
commit 60d74a5e55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dbms/src/Databases/DatabaseOrdinary.cpp
View File

@ -263,11 +263,8 @@ void DatabaseOrdinary::createTable(
/// A race condition would be possible if a table with the same name is simultaneously created using CREATE and using ATTACH.
/// But there is protection from it - see using DDLGuard in InterpreterCreateQuery.
{
std::lock_guard lock(mutex);
if (tables.find(table_name) != tables.end())
if (isTableExist(context, table_name))
throw Exception("Table " + name + "." + table_name + " already exists.", ErrorCodes::TABLE_ALREADY_EXISTS);
}
String table_metadata_path = getTableMetadataPath(table_name);
String table_metadata_tmp_path = table_metadata_path + ".tmp";
@ -288,11 +285,7 @@ void DatabaseOrdinary::createTable(
try
{
/// Add a table to the map of known tables.
{
std::lock_guard lock(mutex);
if (!tables.emplace(table_name, table).second)
throw Exception("Table " + name + "." + table_name + " already exists.", ErrorCodes::TABLE_ALREADY_EXISTS);
}
attachTable(table_name, table);
/// If it was ATTACH query and file with table metadata already exist
/// (so, ATTACH is done after DETACH), then rename atomically replaces old file with new one.
@ -489,27 +482,6 @@ ASTPtr DatabaseOrdinary::getCreateDatabaseQuery(const Context & /*context*/) con
return ast;
}
void DatabaseOrdinary::shutdown()
{
/// You can not hold a lock during shutdown.
/// Because inside `shutdown` function the tables can work with database, and mutex is not recursive.
Tables tables_snapshot;
{
std::lock_guard lock(mutex);
tables_snapshot = tables;
}
for (const auto & kv: tables_snapshot)
{
kv.second->shutdown();
}
std::lock_guard lock(mutex);
tables.clear();
}
void DatabaseOrdinary::alterTable(
const Context & context,
const String & table_name,

2
dbms/src/Databases/DatabaseOrdinary.h
View File

@ -68,8 +68,6 @@ public:
void drop() override;
void shutdown() override;
private:
const String metadata_path;
const String data_path;