diff options
author | Machiavelli <none@none> | 2010-09-24 22:16:21 +0200 |
---|---|---|
committer | Machiavelli <none@none> | 2010-09-24 22:16:21 +0200 |
commit | 3c6dc320308880bde4ef9eddd695db28a74aa0d9 (patch) | |
tree | f209e6c487e436fc1cd978487dddf3604ce2b594 /src/server/game/Pools/PoolMgr.cpp | |
parent | b46b498141cc167163c6112e8e2bfa32fec2d7dc (diff) |
Core/DBLayer:
- Rewrite Field class to be able to store both binary prepared statement data and data from adhoc query resultsets
- Buffer the data of prepared statements using ResultSet and Field classes and let go of mysql c api structures after PreparedResultSet constructor. Fixes a race condition and thus a possible crash/data corruption (issue pointed out to Derex, basic suggestion by raczman)
- Conform PreparedResultSet and ResultSet to the same design standards, and using Field class as data buffer class for both
* NOTE: This means the fetching methods are uniform again, using ¨Field* fields = result->Fetch();¨ and access to elements trough fields[x].
* NOTE: for access to the correct row in prepared statements, ¨Field* fields = result->Fetch();¨ must ALWAYS be called inside the do { }while(result->NextRow()) loop.
* NOTE: This means that Field::GetString() returns std::string object and Field::GetCString() returns const char* pointer.
Still experimental and all that jazz, not recommended for production servers until feedback is given.
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Pools/PoolMgr.cpp')
-rw-r--r-- | src/server/game/Pools/PoolMgr.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index 9eb21c63e56..9944c360bc4 100644 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -852,8 +852,10 @@ void PoolMgr::LoadQuestPools() { bar.step(); - uint32 entry = result->GetUInt32(0); - uint32 pool_id = result->GetUInt32(1); + Field* fields = result->Fetch(); + + uint32 entry = fields[0].GetUInt32(); + uint32 pool_id = fields[1].GetUInt32(); Quest const* pQuest = sObjectMgr.GetQuestTemplate(entry); if (!pQuest) @@ -905,7 +907,9 @@ void PoolMgr::LoadQuestPools() SearchPair p(entry, pool_id); mQuestSearchMap.insert(p); - } while (result->NextRow()); + } + while (result->NextRow()); + sLog.outString(); sLog.outString(">> Loaded %u quests in pools", count); } |