From cf77e9f2c6fb3468284b512e0657a7a0dddb8044 Mon Sep 17 00:00:00 2001 From: Maksim Kita Date: Thu, 17 Jun 2021 22:26:34 +0300 Subject: [PATCH] DatabaseMySQL rename --- src/Databases/DatabaseFactory.cpp | 4 +- ...eConnectionMySQL.cpp => DatabaseMySQL.cpp} | 52 +++++++++---------- ...abaseConnectionMySQL.h => DatabaseMySQL.h} | 6 +-- src/Databases/ya.make | 2 +- src/TableFunctions/TableFunctionMySQL.cpp | 2 +- 5 files changed, 33 insertions(+), 33 deletions(-) rename src/Databases/MySQL/{DatabaseConnectionMySQL.cpp => DatabaseMySQL.cpp} (87%) rename src/Databases/MySQL/{DatabaseConnectionMySQL.h => DatabaseMySQL.h} (96%) diff --git a/src/Databases/DatabaseFactory.cpp b/src/Databases/DatabaseFactory.cpp index e09860e79b6..7e65bf398f9 100644 --- a/src/Databases/DatabaseFactory.cpp +++ b/src/Databases/DatabaseFactory.cpp @@ -22,7 +22,7 @@ #if USE_MYSQL # include # include -# include +# include # include # include # include @@ -151,7 +151,7 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String mysql_database_settings->loadFromQueryContext(context); mysql_database_settings->loadFromQuery(*engine_define); /// higher priority - return std::make_shared( + return std::make_shared( context, database_name, metadata_path, engine_define, mysql_database_name, std::move(mysql_database_settings), std::move(mysql_pool)); } diff --git a/src/Databases/MySQL/DatabaseConnectionMySQL.cpp b/src/Databases/MySQL/DatabaseMySQL.cpp similarity index 87% rename from src/Databases/MySQL/DatabaseConnectionMySQL.cpp rename to src/Databases/MySQL/DatabaseMySQL.cpp index 866b03e3bd6..b3b1c95ef7c 100644 --- a/src/Databases/MySQL/DatabaseConnectionMySQL.cpp +++ b/src/Databases/MySQL/DatabaseMySQL.cpp @@ -9,7 +9,7 @@ # include # include # include -# include +# include # include # include # include @@ -46,7 +46,7 @@ constexpr static const auto suffix = ".remove_flag"; static constexpr const std::chrono::seconds cleaner_sleep_time{30}; static const std::chrono::seconds lock_acquire_timeout{10}; -DatabaseConnectionMySQL::DatabaseConnectionMySQL( +DatabaseMySQL::DatabaseMySQL( ContextPtr context_, const String & database_name_, const String & metadata_path_, @@ -63,10 +63,10 @@ DatabaseConnectionMySQL::DatabaseConnectionMySQL( , mysql_pool(std::move(pool)) { empty(); /// test database is works fine. - thread = ThreadFromGlobalPool{&DatabaseConnectionMySQL::cleanOutdatedTables, this}; + thread = ThreadFromGlobalPool{&DatabaseMySQL::cleanOutdatedTables, this}; } -bool DatabaseConnectionMySQL::empty() const +bool DatabaseMySQL::empty() const { std::lock_guard lock(mutex); @@ -82,7 +82,7 @@ bool DatabaseConnectionMySQL::empty() const return true; } -DatabaseTablesIteratorPtr DatabaseConnectionMySQL::getTablesIterator(ContextPtr local_context, const FilterByNameFunction & filter_by_table_name) +DatabaseTablesIteratorPtr DatabaseMySQL::getTablesIterator(ContextPtr local_context, const FilterByNameFunction & filter_by_table_name) { Tables tables; std::lock_guard lock(mutex); @@ -96,12 +96,12 @@ DatabaseTablesIteratorPtr DatabaseConnectionMySQL::getTablesIterator(ContextPtr return std::make_unique(tables, database_name); } -bool DatabaseConnectionMySQL::isTableExist(const String & name, ContextPtr local_context) const +bool DatabaseMySQL::isTableExist(const String & name, ContextPtr local_context) const { return bool(tryGetTable(name, local_context)); } -StoragePtr DatabaseConnectionMySQL::tryGetTable(const String & mysql_table_name, ContextPtr local_context) const +StoragePtr DatabaseMySQL::tryGetTable(const String & mysql_table_name, ContextPtr local_context) const { std::lock_guard lock(mutex); @@ -160,7 +160,7 @@ static ASTPtr getCreateQueryFromStorage(const StoragePtr & storage, const ASTPtr return create_table_query; } -ASTPtr DatabaseConnectionMySQL::getCreateTableQueryImpl(const String & table_name, ContextPtr local_context, bool throw_on_error) const +ASTPtr DatabaseMySQL::getCreateTableQueryImpl(const String & table_name, ContextPtr local_context, bool throw_on_error) const { std::lock_guard lock(mutex); @@ -177,7 +177,7 @@ ASTPtr DatabaseConnectionMySQL::getCreateTableQueryImpl(const String & table_nam return getCreateQueryFromStorage(local_tables_cache[table_name].second, database_engine_define); } -time_t DatabaseConnectionMySQL::getObjectMetadataModificationTime(const String & table_name) const +time_t DatabaseMySQL::getObjectMetadataModificationTime(const String & table_name) const { std::lock_guard lock(mutex); @@ -189,7 +189,7 @@ time_t DatabaseConnectionMySQL::getObjectMetadataModificationTime(const String & return time_t(local_tables_cache[table_name].first); } -ASTPtr DatabaseConnectionMySQL::getCreateDatabaseQuery() const +ASTPtr DatabaseMySQL::getCreateDatabaseQuery() const { const auto & create_query = std::make_shared(); create_query->database = getDatabaseName(); @@ -197,7 +197,7 @@ ASTPtr DatabaseConnectionMySQL::getCreateDatabaseQuery() const return create_query; } -void DatabaseConnectionMySQL::fetchTablesIntoLocalCache(ContextPtr local_context) const +void DatabaseMySQL::fetchTablesIntoLocalCache(ContextPtr local_context) const { const auto & tables_with_modification_time = fetchTablesWithModificationTime(local_context); @@ -205,7 +205,7 @@ void DatabaseConnectionMySQL::fetchTablesIntoLocalCache(ContextPtr local_context fetchLatestTablesStructureIntoCache(tables_with_modification_time, local_context); } -void DatabaseConnectionMySQL::destroyLocalCacheExtraTables(const std::map & tables_with_modification_time) const +void DatabaseMySQL::destroyLocalCacheExtraTables(const std::map & tables_with_modification_time) const { for (auto iterator = local_tables_cache.begin(); iterator != local_tables_cache.end();) { @@ -219,7 +219,7 @@ void DatabaseConnectionMySQL::destroyLocalCacheExtraTables(const std::map & tables_modification_time, ContextPtr local_context) const { std::vector wait_update_tables_name; @@ -264,7 +264,7 @@ void DatabaseConnectionMySQL::fetchLatestTablesStructureIntoCache( } } -std::map DatabaseConnectionMySQL::fetchTablesWithModificationTime(ContextPtr local_context) const +std::map DatabaseMySQL::fetchTablesWithModificationTime(ContextPtr local_context) const { Block tables_status_sample_block { @@ -297,7 +297,7 @@ std::map DatabaseConnectionMySQL::fetchTablesWithModificationTim } std::map -DatabaseConnectionMySQL::fetchTablesColumnsList(const std::vector & tables_name, ContextPtr local_context) const +DatabaseMySQL::fetchTablesColumnsList(const std::vector & tables_name, ContextPtr local_context) const { const auto & settings = local_context->getSettingsRef(); @@ -309,7 +309,7 @@ DatabaseConnectionMySQL::fetchTablesColumnsList(const std::vector & tabl database_settings->mysql_datatypes_support_level); } -void DatabaseConnectionMySQL::shutdown() +void DatabaseMySQL::shutdown() { std::map tables_snapshot; { @@ -324,12 +324,12 @@ void DatabaseConnectionMySQL::shutdown() local_tables_cache.clear(); } -void DatabaseConnectionMySQL::drop(ContextPtr /*context*/) +void DatabaseMySQL::drop(ContextPtr /*context*/) { fs::remove_all(getMetadataPath()); } -void DatabaseConnectionMySQL::cleanOutdatedTables() +void DatabaseMySQL::cleanOutdatedTables() { setThreadName("MySQLDBCleaner"); @@ -355,7 +355,7 @@ void DatabaseConnectionMySQL::cleanOutdatedTables() } } -void DatabaseConnectionMySQL::attachTable(const String & table_name, const StoragePtr & storage, const String &) +void DatabaseMySQL::attachTable(const String & table_name, const StoragePtr & storage, const String &) { std::lock_guard lock{mutex}; @@ -378,7 +378,7 @@ void DatabaseConnectionMySQL::attachTable(const String & table_name, const Stora fs::remove(remove_flag); } -StoragePtr DatabaseConnectionMySQL::detachTable(const String & table_name) +StoragePtr DatabaseMySQL::detachTable(const String & table_name) { std::lock_guard lock{mutex}; @@ -394,12 +394,12 @@ StoragePtr DatabaseConnectionMySQL::detachTable(const String & table_name) return local_tables_cache[table_name].second; } -String DatabaseConnectionMySQL::getMetadataPath() const +String DatabaseMySQL::getMetadataPath() const { return metadata_path; } -void DatabaseConnectionMySQL::loadStoredObjects(ContextMutablePtr, bool, bool /*force_attach*/) +void DatabaseMySQL::loadStoredObjects(ContextMutablePtr, bool, bool /*force_attach*/) { std::lock_guard lock{mutex}; @@ -416,7 +416,7 @@ void DatabaseConnectionMySQL::loadStoredObjects(ContextMutablePtr, bool, bool /* } } -void DatabaseConnectionMySQL::detachTablePermanently(ContextPtr, const String & table_name) +void DatabaseMySQL::detachTablePermanently(ContextPtr, const String & table_name) { std::lock_guard lock{mutex}; @@ -448,12 +448,12 @@ void DatabaseConnectionMySQL::detachTablePermanently(ContextPtr, const String & table_iter->second.second->is_dropped = true; } -void DatabaseConnectionMySQL::dropTable(ContextPtr local_context, const String & table_name, bool /*no_delay*/) +void DatabaseMySQL::dropTable(ContextPtr local_context, const String & table_name, bool /*no_delay*/) { detachTablePermanently(local_context, table_name); } -DatabaseConnectionMySQL::~DatabaseConnectionMySQL() +DatabaseMySQL::~DatabaseMySQL() { try { @@ -475,7 +475,7 @@ DatabaseConnectionMySQL::~DatabaseConnectionMySQL() } } -void DatabaseConnectionMySQL::createTable(ContextPtr, const String & table_name, const StoragePtr & storage, const ASTPtr & create_query) +void DatabaseMySQL::createTable(ContextPtr, const String & table_name, const StoragePtr & storage, const ASTPtr & create_query) { const auto & create = create_query->as(); diff --git a/src/Databases/MySQL/DatabaseConnectionMySQL.h b/src/Databases/MySQL/DatabaseMySQL.h similarity index 96% rename from src/Databases/MySQL/DatabaseConnectionMySQL.h rename to src/Databases/MySQL/DatabaseMySQL.h index 32741185cfa..04246ddcbf5 100644 --- a/src/Databases/MySQL/DatabaseConnectionMySQL.h +++ b/src/Databases/MySQL/DatabaseMySQL.h @@ -32,12 +32,12 @@ enum class MySQLDataTypesSupport; * It doesn't make any manipulations with filesystem. * All tables are created by calling code after real-time pull-out structure from remote MySQL */ -class DatabaseConnectionMySQL final : public IDatabase, WithContext +class DatabaseMySQL final : public IDatabase, WithContext { public: - ~DatabaseConnectionMySQL() override; + ~DatabaseMySQL() override; - DatabaseConnectionMySQL( + DatabaseMySQL( ContextPtr context, const String & database_name, const String & metadata_path, diff --git a/src/Databases/ya.make b/src/Databases/ya.make index e1b61ee4d26..15c14ac5fc2 100644 --- a/src/Databases/ya.make +++ b/src/Databases/ya.make @@ -21,8 +21,8 @@ SRCS( DatabaseReplicatedWorker.cpp DatabasesCommon.cpp MySQL/ConnectionMySQLSettings.cpp - MySQL/DatabaseConnectionMySQL.cpp MySQL/DatabaseMaterializeMySQL.cpp + MySQL/DatabaseMySQL.cpp MySQL/FetchTablesColumnsList.cpp MySQL/MaterializeMetadata.cpp MySQL/MaterializeMySQLSettings.cpp diff --git a/src/TableFunctions/TableFunctionMySQL.cpp b/src/TableFunctions/TableFunctionMySQL.cpp index 0b60e11f490..eb310ef3696 100644 --- a/src/TableFunctions/TableFunctionMySQL.cpp +++ b/src/TableFunctions/TableFunctionMySQL.cpp @@ -24,7 +24,7 @@ #include #include "registerTableFunctions.h" -#include // for fetchTablesColumnsList +#include // for fetchTablesColumnsList #include