mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 04:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[6827] Added an interface for defining custom SQLStorage loaders.

Browse source
This commit is contained in:
Wyk3d 2008-11-15 20:30:06 +02:00
parent b195eb87a9
commit 074bd3a08f
8 changed files with 294 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/shared/Database/Makefile.am
View file

@ -55,6 +55,7 @@ libmangosdatabase_a_SOURCES = \
QueryResultSqlite.h \
SQLStorage.cpp \
SQLStorage.h \
SQLStorageImpl.h \
SqlDelayThread.cpp \
SqlDelayThread.h \
SqlOperations.cpp \

136
src/shared/Database/SQLStorage.cpp
View file

@ -17,9 +17,7 @@
*/
#include "SQLStorage.h"
#include "ProgressBar.h"
#include "Log.h"
#include "dbcfile.h"
#include "SQLStorageImpl.h"
#ifdef DO_POSTGRESQL
extern DatabasePostgre WorldDatabase;
@ -53,139 +51,27 @@ void SQLStorage::Free ()
{
uint32 offset=0;
for(uint32 x=0;x<iNumFields;x++)
if (format[x]==FT_STRING)
if (dst_format[x]==FT_STRING)
{
for(uint32 y=0;y<MaxEntry;y++)
if(pIndex[y])
delete [] *(char**)((char*)(pIndex[y])+offset);
offset+=sizeof(char*);
offset += sizeof(char*);
}
else if (format[x]==FT_LOGIC)
offset+=sizeof(bool);
else if (format[x]==FT_BYTE)
offset+=sizeof(char);
else if (dst_format[x]==FT_LOGIC)
offset += sizeof(bool);
else if (dst_format[x]==FT_BYTE)
offset += sizeof(char);
else
offset+=4;
offset += 4;
delete [] pIndex;
delete [] data;
}
void SQLStorage::Load ()
void SQLStorage::Load()
{
uint32 maxi;
Field *fields;
QueryResult *result = WorldDatabase.PQuery("SELECT MAX(%s) FROM %s",entry_field,table);
if(!result)
{
sLog.outError("Error loading %s table (not exist?)\n",table);
exit(1); // Stop server at loading non exited table or not accessable table
}
maxi= (*result)[0].GetUInt32()+1;
delete result;
result = WorldDatabase.PQuery("SELECT COUNT(*) FROM %s",table);
if(result)
{
fields = result->Fetch();
RecordCount=fields[0].GetUInt32();
delete result;
}
else
RecordCount = 0;
result = WorldDatabase.PQuery("SELECT * FROM %s",table);
if(!result)
{
sLog.outError("%s table is empty!\n",table);
RecordCount = 0;
return;
}
uint32 recordsize=0;
uint32 offset=0;
if(iNumFields!=result->GetFieldCount())
{
RecordCount = 0;
sLog.outError("Error in %s table, probably sql file format was updated (there should be %d fields in sql).\n",table,iNumFields);
delete result;
exit(1); // Stop server at loading broken or non-compatible table.
}
//get struct size
uint32 sc=0;
uint32 bo=0;
uint32 bb=0;
for(uint32 x=0;x<iNumFields;x++)
if(format[x]==FT_STRING)
++sc;
else if (format[x]==FT_LOGIC)
++bo;
else if (format[x]==FT_BYTE)
++bb;
recordsize=(iNumFields-sc-bo-bb)*4+sc*sizeof(char*)+bo*sizeof(bool)+bb*sizeof(char);
char** newIndex=new char*[maxi];
memset(newIndex,0,maxi*sizeof(char*));
char * _data= new char[RecordCount *recordsize];
uint32 count=0;
barGoLink bar( RecordCount );
do
{
fields = result->Fetch();
bar.step();
char *p=(char*)&_data[recordsize*count];
newIndex[fields[0].GetUInt32()]=p;
offset=0;
for(uint32 x=0;x<iNumFields;x++)
switch(format[x])
{
case FT_LOGIC:
*((bool*)(&p[offset]))=(fields[x].GetUInt32()>0);
offset+=sizeof(bool);
break;
case FT_BYTE:
*((char*)(&p[offset]))=(fields[x].GetUInt8());
offset+=sizeof(char);
break;
case FT_INT:
*((uint32*)(&p[offset]))=fields[x].GetUInt32();
offset+=sizeof(uint32);
break;
case FT_FLOAT:
*((float*)(&p[offset]))=fields[x].GetFloat();
offset+=sizeof(float);
break;
case FT_STRING:
char const* tmp = fields[x].GetString();
char* st;
if(!tmp)
{
st=new char[1];
*st=0;
}
else
{
uint32 l=strlen(tmp)+1;
st=new char[l];
memcpy(st,tmp,l);
}
*((char**)(&p[offset]))=st;
offset+=sizeof(char*);
break;
}
++count;
}while( result->NextRow() );
delete result;
pIndex =newIndex;
MaxEntry=maxi;
data=_data;
SQLStorageLoader loader;
loader.Load(*this);
}

