From 387ee751a92f8d21b5dd4d71915b43aa7b24082a Mon Sep 17 00:00:00 2001
From: Machiavelli <none@none>
Date: Fri, 3 Sep 2010 09:21:28 +0200
Subject: [PATCH] =?UTF-8?q?Core/DBLayer=20-=20Add=20some=20small=20documen?=
 =?UTF-8?q?tation=20on=20prepared=20statement=20defines=20naming=20content?=
 =?UTF-8?q?ion=20(placed=20in=20the=203=20database=20implementation=20head?=
 =?UTF-8?q?er=20files=20so=20it=20can=C2=B4t=20be=20missed)=20-=20Remove?=
 =?UTF-8?q?=20obsolete=20mutex=20declaration=20in=20DatabaseWorkerPool=20(?=
 =?UTF-8?q?was=20unused=20as=20of=20recently)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : trunk
---
 src/server/shared/Database/DatabaseWorkerPool.h             | 1 -
 .../shared/Database/Implementation/CharacterDatabase.h      | 6 ++++++
 src/server/shared/Database/Implementation/LoginDatabase.h   | 6 ++++++
 src/server/shared/Database/Implementation/WorldDatabase.h   | 6 ++++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h
index 8092e8be7eb..fb154e3d8e0 100644
--- a/src/server/shared/Database/DatabaseWorkerPool.h
+++ b/src/server/shared/Database/DatabaseWorkerPool.h
@@ -314,7 +314,6 @@ class DatabaseWorkerPool
 
     private:
         ACE_Activation_Queue*           m_queue;             //! Queue shared by async worker threads.
-        ACE_Thread_Mutex                m_queue_mtx;         //! For thread safe enqueues of delayed statements. 
         std::vector<T*>                 m_async_connections;
         ConnectionMap                   m_sync_connections;  //! Holds a mysql connection+thread per mapUpdate thread and unbundled runnnables.
         ACE_Thread_Mutex                m_connectionMap_mtx; //! For thread safe access to the synchroneous connection map
diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.h b/src/server/shared/Database/Implementation/CharacterDatabase.h
index 7475b045740..69378d34cad 100644
--- a/src/server/shared/Database/Implementation/CharacterDatabase.h
+++ b/src/server/shared/Database/Implementation/CharacterDatabase.h
@@ -37,6 +37,12 @@ typedef DatabaseWorkerPool<CharacterDatabaseConnection> CharacterDatabaseWorkerP
 
 enum CharacterDatabaseStatements
 {
+    /*  Naming standard for defines:
+        {DB}_{SET/DEL/ADD/REP}_{Summary of data changed}
+        When updating more than one field, consider looking at the calling function
+        name for a suiting suffix.
+    */
+
     MAX_CHARACTERDATABASE_STATEMENTS,
 };
 
diff --git a/src/server/shared/Database/Implementation/LoginDatabase.h b/src/server/shared/Database/Implementation/LoginDatabase.h
index dce347ad22e..a3cac75b5a0 100644
--- a/src/server/shared/Database/Implementation/LoginDatabase.h
+++ b/src/server/shared/Database/Implementation/LoginDatabase.h
@@ -37,6 +37,12 @@ typedef DatabaseWorkerPool<LoginDatabaseConnection> LoginDatabaseWorkerPool;
 
 enum LoginDatabaseStatements
 {
+    /*  Naming standard for defines:
+        {DB}_{SET/DEL/ADD/REP}_{Summary of data changed}
+        When updating more than one field, consider looking at the calling function
+        name for a suiting suffix.
+    */
+
     LOGIN_SET_VS,
     LOGIN_SET_LOGONPROOF,
     MAX_LOGINDATABASE_STATEMENTS,
diff --git a/src/server/shared/Database/Implementation/WorldDatabase.h b/src/server/shared/Database/Implementation/WorldDatabase.h
index fb40869cc19..470ea1c6195 100644
--- a/src/server/shared/Database/Implementation/WorldDatabase.h
+++ b/src/server/shared/Database/Implementation/WorldDatabase.h
@@ -37,6 +37,12 @@ typedef DatabaseWorkerPool<WorldDatabaseConnection> WorldDatabaseWorkerPool;
 
 enum WorldDatabaseStatements
 {
+    /*  Naming standard for defines:
+        {DB}_{SET/DEL/ADD/REP}_{Summary of data changed}
+        When updating more than one field, consider looking at the calling function
+        name for a suiting suffix.
+    */
+
     WORLD_DEL_CRESPAWNTIME,
     WORLD_ADD_CRESPAWNTIME,
     MAX_WORLDDATABASE_STATEMENTS,