aboutsummaryrefslogtreecommitdiff
path: root/src/shared/Database
diff options
context:
space:
mode:
Diffstat (limited to 'src/shared/Database')
-rw-r--r--src/shared/Database/CMakeLists.txt6
-rw-r--r--src/shared/Database/Database.cpp401
-rw-r--r--src/shared/Database/Database.h71
-rw-r--r--src/shared/Database/DatabaseEnv.h6
-rw-r--r--src/shared/Database/DatabaseMysql.cpp435
-rw-r--r--src/shared/Database/DatabaseMysql.h80
-rw-r--r--src/shared/Database/MySQLDelayThread.h33
-rw-r--r--src/shared/Database/QueryResult.cpp (renamed from src/shared/Database/QueryResultMysql.cpp)15
-rw-r--r--src/shared/Database/QueryResult.h22
-rw-r--r--src/shared/Database/QueryResultMysql.h47
-rw-r--r--src/shared/Database/SQLStorage.cpp2
-rw-r--r--src/shared/Database/SqlDelayThread.h2
12 files changed, 470 insertions, 650 deletions
diff --git a/src/shared/Database/CMakeLists.txt b/src/shared/Database/CMakeLists.txt
index e046906ad67..405a5f89a57 100644
--- a/src/shared/Database/CMakeLists.txt
+++ b/src/shared/Database/CMakeLists.txt
@@ -6,14 +6,10 @@ SET(trinitydatabase_STAT_SRCS
Database.h
DatabaseEnv.h
DatabaseImpl.h
- DatabaseMysql.cpp
- DatabaseMysql.h
Field.cpp
Field.h
- MySQLDelayThread.h
+ QueryResult.cpp
QueryResult.h
- QueryResultMysql.cpp
- QueryResultMysql.h
SQLStorage.cpp
SQLStorage.h
SqlDelayThread.cpp
diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp
index 92538b7d201..bc4e863132e 100644
--- a/src/shared/Database/Database.cpp
+++ b/src/shared/Database/Database.cpp
@@ -24,15 +24,51 @@
#include "Common.h"
#include "../../game/UpdateFields.h"
+#include "Util.h"
+#include "Policies/SingletonImp.h"
+#include "Platform/Define.h"
+#include "Threading.h"
+#include "Database/SqlDelayThread.h"
+#include "Database/SqlOperations.h"
+#include "Timer.h"
+
+
#include <ctime>
#include <iostream>
#include <fstream>
+size_t Database::db_count = 0;
+
+Database::Database()
+{
+ // before first connection
+ if (db_count++ == 0)
+ {
+ // Mysql Library Init
+ mysql_library_init(-1, NULL, NULL);
+
+ if (!mysql_thread_safe())
+ {
+ sLog.outError("FATAL ERROR: Used MySQL library isn't thread-safe.");
+ exit(1);
+ }
+ }
+}
+
Database::~Database()
{
+ if (m_delayThread)
+ HaltDelayThread();
+
+ if (mMysql)
+ mysql_close(mMysql);
+
+ // Free Mysql library pointers for last ~DB
+ if (--db_count == 0)
+ mysql_library_end();
}
-bool Database::Initialize(const char *)
+bool Database::Initialize(const char *infoString)
{
// Enable logging of SQL commands (usally only GM commands)
// (See method: PExecuteLog)
@@ -44,15 +80,114 @@ bool Database::Initialize(const char *)
m_logsDir.append("/");
}
- return true;
+ tranThread = NULL;
+ MYSQL *mysqlInit;
+ mysqlInit = mysql_init(NULL);
+ if (!mysqlInit)
+ {
+ sLog.outError("Could not initialize Mysql connection");
+ return false;
+ }
+
+ InitDelayThread();
+
+ Tokens tokens = StrSplit(infoString, ";");
+
+ Tokens::iterator iter;
+
+ std::string host, port_or_socket, user, password, database;
+ int port;
+ char const* unix_socket;
+
+ iter = tokens.begin();
+
+ if (iter != tokens.end())
+ host = *iter++;
+ if (iter != tokens.end())
+ port_or_socket = *iter++;
+ if (iter != tokens.end())
+ user = *iter++;
+ if (iter != tokens.end())
+ password = *iter++;
+ if (iter != tokens.end())
+ database = *iter++;
+
+ mysql_options(mysqlInit, MYSQL_SET_CHARSET_NAME, "utf8");
+ #ifdef WIN32
+ if (host==".") // named pipe use option (Windows)
+ {
+ unsigned int opt = MYSQL_PROTOCOL_PIPE;
+ mysql_options(mysqlInit, MYSQL_OPT_PROTOCOL, (char const*)&opt);
+ port = 0;
+ unix_socket = 0;
+ }
+ else // generic case
+ {
+ port = atoi(port_or_socket.c_str());
+ unix_socket = 0;
+ }
+ #else
+ if (host==".") // socket use option (Unix/Linux)
+ {
+ unsigned int opt = MYSQL_PROTOCOL_SOCKET;
+ mysql_options(mysqlInit, MYSQL_OPT_PROTOCOL, (char const*)&opt);
+ host = "localhost";
+ port = 0;
+ unix_socket = port_or_socket.c_str();
+ }
+ else // generic case
+ {
+ port = atoi(port_or_socket.c_str());
+ unix_socket = 0;
+ }
+ #endif
+
+ mMysql = mysql_real_connect(mysqlInit, host.c_str(), user.c_str(),
+ password.c_str(), database.c_str(), port, unix_socket, 0);
+
+ if (mMysql)
+ {
+ sLog.outDetail("Connected to MySQL database at %s", host.c_str());
+ sLog.outString("MySQL client library: %s", mysql_get_client_info());
+ sLog.outString("MySQL server ver: %s ", mysql_get_server_info( mMysql));
+
+ if (!mysql_autocommit(mMysql, 1))
+ sLog.outDetail("AUTOCOMMIT SUCCESSFULLY SET TO 1");
+ else
+ sLog.outDetail("AUTOCOMMIT NOT SET TO 1");
+
+ // set connection properties to UTF8 to properly handle locales for different
+ // server configs - core sends data in UTF8, so MySQL must expect UTF8 too
+ PExecute("SET NAMES `utf8`");
+ PExecute("SET CHARACTER SET `utf8`");
+
+ #if MYSQL_VERSION_ID >= 50003
+ my_bool my_true = (my_bool)1;
+ if (mysql_options(mMysql, MYSQL_OPT_RECONNECT, &my_true))
+ sLog.outDetail("Failed to turn on MYSQL_OPT_RECONNECT.");
+ else
+ sLog.outDetail("Successfully turned on MYSQL_OPT_RECONNECT.");
+ #else
+ #warning "Your mySQL client lib version does not support reconnecting after a timeout.\nIf this causes you any trouble we advice you to upgrade your mySQL client libs to at least mySQL 5.0.13 to resolve this problem."
+ #endif
+ return true;
+ }
+ else
+ {
+ sLog.outError("Could not connect to MySQL database at %s: %s\n", host.c_str(),mysql_error(mysqlInit));
+ mysql_close(mysqlInit);
+ return false;
+ }
}
void Database::ThreadStart()
{
+ mysql_thread_init();
}
void Database::ThreadEnd()
{
+ mysql_thread_end();
}
void Database::escape_string(std::string& str)
@@ -66,6 +201,15 @@ void Database::escape_string(std::string& str)
delete[] buf;
}
+unsigned long Database::escape_string(char *to, const char *from, unsigned long length)
+{
+ if (!mMysql || !to || !from || !length)
+ return 0;
+
+ return(mysql_real_escape_string(mMysql, to, from, length));
+}
+
+
bool Database::PExecuteLog(const char * format,...)
{
if (!format)
@@ -115,6 +259,65 @@ void Database::SetResultQueue(SqlResultQueue * queue)
m_queryQueues[ACE_Based::Thread::current()] = queue;
}
+bool Database::_Query(const char *sql, MYSQL_RES **pResult, MYSQL_FIELD **pFields, uint64* pRowCount, uint32* pFieldCount)
+{
+ if (!mMysql)
+ return 0;
+
+ {
+ // guarded block for thread-safe mySQL request
+ ACE_Guard<ACE_Thread_Mutex> query_connection_guard(mMutex);
+ #ifdef TRINITY_DEBUG
+ uint32 _s = getMSTime();
+ #endif
+ if (mysql_query(mMysql, sql))
+ {
+ sLog.outErrorDb("SQL: %s", sql);
+ sLog.outErrorDb("query ERROR: %s", mysql_error(mMysql));
+ return false;
+ }
+ else
+ {
+ #ifdef TRINITY_DEBUG
+ sLog.outDebug("[%u ms] SQL: %s", getMSTimeDiff(_s,getMSTime()), sql );
+ #endif
+ }
+
+ *pResult = mysql_store_result(mMysql);
+ *pRowCount = mysql_affected_rows(mMysql);
+ *pFieldCount = mysql_field_count(mMysql);
+ }
+
+ if (!*pResult )
+ return false;
+
+ if (!*pRowCount)
+ {
+ mysql_free_result(*pResult);
+ return false;
+ }
+
+ *pFields = mysql_fetch_fields(*pResult);
+ return true;
+}
+
+QueryResult_AutoPtr Database::Query(const char *sql)
+{
+ MYSQL_RES *result = NULL;
+ MYSQL_FIELD *fields = NULL;
+ uint64 rowCount = 0;
+ uint32 fieldCount = 0;
+
+ if (!_Query(sql, &result, &fields, &rowCount, &fieldCount))
+ return QueryResult_AutoPtr(NULL);
+
+ QueryResult *queryResult = new QueryResult(result, fields, rowCount, fieldCount);
+
+ queryResult->NextRow();
+
+ return QueryResult_AutoPtr(queryResult);
+}
+
QueryResult_AutoPtr Database::PQuery(const char *format,...)
{
if (!format)
@@ -135,6 +338,27 @@ QueryResult_AutoPtr Database::PQuery(const char *format,...)
return Query(szQuery);
}
+QueryNamedResult* Database::QueryNamed(const char *sql)
+{
+ MYSQL_RES *result = NULL;
+ MYSQL_FIELD *fields = NULL;
+ uint64 rowCount = 0;
+ uint32 fieldCount = 0;
+
+ if (!_Query(sql, &result, &fields, &rowCount, &fieldCount))
+ return NULL;
+
+ QueryFieldNames names(fieldCount);
+ for (uint32 i = 0; i < fieldCount; i++)
+ names[i] = fields[i].name;
+
+ QueryResult *queryResult = new QueryResult(result, fields, rowCount, fieldCount);
+
+ queryResult->NextRow();
+
+ return new QueryNamedResult(queryResult, names);
+}
+
QueryNamedResult* Database::PQueryNamed(const char *format,...)
{
if (!format)
@@ -155,6 +379,25 @@ QueryNamedResult* Database::PQueryNamed(const char *format,...)
return QueryNamed(szQuery);
}
+bool Database::Execute(const char *sql)
+{
+ if (!mMysql)
+ return false;
+
+ // don't use queued execution if it has not been initialized
+ if (!m_threadBody)
+ return DirectExecute(sql);
+
+ tranThread = ACE_Based::Thread::current(); // owner of this transaction
+ TransactionQueues::iterator i = m_tranQueues.find(tranThread);
+ if (i != m_tranQueues.end() && i->second != NULL)
+ i->second->DelayExecute(sql); // Statement for transaction
+ else
+ m_threadBody->Delay(new SqlStatement(sql)); // Simple sql statement
+
+ return true;
+}
+
bool Database::PExecute(const char * format,...)
{
if (!format)
@@ -194,6 +437,35 @@ bool Database::_SetDataBlobValue(const uint32 guid, const uint32 field, const ui
field, value, -int32(PLAYER_END-field), guid);
}
+bool Database::DirectExecute(const char* sql)
+{
+ if (!mMysql)
+ return false;
+
+ {
+ // guarded block for thread-safe mySQL request
+ ACE_Guard<ACE_Thread_Mutex> query_connection_guard(mMutex);
+
+ #ifdef TRINITY_DEBUG
+ uint32 _s = getMSTime();
+ #endif
+ if (mysql_query(mMysql, sql))
+ {
+ sLog.outErrorDb("SQL: %s", sql);
+ sLog.outErrorDb("SQL ERROR: %s", mysql_error(mMysql));
+ return false;
+ }
+ else
+ {
+ #ifdef TRINITY_DEBUG
+ sLog.outDebug("[%u ms] SQL: %s", getMSTimeDiff(_s,getMSTime()), sql);
+ #endif
+ }
+ }
+
+ return true;
+}
+
bool Database::DirectPExecute(const char * format,...)
{
if (!format)
@@ -250,3 +522,128 @@ bool Database::CheckRequiredField(char const* table_name, char const* required_n
return false;
}
+
+bool Database::_TransactionCmd(const char *sql)
+{
+ if (mysql_query(mMysql, sql))
+ {
+ sLog.outError("SQL: %s", sql);
+ sLog.outError("SQL ERROR: %s", mysql_error(mMysql));
+ return false;
+ }
+ else
+ DEBUG_LOG("SQL: %s", sql);
+
+ return true;
+}
+
+bool Database::BeginTransaction()
+{
+ if (!mMysql)
+ return false;
+
+ // don't use queued execution if it has not been initialized
+ if (!m_threadBody)
+ {
+ if (tranThread == ACE_Based::Thread::current())
+ return false; // huh? this thread already started transaction
+
+ mMutex.acquire();
+ if (!_TransactionCmd("START TRANSACTION"))
+ {
+ mMutex.release(); // can't start transaction
+ return false;
+ }
+ return true; // transaction started
+ }
+
+ tranThread = ACE_Based::Thread::current(); // owner of this transaction
+ TransactionQueues::iterator i = m_tranQueues.find(tranThread);
+ if (i != m_tranQueues.end() && i->second != NULL)
+ // If for thread exists queue and also contains transaction
+ // delete that transaction (not allow trans in trans)
+ delete i->second;
+
+ m_tranQueues[tranThread] = new SqlTransaction();
+
+ return true;
+}
+
+bool Database::CommitTransaction()
+{
+ if (!mMysql)
+ return false;
+
+ // don't use queued execution if it has not been initialized
+ if (!m_threadBody)
+ {
+ if (tranThread != ACE_Based::Thread::current())
+ return false;
+
+ bool _res = _TransactionCmd("COMMIT");
+ tranThread = NULL;
+ mMutex.release();
+ return _res;
+ }
+
+ tranThread = ACE_Based::Thread::current();
+ TransactionQueues::iterator i = m_tranQueues.find(tranThread);
+ if (i != m_tranQueues.end() && i->second != NULL)
+ {
+ m_threadBody->Delay(i->second);
+ i->second = NULL;
+ return true;
+ }
+ else
+ return false;
+}
+
+bool Database::RollbackTransaction()
+{
+ if (!mMysql)
+ return false;
+
+ // don't use queued execution if it has not been initialized
+ if (!m_threadBody)
+ {
+ if (tranThread != ACE_Based::Thread::current())
+ return false;
+
+ bool _res = _TransactionCmd("ROLLBACK");
+ tranThread = NULL;
+ mMutex.release();
+ return _res;
+ }
+
+ tranThread = ACE_Based::Thread::current();
+ TransactionQueues::iterator i = m_tranQueues.find(tranThread);
+ if (i != m_tranQueues.end() && i->second != NULL)
+ {
+ delete i->second;
+ i->second = NULL;
+ }
+
+ return true;
+}
+
+void Database::InitDelayThread()
+{
+ assert(!m_delayThread);
+
+ //New delay thread for delay execute
+ m_threadBody = new SqlDelayThread(this); // will deleted at m_delayThread delete
+ m_delayThread = new ACE_Based::Thread(m_threadBody);
+}
+
+void Database::HaltDelayThread()
+{
+ if (!m_threadBody || !m_delayThread)
+ return;
+
+ m_threadBody->Stop(); //Stop event
+ m_delayThread->wait(); //Wait for flush to DB
+ delete m_delayThread; //This also deletes m_threadBody
+ m_delayThread = NULL;
+ m_threadBody = NULL;
+}
+
diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h
index 577a6ad25dd..4a648ad2e80 100644
--- a/src/shared/Database/Database.h
+++ b/src/shared/Database/Database.h
@@ -24,6 +24,17 @@
#include "Threading.h"
#include "Utilities/UnorderedMap.h"
#include "Database/SqlDelayThread.h"
+#include "Policies/Singleton.h"
+#include "ace/Thread_Mutex.h"
+#include "ace/Guard_T.h"
+
+#ifdef WIN32
+#define FD_SETSIZE 1024
+#include <winsock2.h>
+#include <mysql/mysql.h>
+#else
+#include <mysql.h>
+#endif
class SqlTransaction;
class SqlResultQueue;
@@ -37,8 +48,6 @@ typedef UNORDERED_MAP<ACE_Based::Thread* , SqlResultQueue*> QueryQueues;
class Database
{
protected:
- Database() : m_threadBody(NULL), m_delayThread(NULL) {};
-
TransactionQueues m_tranQueues; ///< Transaction queues from diff. threads
QueryQueues m_queryQueues; ///< Query queues from diff threads
SqlDelayThread* m_threadBody; ///< Pointer to delay sql executer (owned by m_delayThread)
@@ -46,15 +55,18 @@ class Database
public:
- virtual ~Database();
+ Database();
+ ~Database();
+
+ /*! infoString should be formated like hostname;username;password;database. */
+ bool Initialize(const char *infoString);
- virtual bool Initialize(const char *infoString);
- virtual void InitDelayThread() = 0;
- virtual void HaltDelayThread() = 0;
+ void InitDelayThread();
+ void HaltDelayThread();
- virtual QueryResult_AutoPtr Query(const char *sql) = 0;
+ QueryResult_AutoPtr Query(const char *sql);
QueryResult_AutoPtr PQuery(const char *format,...) ATTR_PRINTF(2,3);
- virtual QueryNamedResult* QueryNamed(const char *sql) = 0;
+ QueryNamedResult* QueryNamed(const char *sql);
QueryNamedResult* PQueryNamed(const char *format,...) ATTR_PRINTF(2,3);
/// Async queries and query holders, implemented in DatabaseImpl.h
@@ -97,9 +109,9 @@ class Database
template<class Class, typename ParamType1>
bool DelayQueryHolder(Class *object, void (Class::*method)(QueryResult_AutoPtr, SqlQueryHolder*, ParamType1), SqlQueryHolder *holder, ParamType1 param1);
- virtual bool Execute(const char *sql) = 0;
+ bool Execute(const char *sql);
bool PExecute(const char *format,...) ATTR_PRINTF(2,3);
- virtual bool DirectExecute(const char* sql) = 0;
+ bool DirectExecute(const char* sql);
bool DirectPExecute(const char *format,...) ATTR_PRINTF(2,3);
bool _UpdateDataBlobValue(const uint32 guid, const uint32 field, const int32 value);
@@ -108,36 +120,35 @@ class Database
// Writes SQL commands to a LOG file (see Trinityd.conf "LogSQL")
bool PExecuteLog(const char *format,...) ATTR_PRINTF(2,3);
- virtual bool BeginTransaction() // nothing do if DB not support transactions
- {
- return true;
- }
- virtual bool CommitTransaction() // nothing do if DB not support transactions
- {
- return true;
- }
- virtual bool RollbackTransaction() // can't rollback without transaction support
- {
- return false;
- }
-
- virtual operator bool () const = 0;
-
- virtual unsigned long escape_string(char *to, const char *from, unsigned long length) { strncpy(to,from,length); return length; }
+ bool BeginTransaction();
+ bool CommitTransaction();
+ bool RollbackTransaction();
+
+ operator bool () const { return mMysql != NULL; }
+ unsigned long escape_string(char *to, const char *from, unsigned long length);
void escape_string(std::string& str);
- // must be called before first query in thread (one time for thread using one from existed Database objects)
- virtual void ThreadStart();
- // must be called before finish thread run (one time for thread using one from existed Database objects)
- virtual void ThreadEnd();
+ void ThreadStart();
+ void ThreadEnd();
// sets the result queue of the current thread, be careful what thread you call this from
void SetResultQueue(SqlResultQueue * queue);
bool CheckRequiredField(char const* table_name, char const* required_name);
+
private:
bool m_logSQL;
std::string m_logsDir;
+ ACE_Thread_Mutex mMutex;
+
+ ACE_Based::Thread * tranThread;
+
+ MYSQL *mMysql;
+
+ static size_t db_count;
+
+ bool _TransactionCmd(const char *sql);
+ bool _Query(const char *sql, MYSQL_RES **pResult, MYSQL_FIELD **pFields, uint64* pRowCount, uint32* pFieldCount);
};
#endif
diff --git a/src/shared/Database/DatabaseEnv.h b/src/shared/Database/DatabaseEnv.h
index 6546fc217a7..69236b076e9 100644
--- a/src/shared/Database/DatabaseEnv.h
+++ b/src/shared/Database/DatabaseEnv.h
@@ -28,10 +28,8 @@
#include "Database/Field.h"
#include "Database/QueryResult.h"
-#include "Database/QueryResultMysql.h"
#include "Database/Database.h"
-#include "Database/DatabaseMysql.h"
-typedef DatabaseMysql DatabaseType;
+typedef Database DatabaseType;
#define _LIKE_ "LIKE"
#define _TABLE_SIM_ "`"
#define _CONCAT3_(A,B,C) "CONCAT( " A " , " B " , " C " )"
@@ -39,7 +37,7 @@ typedef DatabaseMysql DatabaseType;
extern DatabaseType WorldDatabase;
extern DatabaseType CharacterDatabase;
-extern DatabaseType loginDatabase;
+extern DatabaseType LoginDatabase;
#endif
diff --git a/src/shared/Database/DatabaseMysql.cpp b/src/shared/Database/DatabaseMysql.cpp
deleted file mode 100644
index a595d347e5b..00000000000
--- a/src/shared/Database/DatabaseMysql.cpp
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include "Util.h"
-#include "Policies/SingletonImp.h"
-#include "Platform/Define.h"
-#include "Threading.h"
-#include "DatabaseEnv.h"
-#include "Database/MySQLDelayThread.h"
-#include "Database/SqlOperations.h"
-#include "Timer.h"
-
-void DatabaseMysql::ThreadStart()
-{
- mysql_thread_init();
-}
-
-void DatabaseMysql::ThreadEnd()
-{
- mysql_thread_end();
-}
-
-size_t DatabaseMysql::db_count = 0;
-
-DatabaseMysql::DatabaseMysql() : Database(), mMysql(0)
-{
- // before first connection
- if (db_count++ == 0)
- {
- // Mysql Library Init
- mysql_library_init(-1, NULL, NULL);
-
- if (!mysql_thread_safe())
- {
- sLog.outError("FATAL ERROR: Used MySQL library isn't thread-safe.");
- exit(1);
- }
- }
-}
-
-DatabaseMysql::~DatabaseMysql()
-{
- if (m_delayThread)
- HaltDelayThread();
-
- if (mMysql)
- mysql_close(mMysql);
-
- // Free Mysql library pointers for last ~DB
- if (--db_count == 0)
- mysql_library_end();
-}
-
-bool DatabaseMysql::Initialize(const char *infoString)
-{
- if (!Database::Initialize(infoString))
- return false;
-
- tranThread = NULL;
- MYSQL *mysqlInit;
- mysqlInit = mysql_init(NULL);
- if (!mysqlInit)
- {
- sLog.outError("Could not initialize Mysql connection");
- return false;
- }
-
- InitDelayThread();
-
- Tokens tokens = StrSplit(infoString, ";");
-
- Tokens::iterator iter;
-
- std::string host, port_or_socket, user, password, database;
- int port;
- char const* unix_socket;
-
- iter = tokens.begin();
-
- if (iter != tokens.end())
- host = *iter++;
- if (iter != tokens.end())
- port_or_socket = *iter++;
- if (iter != tokens.end())
- user = *iter++;
- if (iter != tokens.end())
- password = *iter++;
- if (iter != tokens.end())
- database = *iter++;
-
- mysql_options(mysqlInit, MYSQL_SET_CHARSET_NAME, "utf8");
- #ifdef WIN32
- if (host==".") // named pipe use option (Windows)
- {
- unsigned int opt = MYSQL_PROTOCOL_PIPE;
- mysql_options(mysqlInit, MYSQL_OPT_PROTOCOL, (char const*)&opt);
- port = 0;
- unix_socket = 0;
- }
- else // generic case
- {
- port = atoi(port_or_socket.c_str());
- unix_socket = 0;
- }
- #else
- if (host==".") // socket use option (Unix/Linux)
- {
- unsigned int opt = MYSQL_PROTOCOL_SOCKET;
- mysql_options(mysqlInit, MYSQL_OPT_PROTOCOL, (char const*)&opt);
- host = "localhost";
- port = 0;
- unix_socket = port_or_socket.c_str();
- }
- else // generic case
- {
- port = atoi(port_or_socket.c_str());
- unix_socket = 0;
- }
- #endif
-
- mMysql = mysql_real_connect(mysqlInit, host.c_str(), user.c_str(),
- password.c_str(), database.c_str(), port, unix_socket, 0);
-
- if (mMysql)
- {
- sLog.outDetail("Connected to MySQL database at %s", host.c_str());
- sLog.outString("MySQL client library: %s", mysql_get_client_info());
- sLog.outString("MySQL server ver: %s ", mysql_get_server_info( mMysql));
-
- if (!mysql_autocommit(mMysql, 1))
- sLog.outDetail("AUTOCOMMIT SUCCESSFULLY SET TO 1");
- else
- sLog.outDetail("AUTOCOMMIT NOT SET TO 1");
-
- // set connection properties to UTF8 to properly handle locales for different
- // server configs - core sends data in UTF8, so MySQL must expect UTF8 too
- PExecute("SET NAMES `utf8`");
- PExecute("SET CHARACTER SET `utf8`");
-
- #if MYSQL_VERSION_ID >= 50003
- my_bool my_true = (my_bool)1;
- if (mysql_options(mMysql, MYSQL_OPT_RECONNECT, &my_true))
- sLog.outDetail("Failed to turn on MYSQL_OPT_RECONNECT.");
- else
- sLog.outDetail("Successfully turned on MYSQL_OPT_RECONNECT.");
- #else
- #warning "Your mySQL client lib version does not support reconnecting after a timeout.\nIf this causes you any trouble we advice you to upgrade your mySQL client libs to at least mySQL 5.0.13 to resolve this problem."
- #endif
-
- return true;
- }
- else
- {
- sLog.outError("Could not connect to MySQL database at %s: %s\n", host.c_str(),mysql_error(mysqlInit));
- mysql_close(mysqlInit);
- return false;
- }
-}
-
-bool DatabaseMysql::_Query(const char *sql, MYSQL_RES **pResult, MYSQL_FIELD **pFields, uint64* pRowCount, uint32* pFieldCount)
-{
- if (!mMysql)
- return 0;
-
- {
- // guarded block for thread-safe mySQL request
- ACE_Guard<ACE_Thread_Mutex> query_connection_guard(mMutex);
- #ifdef TRINITY_DEBUG
- uint32 _s = getMSTime();
- #endif
- if (mysql_query(mMysql, sql))
- {
- sLog.outErrorDb("SQL: %s", sql);
- sLog.outErrorDb("query ERROR: %s", mysql_error(mMysql));
- return false;
- }
- else
- {
- #ifdef TRINITY_DEBUG
- sLog.outDebug("[%u ms] SQL: %s", getMSTimeDiff(_s,getMSTime()), sql );
- #endif
- }
-
- *pResult = mysql_store_result(mMysql);
- *pRowCount = mysql_affected_rows(mMysql);
- *pFieldCount = mysql_field_count(mMysql);
- }
-
- if (!*pResult )
- return false;
-
- if (!*pRowCount)
- {
- mysql_free_result(*pResult);
- return false;
- }
-
- *pFields = mysql_fetch_fields(*pResult);
- return true;
-}
-
-QueryResult_AutoPtr DatabaseMysql::Query(const char *sql)
-{
- MYSQL_RES *result = NULL;
- MYSQL_FIELD *fields = NULL;
- uint64 rowCount = 0;
- uint32 fieldCount = 0;
-
- if (!_Query(sql, &result, &fields, &rowCount, &fieldCount))
- return QueryResult_AutoPtr(NULL);
-
- QueryResultMysql *queryResult = new QueryResultMysql(result, fields, rowCount, fieldCount);
-
- queryResult->NextRow();
-
- return QueryResult_AutoPtr(queryResult);
-}
-
-QueryNamedResult* DatabaseMysql::QueryNamed(const char *sql)
-{
- MYSQL_RES *result = NULL;
- MYSQL_FIELD *fields = NULL;
- uint64 rowCount = 0;
- uint32 fieldCount = 0;
-
- if (!_Query(sql, &result, &fields, &rowCount, &fieldCount))
- return NULL;
-
- QueryFieldNames names(fieldCount);
- for (uint32 i = 0; i < fieldCount; i++)
- names[i] = fields[i].name;
-
- QueryResultMysql *queryResult = new QueryResultMysql(result, fields, rowCount, fieldCount);
-
- queryResult->NextRow();
-
- return new QueryNamedResult(queryResult, names);
-}
-
-bool DatabaseMysql::Execute(const char *sql)
-{
- if (!mMysql)
- return false;
-
- // don't use queued execution if it has not been initialized
- if (!m_threadBody)
- return DirectExecute(sql);
-
- tranThread = ACE_Based::Thread::current(); // owner of this transaction
- TransactionQueues::iterator i = m_tranQueues.find(tranThread);
- if (i != m_tranQueues.end() && i->second != NULL)
- i->second->DelayExecute(sql); // Statement for transaction
- else
- m_threadBody->Delay(new SqlStatement(sql)); // Simple sql statement
-
- return true;
-}
-
-bool DatabaseMysql::DirectExecute(const char* sql)
-{
- if (!mMysql)
- return false;
-
- {
- // guarded block for thread-safe mySQL request
- ACE_Guard<ACE_Thread_Mutex> query_connection_guard(mMutex);
-
- #ifdef TRINITY_DEBUG
- uint32 _s = getMSTime();
- #endif
- if (mysql_query(mMysql, sql))
- {
- sLog.outErrorDb("SQL: %s", sql);
- sLog.outErrorDb("SQL ERROR: %s", mysql_error(mMysql));
- return false;
- }
- else
- {
- #ifdef TRINITY_DEBUG
- sLog.outDebug("[%u ms] SQL: %s", getMSTimeDiff(_s,getMSTime()), sql);
- #endif
- }
- }
-
- return true;
-}
-
-bool DatabaseMysql::_TransactionCmd(const char *sql)
-{
- if (mysql_query(mMysql, sql))
- {
- sLog.outError("SQL: %s", sql);
- sLog.outError("SQL ERROR: %s", mysql_error(mMysql));
- return false;
- }
- else
- DEBUG_LOG("SQL: %s", sql);
-
- return true;
-}
-
-bool DatabaseMysql::BeginTransaction()
-{
- if (!mMysql)
- return false;
-
- // don't use queued execution if it has not been initialized
- if (!m_threadBody)
- {
- if (tranThread == ACE_Based::Thread::current())
- return false; // huh? this thread already started transaction
-
- mMutex.acquire();
- if (!_TransactionCmd("START TRANSACTION"))
- {
- mMutex.release(); // can't start transaction
- return false;
- }
- return true; // transaction started
- }
-
- tranThread = ACE_Based::Thread::current(); // owner of this transaction
- TransactionQueues::iterator i = m_tranQueues.find(tranThread);
- if (i != m_tranQueues.end() && i->second != NULL)
- // If for thread exists queue and also contains transaction
- // delete that transaction (not allow trans in trans)
- delete i->second;
-
- m_tranQueues[tranThread] = new SqlTransaction();
-
- return true;
-}
-
-bool DatabaseMysql::CommitTransaction()
-{
- if (!mMysql)
- return false;
-
- // don't use queued execution if it has not been initialized
- if (!m_threadBody)
- {
- if (tranThread != ACE_Based::Thread::current())
- return false;
-
- bool _res = _TransactionCmd("COMMIT");
- tranThread = NULL;
- mMutex.release();
- return _res;
- }
-
- tranThread = ACE_Based::Thread::current();
- TransactionQueues::iterator i = m_tranQueues.find(tranThread);
- if (i != m_tranQueues.end() && i->second != NULL)
- {
- m_threadBody->Delay(i->second);
- i->second = NULL;
- return true;
- }
- else
- return false;
-}
-
-bool DatabaseMysql::RollbackTransaction()
-{
- if (!mMysql)
- return false;
-
- // don't use queued execution if it has not been initialized
- if (!m_threadBody)
- {
- if (tranThread != ACE_Based::Thread::current())
- return false;
-
- bool _res = _TransactionCmd("ROLLBACK");
- tranThread = NULL;
- mMutex.release();
- return _res;
- }
-
- tranThread = ACE_Based::Thread::current();
- TransactionQueues::iterator i = m_tranQueues.find(tranThread);
- if (i != m_tranQueues.end() && i->second != NULL)
- {
- delete i->second;
- i->second = NULL;
- }
-
- return true;
-}
-
-unsigned long DatabaseMysql::escape_string(char *to, const char *from, unsigned long length)
-{
- if (!mMysql || !to || !from || !length)
- return 0;
-
- return(mysql_real_escape_string(mMysql, to, from, length));
-}
-
-void DatabaseMysql::InitDelayThread()
-{
- assert(!m_delayThread);
-
- //New delay thread for delay execute
- m_threadBody = new MySQLDelayThread(this); // will deleted at m_delayThread delete
- m_delayThread = new ACE_Based::Thread(m_threadBody);
-}
-
-void DatabaseMysql::HaltDelayThread()
-{
- if (!m_threadBody || !m_delayThread)
- return;
-
- m_threadBody->Stop(); //Stop event
- m_delayThread->wait(); //Wait for flush to DB
- delete m_delayThread; //This also deletes m_threadBody
- m_delayThread = NULL;
- m_threadBody = NULL;
-}
diff --git a/src/shared/Database/DatabaseMysql.h b/src/shared/Database/DatabaseMysql.h
deleted file mode 100644
index cc88843fa1e..00000000000
--- a/src/shared/Database/DatabaseMysql.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef _DATABASEMYSQL_H
-#define _DATABASEMYSQL_H
-
-#include "Database.h"
-#include "Policies/Singleton.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Guard_T.h"
-
-#ifdef WIN32
-#define FD_SETSIZE 1024
-#include <winsock2.h>
-#include <mysql/mysql.h>
-#else
-#include <mysql.h>
-#endif
-
-class DatabaseMysql : public Database
-{
- friend class Trinity::OperatorNew<DatabaseMysql>;
-
- public:
- DatabaseMysql();
- ~DatabaseMysql();
-
- //! Initializes Mysql and connects to a server.
- /*! infoString should be formated like hostname;username;password;database. */
- bool Initialize(const char *infoString);
- void InitDelayThread();
- void HaltDelayThread();
- QueryResult_AutoPtr Query(const char *sql);
- QueryNamedResult* QueryNamed(const char *sql);
- bool Execute(const char *sql);
- bool DirectExecute(const char* sql);
- bool BeginTransaction();
- bool CommitTransaction();
- bool RollbackTransaction();
-
- operator bool () const { return mMysql != NULL; }
-
- unsigned long escape_string(char *to, const char *from, unsigned long length);
- using Database::escape_string;
-
- // must be call before first query in thread
- void ThreadStart();
- // must be call before finish thread run
- void ThreadEnd();
- private:
- ACE_Thread_Mutex mMutex;
-
- ACE_Based::Thread * tranThread;
-
- MYSQL *mMysql;
-
- static size_t db_count;
-
- bool _TransactionCmd(const char *sql);
- bool _Query(const char *sql, MYSQL_RES **pResult, MYSQL_FIELD **pFields, uint64* pRowCount, uint32* pFieldCount);
-};
-#endif
-
diff --git a/src/shared/Database/MySQLDelayThread.h b/src/shared/Database/MySQLDelayThread.h
deleted file mode 100644
index cab4ca1d257..00000000000
--- a/src/shared/Database/MySQLDelayThread.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef __MYSQLDELAYTHREAD_H
-#define __MYSQLDELAYTHREAD_H
-
-#include "Database/SqlDelayThread.h"
-
-class MySQLDelayThread : public SqlDelayThread
-{
- public:
- MySQLDelayThread(Database* db) : SqlDelayThread(db) {}
- void Stop() { SqlDelayThread::Stop(); }
-};
-#endif //__MYSQLDELAYTHREAD_H
-
diff --git a/src/shared/Database/QueryResultMysql.cpp b/src/shared/Database/QueryResult.cpp
index b2bc181a166..8b0c437b066 100644
--- a/src/shared/Database/QueryResultMysql.cpp
+++ b/src/shared/Database/QueryResult.cpp
@@ -20,10 +20,11 @@
#include "DatabaseEnv.h"
-QueryResultMysql::QueryResultMysql(MYSQL_RES *result, MYSQL_FIELD *fields, uint64 rowCount, uint32 fieldCount) :
- QueryResult(rowCount, fieldCount), mResult(result)
+QueryResult::QueryResult(MYSQL_RES *result, MYSQL_FIELD *fields, uint64 rowCount, uint32 fieldCount)
+: mResult(result)
+, mFieldCount(fieldCount)
+, mRowCount(rowCount)
{
-
mCurrentRow = new Field[mFieldCount];
ASSERT(mCurrentRow);
@@ -31,12 +32,12 @@ QueryResultMysql::QueryResultMysql(MYSQL_RES *result, MYSQL_FIELD *fields, uint6
mCurrentRow[i].SetType(ConvertNativeType(fields[i].type));
}
-QueryResultMysql::~QueryResultMysql()
+QueryResult::~QueryResult()
{
EndQuery();
}
-bool QueryResultMysql::NextRow()
+bool QueryResult::NextRow()
{
MYSQL_ROW row;
@@ -56,7 +57,7 @@ bool QueryResultMysql::NextRow()
return true;
}
-void QueryResultMysql::EndQuery()
+void QueryResult::EndQuery()
{
if (mCurrentRow)
{
@@ -71,7 +72,7 @@ void QueryResultMysql::EndQuery()
}
}
-enum Field::DataTypes QueryResultMysql::ConvertNativeType(enum_field_types mysqlType) const
+enum Field::DataTypes QueryResult::ConvertNativeType(enum_field_types mysqlType) const
{
switch (mysqlType)
{
diff --git a/src/shared/Database/QueryResult.h b/src/shared/Database/QueryResult.h
index 5c380c0d5d1..4eec9915362 100644
--- a/src/shared/Database/QueryResult.h
+++ b/src/shared/Database/QueryResult.h
@@ -26,15 +26,21 @@
#include "Field.h"
+#ifdef WIN32
+#define FD_SETSIZE 1024
+#include <winsock2.h>
+#include <mysql/mysql.h>
+#else
+#include <mysql.h>
+#endif
+
class QueryResult
{
public:
- QueryResult(uint64 rowCount, uint32 fieldCount)
- : mFieldCount(fieldCount), mRowCount(rowCount) {}
-
- virtual ~QueryResult() {}
+ QueryResult(MYSQL_RES *result, MYSQL_FIELD *fields, uint64 rowCount, uint32 fieldCount);
+ ~QueryResult();
- virtual bool NextRow() = 0;
+ bool NextRow();
Field *Fetch() const { return mCurrentRow; }
@@ -47,6 +53,12 @@ class QueryResult
Field *mCurrentRow;
uint32 mFieldCount;
uint64 mRowCount;
+
+ private:
+ enum Field::DataTypes ConvertNativeType(enum_field_types mysqlType) const;
+ void EndQuery();
+ MYSQL_RES *mResult;
+
};
typedef ACE_Refcounted_Auto_Ptr<QueryResult, ACE_Null_Mutex> QueryResult_AutoPtr;
diff --git a/src/shared/Database/QueryResultMysql.h b/src/shared/Database/QueryResultMysql.h
deleted file mode 100644
index a9a7a60f123..00000000000
--- a/src/shared/Database/QueryResultMysql.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#if !defined(QUERYRESULTMYSQL_H)
-#define QUERYRESULTMYSQL_H
-
-#ifdef WIN32
-#define FD_SETSIZE 1024
-#include <winsock2.h>
-#include <mysql/mysql.h>
-#else
-#include <mysql.h>
-#endif
-
-class QueryResultMysql : public QueryResult
-{
- public:
- QueryResultMysql(MYSQL_RES *result, MYSQL_FIELD *fields, uint64 rowCount, uint32 fieldCount);
-
- ~QueryResultMysql();
-
- bool NextRow();
-
- private:
- enum Field::DataTypes ConvertNativeType(enum_field_types mysqlType) const;
- void EndQuery();
-
- MYSQL_RES *mResult;
-};
-#endif
diff --git a/src/shared/Database/SQLStorage.cpp b/src/shared/Database/SQLStorage.cpp
index 4813c764cba..f42c31b2fea 100644
--- a/src/shared/Database/SQLStorage.cpp
+++ b/src/shared/Database/SQLStorage.cpp
@@ -21,7 +21,7 @@
#include "SQLStorage.h"
#include "SQLStorageImpl.h"
-extern DatabaseMysql WorldDatabase;
+extern Database WorldDatabase;
const char CreatureInfosrcfmt[]="iiiiiiiiiisssiiiiiiifffiffiifiiiiiiiiiiffiiiiiiiiiiiiiiiiiiiiiiiisiifffliiiiiiiliiisi";
const char CreatureInfodstfmt[]="iiiiiiiiiisssibbiiiifffiffiifiiiiiiiiiiffiiiiiiiiiiiiiiiiiiiiiiiisiifffliiiiiiiliiiii";
diff --git a/src/shared/Database/SqlDelayThread.h b/src/shared/Database/SqlDelayThread.h
index 6b72cdd6a19..d603813c8fa 100644
--- a/src/shared/Database/SqlDelayThread.h
+++ b/src/shared/Database/SqlDelayThread.h
@@ -44,7 +44,7 @@ class SqlDelayThread : public ACE_Based::Runnable
///< Put sql statement to delay queue
bool Delay(SqlOperation* sql);
- virtual void Stop(); ///< Stop event
+ void Stop(); ///< Stop event
virtual void run(); ///< Main Thread loop
};
#endif //__SQLDELAYTHREAD_H