From 65ef38963ddc60e05491ca9d3e2685913c0038bb Mon Sep 17 00:00:00 2001 From: megamage Date: Mon, 22 Dec 2008 10:59:38 -0600 Subject: *The last merge from Mangos TBC. Update to Mangos v0.12. --HG-- branch : trunk --- src/shared/Database/Database.h | 18 ++- src/shared/Database/DatabaseImpl.h | 218 +++++++++++++++++----------------- src/shared/Database/SqlDelayThread.h | 6 +- src/shared/Database/SqlOperations.cpp | 5 +- src/shared/Database/SqlOperations.h | 2 +- 5 files changed, 129 insertions(+), 120 deletions(-) (limited to 'src/shared/Database') diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h index dc3eb174727..30d7193801e 100644 --- a/src/shared/Database/Database.h +++ b/src/shared/Database/Database.h @@ -10,12 +10,12 @@ * * 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 + * 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 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef DATABASE_H @@ -57,27 +57,41 @@ class TRINITY_DLL_SPEC Database QueryResult* PQuery(const char *format,...) ATTR_PRINTF(2,3); /// Async queries and query holders, implemented in DatabaseImpl.h + + // Query / member template bool AsyncQuery(Class *object, void (Class::*method)(QueryResult*), const char *sql); template bool AsyncQuery(Class *object, void (Class::*method)(QueryResult*, ParamType1), ParamType1 param1, const char *sql); template bool AsyncQuery(Class *object, void (Class::*method)(QueryResult*, ParamType1, ParamType2), ParamType1 param1, ParamType2 param2, const char *sql); + template + bool AsyncQuery(Class *object, void (Class::*method)(QueryResult*, ParamType1, ParamType2, ParamType3), ParamType1 param1, ParamType2 param2, ParamType3 param3, const char *sql); + // Query / static template bool AsyncQuery(void (*method)(QueryResult*, ParamType1), ParamType1 param1, const char *sql); template bool AsyncQuery(void (*method)(QueryResult*, ParamType1, ParamType2), ParamType1 param1, ParamType2 param2, const char *sql); + template + bool AsyncQuery(void (*method)(QueryResult*, ParamType1, ParamType2, ParamType3), ParamType1 param1, ParamType2 param2, ParamType3 param3, const char *sql); + // PQuery / member template bool AsyncPQuery(Class *object, void (Class::*method)(QueryResult*), const char *format,...) ATTR_PRINTF(4,5); template bool AsyncPQuery(Class *object, void (Class::*method)(QueryResult*, ParamType1), ParamType1 param1, const char *format,...) ATTR_PRINTF(5,6); template bool AsyncPQuery(Class *object, void (Class::*method)(QueryResult*, ParamType1, ParamType2), ParamType1 param1, ParamType2 param2, const char *format,...) ATTR_PRINTF(5,6); + template + bool AsyncPQuery(Class *object, void (Class::*method)(QueryResult*, ParamType1, ParamType2, ParamType3), ParamType1 param1, ParamType2 param2, ParamType3 param3, const char *format,...) ATTR_PRINTF(5,6); + // PQuery / static template bool AsyncPQuery(void (*method)(QueryResult*, ParamType1), ParamType1 param1, const char *format,...) ATTR_PRINTF(5,6); template bool AsyncPQuery(void (*method)(QueryResult*, ParamType1, ParamType2), ParamType1 param1, ParamType2 param2, const char *format,...) ATTR_PRINTF(5,6); + template + bool AsyncPQuery(void (*method)(QueryResult*, ParamType1, ParamType2, ParamType3), ParamType1 param1, ParamType2 param2, ParamType3 param3, const char *format,...) ATTR_PRINTF(5,6); template + // QueryHolder bool DelayQueryHolder(Class *object, void (Class::*method)(QueryResult*, SqlQueryHolder*), SqlQueryHolder *holder); template bool DelayQueryHolder(Class *object, void (Class::*method)(QueryResult*, SqlQueryHolder*, ParamType1), SqlQueryHolder *holder, ParamType1 param1); diff --git a/src/shared/Database/DatabaseImpl.h b/src/shared/Database/DatabaseImpl.h index 175de989d75..85ce1aa3ec1 100644 --- a/src/shared/Database/DatabaseImpl.h +++ b/src/shared/Database/DatabaseImpl.h @@ -23,84 +23,114 @@ /// Function body definitions for the template function members of the Database class +#define ASYNC_QUERY_BODY(sql, queue_itr) \ + if (!sql) return false; \ + \ + QueryQueues::iterator queue_itr; \ + \ + { \ + ZThread::ThreadImpl * queryThread = ZThread::ThreadImpl::current(); \ + queue_itr = m_queryQueues.find(queryThread); \ + if (queue_itr == m_queryQueues.end()) return false; \ + } + +#define ASYNC_PQUERY_BODY(format, szQuery) \ + if(!format) return false; \ + \ + char szQuery [MAX_QUERY_LEN]; \ + \ + { \ + va_list ap; \ + \ + va_start(ap, format); \ + int res = vsnprintf( szQuery, MAX_QUERY_LEN, format, ap ); \ + va_end(ap); \ + \ + if(res==-1) \ + { \ + sLog.outError("SQL Query truncated (and not execute) for format: %s",format); \ + return false; \ + } \ + } + +#define ASYNC_DELAYHOLDER_BODY(holder, queue_itr) \ + if (!holder) return false; \ + \ + QueryQueues::iterator queue_itr; \ + \ + { \ + ZThread::ThreadImpl * queryThread = ZThread::ThreadImpl::current(); \ + queue_itr = m_queryQueues.find(queryThread); \ + if (queue_itr == m_queryQueues.end()) return false; \ + } + +// -- Query / member -- + template bool Database::AsyncQuery(Class *object, void (Class::*method)(QueryResult*), const char *sql) { - if (!sql) return false; - ZThread::ThreadImpl * queryThread = ZThread::ThreadImpl::current(); - QueryQueues::iterator itr = m_queryQueues.find(queryThread); - if (itr == m_queryQueues.end()) return false; - m_threadBody->Delay(new SqlQuery(sql, new Trinity::QueryCallback(object, method), itr->second)); - return true; + ASYNC_QUERY_BODY(sql, itr) + return m_threadBody->Delay(new SqlQuery(sql, new Trinity::QueryCallback(object, method), itr->second)); } template bool Database::AsyncQuery(Class *object, void (Class::*method)(QueryResult*, ParamType1), ParamType1 param1, const char *sql) { - if (!sql) return false; - ZThread::ThreadImpl * queryThread = ZThread::ThreadImpl::current(); - QueryQueues::iterator itr = m_queryQueues.find(queryThread); - if (itr == m_queryQueues.end()) return false; - m_threadBody->Delay(new SqlQuery(sql, new Trinity::QueryCallback(object, method, (QueryResult*)NULL, param1), itr->second)); - return true; + ASYNC_QUERY_BODY(sql, itr) + return m_threadBody->Delay(new SqlQuery(sql, new Trinity::QueryCallback(object, method, (QueryResult*)NULL, param1), itr->second)); } template bool Database::AsyncQuery(Class *object, void (Class::*method)(QueryResult*, ParamType1, ParamType2), ParamType1 param1, ParamType2 param2, const char *sql) { - if (!sql) return false; - ZThread::ThreadImpl * queryThread = ZThread::ThreadImpl::current(); - QueryQueues::iterator itr = m_queryQueues.find(queryThread); - if (itr == m_queryQueues.end()) return false; - m_threadBody->Delay(new SqlQuery(sql, new Trinity::QueryCallback(object, method, (QueryResult*)NULL, param1, param2), itr->second)); - return true; + ASYNC_QUERY_BODY(sql, itr) + return m_threadBody->Delay(new SqlQuery(sql, new Trinity::QueryCallback(object, method, (QueryResult*)NULL, param1, param2), itr->second)); +} + +template +bool +Database::AsyncQuery(Class *object, void (Class::*method)(QueryResult*, ParamType1, ParamType2, ParamType3), ParamType1 param1, ParamType2 param2, ParamType3 param3, const char *sql) +{ + ASYNC_QUERY_BODY(sql, itr) + return m_threadBody->Delay(new SqlQuery(sql, new Trinity::QueryCallback(object, method, (QueryResult*)NULL, param1, param2, param3), itr->second)); } +// -- Query / static -- + template bool Database::AsyncQuery(void (*method)(QueryResult*, ParamType1), ParamType1 param1, const char *sql) { - if (!sql) return false; - ZThread::ThreadImpl * queryThread = ZThread::ThreadImpl::current(); - QueryQueues::iterator itr = m_queryQueues.find(queryThread); - if (itr == m_queryQueues.end()) return false; - m_threadBody->Delay(new SqlQuery(sql, new Trinity::SQueryCallback(method, (QueryResult*)NULL, param1), itr->second)); - return true; + ASYNC_QUERY_BODY(sql, itr) + return m_threadBody->Delay(new SqlQuery(sql, new Trinity::SQueryCallback(method, (QueryResult*)NULL, param1), itr->second)); } template bool Database::AsyncQuery(void (*method)(QueryResult*, ParamType1, ParamType2), ParamType1 param1, ParamType2 param2, const char *sql) { - if (!sql) return false; - ZThread::ThreadImpl * queryThread = ZThread::ThreadImpl::current(); - QueryQueues::iterator itr = m_queryQueues.find(queryThread); - if (itr == m_queryQueues.end()) return false; - m_threadBody->Delay(new SqlQuery(sql, new Trinity::SQueryCallback(method, (QueryResult*)NULL, param1, param2), itr->second)); - return true; + ASYNC_QUERY_BODY(sql, itr) + return m_threadBody->Delay(new SqlQuery(sql, new Trinity::SQueryCallback(method, (QueryResult*)NULL, param1, param2), itr->second)); } -template +template bool -Database::AsyncPQuery(Class *object, void (Class::*method)(QueryResult*), const char *format,...) +Database::AsyncQuery(void (*method)(QueryResult*, ParamType1, ParamType2, ParamType3), ParamType1 param1, ParamType2 param2, ParamType3 param3, const char *sql) { - if(!format) return false; - - va_list ap; - char szQuery [MAX_QUERY_LEN]; - va_start(ap, format); - int res = vsnprintf( szQuery, MAX_QUERY_LEN, format, ap ); - va_end(ap); + ASYNC_QUERY_BODY(sql, itr) + return m_threadBody->Delay(new SqlQuery(sql, new Trinity::SQueryCallback(method, (QueryResult*)NULL, param1, param2, param3), itr->second)); +} - if(res==-1) - { - sLog.outError("SQL Query truncated (and not execute) for format: %s",format); - return false; - } +// -- PQuery / member -- +template +bool +Database::AsyncPQuery(Class *object, void (Class::*method)(QueryResult*), const char *format,...) +{ + ASYNC_PQUERY_BODY(format, szQuery) return AsyncQuery(object, method, szQuery); } @@ -108,20 +138,7 @@ template bool Database::AsyncPQuery(Class *object, void (Class::*method)(QueryResult*, ParamType1), ParamType1 param1, const char *format,...) { - if(!format) return false; - - va_list ap; - char szQuery [MAX_QUERY_LEN]; - va_start(ap, format); - int res = vsnprintf( szQuery, MAX_QUERY_LEN, format, ap ); - va_end(ap); - - if(res==-1) - { - sLog.outError("SQL Query truncated (and not execute) for format: %s",format); - return false; - } - + ASYNC_PQUERY_BODY(format, szQuery) return AsyncQuery(object, method, param1, szQuery); } @@ -129,41 +146,25 @@ template bool Database::AsyncPQuery(Class *object, void (Class::*method)(QueryResult*, ParamType1, ParamType2), ParamType1 param1, ParamType2 param2, const char *format,...) { - if(!format) return false; - - va_list ap; - char szQuery [MAX_QUERY_LEN]; - va_start(ap, format); - int res = vsnprintf( szQuery, MAX_QUERY_LEN, format, ap ); - va_end(ap); - - if(res==-1) - { - sLog.outError("SQL Query truncated (and not execute) for format: %s",format); - return false; - } - + ASYNC_PQUERY_BODY(format, szQuery) return AsyncQuery(object, method, param1, param2, szQuery); } -template +template bool -Database::AsyncPQuery(void (*method)(QueryResult*, ParamType1), ParamType1 param1, const char *format,...) +Database::AsyncPQuery(Class *object, void (Class::*method)(QueryResult*, ParamType1, ParamType2, ParamType3), ParamType1 param1, ParamType2 param2, ParamType3 param3, const char *format,...) { - if(!format) return false; - - va_list ap; - char szQuery [MAX_QUERY_LEN]; - va_start(ap, format); - int res = vsnprintf( szQuery, MAX_QUERY_LEN, format, ap ); - va_end(ap); + ASYNC_PQUERY_BODY(format, szQuery) + return AsyncQuery(object, method, param1, param2, param3, szQuery); +} - if(res==-1) - { - sLog.outError("SQL Query truncated (and not execute) for format: %s",format); - return false; - } +// -- PQuery / static -- +template +bool +Database::AsyncPQuery(void (*method)(QueryResult*, ParamType1), ParamType1 param1, const char *format,...) +{ + ASYNC_PQUERY_BODY(format, szQuery) return AsyncQuery(method, param1, szQuery); } @@ -171,43 +172,36 @@ template bool Database::AsyncPQuery(void (*method)(QueryResult*, ParamType1, ParamType2), ParamType1 param1, ParamType2 param2, const char *format,...) { - if(!format) return false; - - va_list ap; - char szQuery [MAX_QUERY_LEN]; - va_start(ap, format); - int res = vsnprintf( szQuery, MAX_QUERY_LEN, format, ap ); - va_end(ap); - - if(res==-1) - { - sLog.outError("SQL Query truncated (and not execute) for format: %s",format); - return false; - } - + ASYNC_PQUERY_BODY(format, szQuery) return AsyncQuery(method, param1, param2, szQuery); } +template +bool +Database::AsyncPQuery(void (*method)(QueryResult*, ParamType1, ParamType2, ParamType3), ParamType1 param1, ParamType2 param2, ParamType3 param3, const char *format,...) +{ + ASYNC_PQUERY_BODY(format, szQuery) + return AsyncQuery(method, param1, param2, param3, szQuery); +} + +// -- QueryHolder -- + template bool Database::DelayQueryHolder(Class *object, void (Class::*method)(QueryResult*, SqlQueryHolder*), SqlQueryHolder *holder) { - if (!holder) return false; - ZThread::ThreadImpl * queryThread = ZThread::ThreadImpl::current(); - QueryQueues::iterator itr = m_queryQueues.find(queryThread); - if (itr == m_queryQueues.end()) return false; - holder->Execute(new Trinity::QueryCallback(object, method, (QueryResult*)NULL, holder), m_threadBody, itr->second); - return true; + ASYNC_DELAYHOLDER_BODY(holder, itr) + return holder->Execute(new Trinity::QueryCallback(object, method, (QueryResult*)NULL, holder), m_threadBody, itr->second); } template bool Database::DelayQueryHolder(Class *object, void (Class::*method)(QueryResult*, SqlQueryHolder*, ParamType1), SqlQueryHolder *holder, ParamType1 param1) { - if (!holder) return false; - ZThread::ThreadImpl * queryThread = ZThread::ThreadImpl::current(); - QueryQueues::iterator itr = m_queryQueues.find(queryThread); - if (itr == m_queryQueues.end()) return false; - holder->Execute(new Trinity::QueryCallback(object, method, (QueryResult*)NULL, holder, param1), m_threadBody, itr->second); - return true; + ASYNC_DELAYHOLDER_BODY(holder, itr) + return holder->Execute(new Trinity::QueryCallback(object, method, (QueryResult*)NULL, holder, param1), m_threadBody, itr->second); } + +#undef ASYNC_QUERY_BODY +#undef ASYNC_PQUERY_BODY +#undef ASYNC_DELAYHOLDER_BODY diff --git a/src/shared/Database/SqlDelayThread.h b/src/shared/Database/SqlDelayThread.h index fece5d719f6..707a3cab941 100644 --- a/src/shared/Database/SqlDelayThread.h +++ b/src/shared/Database/SqlDelayThread.h @@ -10,12 +10,12 @@ * * 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 + * 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 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __SQLDELAYTHREAD_H @@ -42,7 +42,7 @@ class SqlDelayThread : public ZThread::Runnable SqlDelayThread(Database* db); ///< Put sql statement to delay queue - inline void Delay(SqlOperation* sql) { m_sqlQueue.add(sql); } + inline bool Delay(SqlOperation* sql) { m_sqlQueue.add(sql); return true; } virtual void Stop(); ///< Stop event virtual void run(); ///< Main Thread loop diff --git a/src/shared/Database/SqlOperations.cpp b/src/shared/Database/SqlOperations.cpp index b229b9a5918..42094229b17 100644 --- a/src/shared/Database/SqlOperations.cpp +++ b/src/shared/Database/SqlOperations.cpp @@ -81,15 +81,16 @@ void SqlResultQueue::Update() } } -void SqlQueryHolder::Execute(Trinity::IQueryCallback * callback, SqlDelayThread *thread, SqlResultQueue *queue) +bool SqlQueryHolder::Execute(Trinity::IQueryCallback * callback, SqlDelayThread *thread, SqlResultQueue *queue) { if(!callback || !thread || !queue) - return; + return false; /// delay the execution of the queries, sync them with the delay thread /// which will in turn resync on execution (via the queue) and call back SqlQueryHolderEx *holderEx = new SqlQueryHolderEx(this, callback, queue); thread->Delay(holderEx); + return true; } bool SqlQueryHolder::SetQuery(size_t index, const char *sql) diff --git a/src/shared/Database/SqlOperations.h b/src/shared/Database/SqlOperations.h index a51e48bf929..b06397e84d5 100644 --- a/src/shared/Database/SqlOperations.h +++ b/src/shared/Database/SqlOperations.h @@ -106,7 +106,7 @@ class SqlQueryHolder void SetSize(size_t size); QueryResult* GetResult(size_t index); void SetResult(size_t index, QueryResult *result); - void Execute(Trinity::IQueryCallback * callback, SqlDelayThread *thread, SqlResultQueue *queue); + bool Execute(Trinity::IQueryCallback * callback, SqlDelayThread *thread, SqlResultQueue *queue); }; class SqlQueryHolderEx : public SqlOperation -- cgit v1.2.3