From 3c6dc320308880bde4ef9eddd695db28a74aa0d9 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Fri, 24 Sep 2010 22:16:21 +0200 Subject: 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. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Still experimental and all that jazz, not recommended for production servers until feedback is given. --HG-- branch : trunk --- src/server/game/Tools/PlayerDump.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/game/Tools') diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp index e49cb2e9fe5..96c6cd87338 100644 --- a/src/server/game/Tools/PlayerDump.cpp +++ b/src/server/game/Tools/PlayerDump.cpp @@ -207,7 +207,7 @@ std::string CreateDumpString(char const* tableName, QueryResult result) if (i == 0) ss << "'"; else ss << ", '"; - std::string s = fields[i].GetCppString(); + std::string s = fields[i].GetString(); CharacterDatabase.escape_string(s); ss << s; @@ -257,7 +257,7 @@ void StoreGUID(QueryResult result,uint32 field,std::set& guids) void StoreGUID(QueryResult result,uint32 data,uint32 field, std::set& guids) { Field* fields = result->Fetch(); - std::string dataStr = fields[data].GetCppString(); + std::string dataStr = fields[data].GetString(); uint32 guid = atoi(gettoknth(dataStr, field).c_str()); if (guid) guids.insert(guid); -- cgit v1.2.3