From 3a418a0bbc8e155e5395595c5e25c038d3c7c773 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 11 May 2017 22:29:51 +0200 Subject: Core/Common: Include cleanup --- src/server/database/Database/DatabaseWorkerPool.cpp | 12 ++++++++++++ src/server/database/Database/DatabaseWorkerPool.h | 10 ++-------- src/server/database/Database/Field.h | 3 +++ src/server/database/Database/MySQLConnection.h | 1 + src/server/database/Database/QueryCallback.h | 2 ++ src/server/database/Database/QueryResult.h | 1 + src/server/database/Database/Transaction.h | 2 ++ src/server/database/Logging/AppenderDB.cpp | 3 ++- src/server/database/Logging/AppenderDB.h | 2 +- src/server/database/Updater/DBUpdater.cpp | 18 ++++++------------ src/server/database/Updater/UpdateFetcher.h | 1 + 11 files changed, 33 insertions(+), 22 deletions(-) (limited to 'src/server/database') diff --git a/src/server/database/Database/DatabaseWorkerPool.cpp b/src/server/database/Database/DatabaseWorkerPool.cpp index e680ed834a3..aba2c573c4c 100644 --- a/src/server/database/Database/DatabaseWorkerPool.cpp +++ b/src/server/database/Database/DatabaseWorkerPool.cpp @@ -33,6 +33,12 @@ DatabaseWorkerPool::DatabaseWorkerPool() mysql_get_client_info(), MYSQL_SERVER_VERSION); } +template +DatabaseWorkerPool::~DatabaseWorkerPool() +{ + _queue->Cancel(); +} + template void DatabaseWorkerPool::SetConnectionInfo(std::string const& infoString, uint8 const asyncThreads, uint8 const synchThreads) @@ -176,6 +182,12 @@ QueryResultHolderFuture DatabaseWorkerPool::DelayQueryHolder(SQLQueryHolder* return result; } +template +SQLTransaction DatabaseWorkerPool::BeginTransaction() +{ + return std::make_shared(); +} + template void DatabaseWorkerPool::CommitTransaction(SQLTransaction transaction) { diff --git a/src/server/database/Database/DatabaseWorkerPool.h b/src/server/database/Database/DatabaseWorkerPool.h index 6e5f25ff297..adca6b3f836 100644 --- a/src/server/database/Database/DatabaseWorkerPool.h +++ b/src/server/database/Database/DatabaseWorkerPool.h @@ -60,10 +60,7 @@ class DatabaseWorkerPool /* Activity state */ DatabaseWorkerPool(); - ~DatabaseWorkerPool() - { - _queue->Cancel(); - } + ~DatabaseWorkerPool(); void SetConnectionInfo(std::string const& infoString, uint8 const asyncThreads, uint8 const synchThreads); @@ -211,10 +208,7 @@ class DatabaseWorkerPool */ //! Begins an automanaged transaction pointer that will automatically rollback if not commited. (Autocommit=0) - SQLTransaction BeginTransaction() - { - return SQLTransaction(new Transaction); - } + SQLTransaction BeginTransaction(); //! Enqueues a collection of one-way SQL operations (can be both adhoc and prepared). The order in which these operations //! were appended to the transaction will be respected during execution. diff --git a/src/server/database/Database/Field.h b/src/server/database/Database/Field.h index 4daa447e481..8035dd16869 100644 --- a/src/server/database/Database/Field.h +++ b/src/server/database/Database/Field.h @@ -21,6 +21,9 @@ #include "Common.h" #include "Log.h" +#ifdef _WIN32 +#include +#endif #include /** diff --git a/src/server/database/Database/MySQLConnection.h b/src/server/database/Database/MySQLConnection.h index 0a9b136386d..42fb976c729 100644 --- a/src/server/database/Database/MySQLConnection.h +++ b/src/server/database/Database/MySQLConnection.h @@ -19,6 +19,7 @@ #include "Transaction.h" #include "Util.h" #include "ProducerConsumerQueue.h" +#include #ifndef _MYSQLCONNECTION_H #define _MYSQLCONNECTION_H diff --git a/src/server/database/Database/QueryCallback.h b/src/server/database/Database/QueryCallback.h index f9c93000da7..8258da37afb 100644 --- a/src/server/database/Database/QueryCallback.h +++ b/src/server/database/Database/QueryCallback.h @@ -20,6 +20,8 @@ #include "QueryResult.h" #include +#include +#include class TC_DATABASE_API QueryCallback { diff --git a/src/server/database/Database/QueryResult.h b/src/server/database/Database/QueryResult.h index 2df5d3a4f70..5d2cc425ae8 100644 --- a/src/server/database/Database/QueryResult.h +++ b/src/server/database/Database/QueryResult.h @@ -20,6 +20,7 @@ #define QUERYRESULT_H #include +#include "Errors.h" #include "Field.h" #ifdef _WIN32 diff --git a/src/server/database/Database/Transaction.h b/src/server/database/Database/Transaction.h index 6e6d68302f5..fbb96c053ce 100644 --- a/src/server/database/Database/Transaction.h +++ b/src/server/database/Database/Transaction.h @@ -20,6 +20,8 @@ #include "SQLOperation.h" #include "StringFormat.h" +#include +#include //- Forward declare (don't include header to prevent circular includes) class PreparedStatement; diff --git a/src/server/database/Logging/AppenderDB.cpp b/src/server/database/Logging/AppenderDB.cpp index 1a6e11209e9..f14bb04ddea 100644 --- a/src/server/database/Logging/AppenderDB.cpp +++ b/src/server/database/Logging/AppenderDB.cpp @@ -17,8 +17,9 @@ #include "AppenderDB.h" #include "Database/DatabaseEnv.h" +#include "LogMessage.h" -AppenderDB::AppenderDB(uint8 id, std::string const& name, LogLevel level, AppenderFlags /*flags*/, ExtraAppenderArgs /*extraArgs*/) +AppenderDB::AppenderDB(uint8 id, std::string const& name, LogLevel level, AppenderFlags /*flags*/, std::vector /*extraArgs*/) : Appender(id, name, level), realmId(0), enabled(false) { } AppenderDB::~AppenderDB() { } diff --git a/src/server/database/Logging/AppenderDB.h b/src/server/database/Logging/AppenderDB.h index 56f5fc13b94..3f53a33210a 100644 --- a/src/server/database/Logging/AppenderDB.h +++ b/src/server/database/Logging/AppenderDB.h @@ -25,7 +25,7 @@ class TC_DATABASE_API AppenderDB: public Appender public: typedef std::integral_constant::type TypeIndex; - AppenderDB(uint8 id, std::string const& name, LogLevel level, AppenderFlags flags, ExtraAppenderArgs extraArgs); + AppenderDB(uint8 id, std::string const& name, LogLevel level, AppenderFlags flags, std::vector extraArgs); ~AppenderDB(); void setRealmId(uint32 realmId) override; diff --git a/src/server/database/Updater/DBUpdater.cpp b/src/server/database/Updater/DBUpdater.cpp index 63257571177..117c3097478 100644 --- a/src/server/database/Updater/DBUpdater.cpp +++ b/src/server/database/Updater/DBUpdater.cpp @@ -41,18 +41,12 @@ bool DBUpdaterUtil::CheckExecutable() boost::filesystem::path exe(GetCorrectedMySQLExecutable()); if (!exists(exe)) { - exe.clear(); - - if (auto path = Trinity::SearchExecutableInPath("mysql")) + exe = Trinity::SearchExecutableInPath("mysql"); + if (!exe.empty() && exists(exe)) { - exe = std::move(*path); - - if (!exe.empty() && exists(exe)) - { - // Correct the path to the cli - corrected_path() = absolute(exe).generic_string(); - return true; - } + // Correct the path to the cli + corrected_path() = absolute(exe).generic_string(); + return true; } TC_LOG_FATAL("sql.updates", "Didn't find any executable MySQL binary at \'%s\' or in path, correct the path in the *.conf (\"MySQLExecutable\").", @@ -347,7 +341,7 @@ bool DBUpdater::Populate(DatabaseWorkerPool& pool) template QueryResult DBUpdater::Retrieve(DatabaseWorkerPool& pool, std::string const& query) { - return pool.PQuery(query.c_str()); + return pool.Query(query.c_str()); } template diff --git a/src/server/database/Updater/UpdateFetcher.h b/src/server/database/Updater/UpdateFetcher.h index 51f735e797f..0ca18f43886 100644 --- a/src/server/database/Updater/UpdateFetcher.h +++ b/src/server/database/Updater/UpdateFetcher.h @@ -23,6 +23,7 @@ #include #include #include +#include #include class TC_DATABASE_API UpdateFetcher -- cgit v1.2.3