Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/DBLayer:

Browse Source 
- 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
This commit is contained in:
Machiavelli
2010-09-24 22:16:21 +02:00
parent b46b498141
commit 3c6dc32030
47 changed files with 1003 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/server/shared/Database/Field.cpp
View File

@@ -1,6 +1,4 @@
/*
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
* Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
*
* This program is free software; you can redistribute it and/or modify
@@ -20,58 +18,42 @@
#include "Field.h"
Field::Field() :
mValue(NULL), mType(DB_TYPE_UNKNOWN)
Field::Field()
{
}
Field::Field(Field &f)
{
const char *value;
value = f.GetString();
if (value)
{
mValue = new char[strlen(value) + 1];
if (mValue)
strcpy(mValue, value);
}
else
mValue = NULL;
mType = f.GetType();
}
Field::Field(const char *value, enum Field::DataTypes type) :
mType(type)
{
if (value)
{
mValue = new char[strlen(value) + 1];
if (mValue)
strcpy(mValue, value);
}
else
mValue = NULL;
data.value = NULL;
data.type = MYSQL_TYPE_NULL;
data.length = 0;
}
Field::~Field()
{
if (mValue)
delete [] mValue;
CleanUp();
}
void Field::SetValue(const char *value)
void Field::SetByteValue(void* newValue, const size_t newSize, enum_field_types newType, uint32 length)
{
if (mValue)
delete [] mValue;
if (value)
// This value stores raw bytes that have to be explicitly casted later
if (newValue)
{
mValue = new char[strlen(value) + 1];
strcpy(mValue, value);
data.value = new char [newSize];
memcpy(data.value, newValue, newSize);
data.length = length;
}
else
mValue = NULL;
data.type = newType;
data.raw = true;
}
void Field::SetStructuredValue(char* newValue, enum_field_types newType, const size_t newSize)
{
// This value stores somewhat structured data that needs function style casting
if (newValue)
{
size_t size = strlen(newValue);
data.value = new char [size+1];
strcpy(data.value, newValue);
data.length = size;
}
data.type = newType;
data.raw = false;
}