Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 00:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/DBLayer: Don´t prepare asynchronous statements on synchronous connections and vice versa. Prevents allocating RAM that will never be used.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Machiavelli
2010-12-17 15:55:16 +01:00
parent 57d72fa708
commit cb08ec0d74
5 changed files with 181 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/server/shared/Database/MySQLConnection.cpp
View File

@@ -36,14 +36,16 @@ MySQLConnection::MySQLConnection(MySQLConnectionInfo& connInfo) :
m_queue(NULL),
m_worker(NULL),
m_Mysql(NULL),
m_connectionInfo(connInfo)
m_connectionInfo(connInfo),
m_connectionFlags(CONNECTION_SYNCH)
{
}
MySQLConnection::MySQLConnection(ACE_Activation_Queue* queue, MySQLConnectionInfo& connInfo) :
m_queue(queue),
m_Mysql(NULL),
m_connectionInfo(connInfo)
m_connectionInfo(connInfo),
m_connectionFlags(CONNECTION_ASYNC)
{
m_worker = new DatabaseWorker(m_queue, this);
}
@@ -345,11 +347,25 @@ void MySQLConnection::CommitTransaction()
MySQLPreparedStatement* MySQLConnection::GetPreparedStatement(uint32 index)
{
ASSERT(index < m_stmts.size());
return m_stmts[index];
MySQLPreparedStatement* ret = m_stmts[index];
if (!ret)
sLog.outSQLDriver("ERROR: Could not fetch prepared statement %u on database `%s`, connection type: %s.",
index, m_connectionInfo.database.c_str(), (m_connectionFlags & CONNECTION_ASYNC) ? "asynchronous" : "synchronous");
return ret;
}
void MySQLConnection::PrepareStatement(uint32 index, const char* sql)
void MySQLConnection::PrepareStatement(uint32 index, const char* sql, bool async)
{
// Check if specified query should be prepared on this connection
// ie. don't prepare async statements on synchronous connections
// to save memory that will not be used.
if (async && !(m_connectionFlags & CONNECTION_ASYNC))
{
m_stmts[index] = NULL;
return;
}
MYSQL_STMT * stmt = mysql_stmt_init(m_Mysql);
if (!stmt)
{