64
src/shared/Database/SQLStorage.h
View file

@ -24,18 +24,26 @@
class SQLStorage
{
template<class T>
friend struct SQLStorageLoaderBase;
public:
SQLStorage(const char*fmt,const char * _entry_field,const char * sqlname)
SQLStorage(const char* fmt, const char * _entry_field, const char * sqlname)
{
format=fmt;
entry_field = _entry_field;
table=sqlname;
data=NULL;
pIndex=NULL;
iNumFields =strlen(fmt);
MaxEntry = 0;
src_format = fmt;
dst_format = fmt;
init(_entry_field, sqlname);
}
SQLStorage(const char* src_fmt, const char* dst_fmt, const char * _entry_field, const char * sqlname)
{
src_format = src_fmt;
dst_format = dst_fmt;
init(_entry_field, sqlname);
}
~SQLStorage()
{
Free();
@ -54,15 +62,53 @@ class SQLStorage
uint32 RecordCount;
uint32 MaxEntry;
uint32 iNumFields;
void Load();
void Free();
private:
void init(const char * _entry_field, const char * sqlname)
{
entry_field = _entry_field;
table=sqlname;
data=NULL;
pIndex=NULL;
iNumFields = strlen(src_format);
MaxEntry = 0;
}
char** pIndex;
char *data;
const char *format;
const char *src_format;
const char *dst_format;
const char *table;
const char *entry_field;
//bool HasString;
};
template <class T>
struct SQLStorageLoaderBase
{
public:
void Load(SQLStorage &storage);
template<class S, class D>
void convert(uint32 field_pos, S src, D &dst);
template<class S>
void convert_to_str(uint32 field_pos, S src, char * & dst);
template<class D>
void convert_from_str(uint32 field_pos, char * src, D& dst);
void convert_str_to_str(uint32 field_pos, char *src, char *&dst);
private:
template<class V>
void storeValue(V value, SQLStorage &store, char *p, int x, uint32 &offset);
void storeValue(char * value, SQLStorage &store, char *p, int x, uint32 &offset);
};
struct SQLStorageLoader : public SQLStorageLoaderBase<SQLStorageLoader>
{
};
#endif

214
src/shared/Database/SQLStorageImpl.h Normal file
View file

@ -0,0 +1,214 @@
/*
* Copyright (C) 2005-2008 MaNGOS <http://getmangos.com/>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "ProgressBar.h"
#include "Log.h"
#include "dbcfile.h"
template<class T>
template<class S, class D>
void SQLStorageLoaderBase<T>::convert(uint32 field_pos, S src, D &dst)
{
dst = D(src);
}
template<class T>
void SQLStorageLoaderBase<T>::convert_str_to_str(uint32 field_pos, char *src, char *&dst)
{
if(!src)
{
dst = new char[1];
*dst = 0;
}
else
{
uint32 l = strlen(src) + 1;
dst = new char[l];
memcpy(dst, src, l);
}
}
template<class T>
template<class S>
void SQLStorageLoaderBase<T>::convert_to_str(uint32 field_pos, S src, char * & dst)
{
dst = new char[1];
*dst = 0;
}
template<class T>
template<class D>
void SQLStorageLoaderBase<T>::convert_from_str(uint32 field_pos, char * src, D& dst)
{
dst = 0;
}
template<class T>
template<class V>
void SQLStorageLoaderBase<T>::storeValue(V value, SQLStorage &store, char *p, int x, uint32 &offset)
{
T * subclass = (static_cast<T*>(this));
switch(store.dst_format[x])
{
case FT_LOGIC:
subclass->convert(x, value, *((bool*)(&p[offset])) );
offset+=sizeof(bool);
break;
case FT_BYTE:
subclass->convert(x, value, *((char*)(&p[offset])) );
offset+=sizeof(char);
break;
case FT_INT:
subclass->convert(x, value, *((uint32*)(&p[offset])) );
offset+=sizeof(uint32);
break;
case FT_FLOAT:
subclass->convert(x, value, *((float*)(&p[offset])) );
offset+=sizeof(float);
break;
case FT_STRING:
subclass->convert_to_str(x, value, *((char**)(&p[offset])) );
offset+=sizeof(char*);
break;
}
}
template<class T>
void SQLStorageLoaderBase<T>::storeValue(char * value, SQLStorage &store, char *p, int x, uint32 &offset)
{
T * subclass = (static_cast<T*>(this));
switch(store.dst_format[x])
{
case FT_LOGIC:
subclass->convert_from_str(x, value, *((bool*)(&p[offset])) );
offset+=sizeof(bool);
break;
case FT_BYTE:
subclass->convert_from_str(x, value, *((char*)(&p[offset])) );
offset+=sizeof(char);
break;
case FT_INT:
subclass->convert_from_str(x, value, *((uint32*)(&p[offset])) );
offset+=sizeof(uint32);
break;
case FT_FLOAT:
subclass->convert_from_str(x, value, *((float*)(&p[offset])) );
offset+=sizeof(float);
break;
case FT_STRING:
subclass->convert_str_to_str(x, value, *((char**)(&p[offset])) );
offset+=sizeof(char*);
break;
}
}
template<class T>
void SQLStorageLoaderBase<T>::Load(SQLStorage &store)
{
uint32 maxi;
Field *fields;
QueryResult *result = WorldDatabase.PQuery("SELECT MAX(%s) FROM %s", store.entry_field, store.table);
if(!result)
{
sLog.outError("Error loading %s table (not exist?)\n", store.table);
exit(1); // Stop server at loading non exited table or not accessable table
}
maxi = (*result)[0].GetUInt32()+1;
delete result;
result = WorldDatabase.PQuery("SELECT COUNT(*) FROM %s", store.table);
if(result)
{
fields = result->Fetch();
store.RecordCount = fields[0].GetUInt32();
delete result;
}
else
store.RecordCount = 0;
result = WorldDatabase.PQuery("SELECT * FROM %s", store.table);
if(!result)
{
sLog.outError("%s table is empty!\n", store.table);
store.RecordCount = 0;
return;
}
uint32 recordsize = 0;
uint32 offset = 0;
if(store.iNumFields != result->GetFieldCount())
{
store.RecordCount = 0;
sLog.outError("Error in %s table, probably sql file format was updated (there should be %d fields in sql).\n", store.table, store.iNumFields);
delete result;
exit(1); // Stop server at loading broken or non-compatible table.
}
//get struct size
uint32 sc=0;
uint32 bo=0;
uint32 bb=0;
for(uint32 x=0; x< store.iNumFields; x++)
if(store.dst_format[x]==FT_STRING)
++sc;
else if (store.dst_format[x]==FT_LOGIC)
++bo;
else if (store.dst_format[x]==FT_BYTE)
++bb;
recordsize=(store.iNumFields-sc-bo-bb)*4+sc*sizeof(char*)+bo*sizeof(bool)+bb*sizeof(char);
char** newIndex=new char*[maxi];
memset(newIndex,0,maxi*sizeof(char*));
char * _data= new char[store.RecordCount *recordsize];
uint32 count=0;
barGoLink bar( store.RecordCount );
do
{
fields = result->Fetch();
bar.step();
char *p=(char*)&_data[recordsize*count];
newIndex[fields[0].GetUInt32()]=p;
offset=0;
for(uint32 x = 0; x < store.iNumFields; x++)
switch(store.src_format[x])
{
case FT_LOGIC:
storeValue((bool)(fields[x].GetUInt32() > 0), store, p, x, offset); break;
case FT_BYTE:
storeValue((char)fields[x].GetUInt8(), store, p, x, offset); break;
case FT_INT:
storeValue((uint32)fields[x].GetUInt32(), store, p, x, offset); break;
case FT_FLOAT:
storeValue((float)fields[x].GetFloat(), store, p, x, offset); break;
case FT_STRING:
storeValue((char*)fields[x].GetString(), store, p, x, offset); break;
}
++count;
}while( result->NextRow() );
delete result;
store.pIndex = newIndex;
store.MaxEntry = maxi;
store.data = _data;
}

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "6826"
#define REVISION_NR "6827"
#endif // __REVISION_NR_H__

3
win/VC71/shared.vcproj
View file

@ -192,6 +192,9 @@
<File
RelativePath="..\..\src\shared\Database\SQLStorage.h">
</File>
<File
RelativePath="..\..\src\shared\Database\SQLStorageImpl.h">
</File>
<Filter
Name="DataStores">
<File

4
win/VC80/shared.vcproj
View file

@ -432,6 +432,10 @@
RelativePath="..\..\src\shared\Database\SQLStorage.h"
>
</File>
<File
RelativePath="..\..\src\shared\Database\SQLStorageImpl.h"
>
</File>
<Filter
Name="DataStores"
>

4
win/VC90/shared.vcproj
View file

@ -436,6 +436,10 @@
RelativePath="..\..\src\shared\Database\SQLStorage.h"
>
</File>
<File
RelativePath="..\..\src\shared\Database\SQLStorageImpl.h"
>
</File>
<Filter
Name="DataStores"
>