diff options
Diffstat (limited to 'src/shared/Database/DatabaseImpl.h')
| -rw-r--r-- | src/shared/Database/DatabaseImpl.h | 218 |
1 files changed, 106 insertions, 112 deletions
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<class Class> 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<Class>(object, method), itr->second)); - return true; + ASYNC_QUERY_BODY(sql, itr) + return m_threadBody->Delay(new SqlQuery(sql, new Trinity::QueryCallback<Class>(object, method), itr->second)); } template<class Class, typename ParamType1> 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<Class, ParamType1>(object, method, (QueryResult*)NULL, param1), itr->second)); - return true; + ASYNC_QUERY_BODY(sql, itr) + return m_threadBody->Delay(new SqlQuery(sql, new Trinity::QueryCallback<Class, ParamType1>(object, method, (QueryResult*)NULL, param1), itr->second)); } template<class Class, typename ParamType1, typename ParamType2> 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<Class, ParamType1, ParamType2>(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<Class, ParamType1, ParamType2>(object, method, (QueryResult*)NULL, param1, param2), itr->second)); +} + +template<class Class, typename ParamType1, typename ParamType2, typename ParamType3> +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<Class, ParamType1, ParamType2, ParamType3>(object, method, (QueryResult*)NULL, param1, param2, param3), itr->second)); } +// -- Query / static -- + template<typename ParamType1> 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<ParamType1>(method, (QueryResult*)NULL, param1), itr->second)); - return true; + ASYNC_QUERY_BODY(sql, itr) + return m_threadBody->Delay(new SqlQuery(sql, new Trinity::SQueryCallback<ParamType1>(method, (QueryResult*)NULL, param1), itr->second)); } template<typename ParamType1, typename ParamType2> 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<ParamType1, ParamType2>(method, (QueryResult*)NULL, param1, param2), itr->second)); - return true; + ASYNC_QUERY_BODY(sql, itr) + return m_threadBody->Delay(new SqlQuery(sql, new Trinity::SQueryCallback<ParamType1, ParamType2>(method, (QueryResult*)NULL, param1, param2), itr->second)); } -template<class Class> +template<typename ParamType1, typename ParamType2, typename ParamType3> 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<ParamType1, ParamType2, ParamType3>(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<class Class> +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<class Class, typename ParamType1> 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<class Class, typename ParamType1, typename ParamType2> 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<typename ParamType1> +template<class Class, typename ParamType1, typename ParamType2, typename ParamType3> 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<typename ParamType1> +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<typename ParamType1, typename ParamType2> 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<typename ParamType1, typename ParamType2, typename ParamType3> +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<class Class> 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<Class, SqlQueryHolder*>(object, method, (QueryResult*)NULL, holder), m_threadBody, itr->second); - return true; + ASYNC_DELAYHOLDER_BODY(holder, itr) + return holder->Execute(new Trinity::QueryCallback<Class, SqlQueryHolder*>(object, method, (QueryResult*)NULL, holder), m_threadBody, itr->second); } template<class Class, typename ParamType1> 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<Class, SqlQueryHolder*, ParamType1>(object, method, (QueryResult*)NULL, holder, param1), m_threadBody, itr->second); - return true; + ASYNC_DELAYHOLDER_BODY(holder, itr) + return holder->Execute(new Trinity::QueryCallback<Class, SqlQueryHolder*, ParamType1>(object, method, (QueryResult*)NULL, holder, param1), m_threadBody, itr->second); } + +#undef ASYNC_QUERY_BODY +#undef ASYNC_PQUERY_BODY +#undef ASYNC_DELAYHOLDER_BODY |