Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch 1 #40

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Patch 1 #40

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89754cb
Update src/game/CharacterDatabaseCleaner.cpp
kpetrikas Dec 13, 2012
c3d073b
Update src/game/CharacterDatabaseCleaner.cpp
kpetrikas Dec 13, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 37 additions & 54 deletions src/game/CharacterDatabaseCleaner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,34 @@
#include "DBCStores.h"
#include "ProgressBar.h"

template <class T>
inline void delete_null_entries(DBCStorage <T> storage, const char *table, const char *column) {
uint32 count = storage.GetNumRows();
std::ostringstream ss;
bool first = true;

ss << "DELETE FROM " << table << " WHERE " << column << " IN (";

/*get ranges*/
for (uint32 i = 0; i != count; i++) {
if (!storage.LookupEntry(i)) {
if (first) {
first = false;
} else {
ss << ',';
}

ss << i;
}
}

if (!first) {
ss << ')';

CharacterDatabase.Execute(ss.str().c_str());
}
}

void CharacterDatabaseCleaner::CleanDatabase()
{
// config to disable
Expand All @@ -36,6 +64,7 @@ void CharacterDatabaseCleaner::CleanDatabase()
if (!result)
return;
uint32 flags = (*result)[0].GetUInt32();

delete result;

// clean up
Expand All @@ -46,64 +75,18 @@ void CharacterDatabaseCleaner::CleanDatabase()
CharacterDatabase.Execute("UPDATE saved_variables SET cleaning_flags = 0");
}

void CharacterDatabaseCleaner::CheckUnique(const char* column, const char* table, bool (*check)(uint32))
{
QueryResult* result = CharacterDatabase.PQuery("SELECT DISTINCT %s FROM %s", column, table);
if (!result)
{
sLog.outString("Table %s is empty.", table);
return;
}

bool found = false;
std::ostringstream ss;
BarGoLink bar(result->GetRowCount());
do
{
bar.step();

Field *fields = result->Fetch();

uint32 id = fields[0].GetUInt32();

if (!check(id))
{
if (!found)
{
ss << "DELETE FROM " << table << " WHERE " << column << " IN (";
found = true;
}
else
ss << ",";
ss << id;
}
}
while (result->NextRow());
delete result;

if (found)
{
ss << ")";
CharacterDatabase.Execute(ss.str().c_str());
}
}

bool CharacterDatabaseCleaner::SkillCheck(uint32 skill)
{
return sSkillLineStore.LookupEntry(skill);
}

void CharacterDatabaseCleaner::CleanCharacterSkills()
{
CheckUnique("skill", "character_skills", &SkillCheck);
}

bool CharacterDatabaseCleaner::SpellCheck(uint32 spell_id)
{
return sSpellStore.LookupEntry(spell_id);
uint32 count = sSkillLineStore.GetNumRows();
delete_null_entries<SkillLineEntry>(sSkillLineStore, "character_skills", "skill");

CharacterDatabase.PExecute("DELETE FROM character_skills WHERE skill >= %u", count);
}

void CharacterDatabaseCleaner::CleanCharacterSpell()
{
CheckUnique("spell", "character_spell", &SpellCheck);
uint32 count = sSpellStore.GetNumRows();
delete_null_entries<SpellEntry>(sSpellStore, "character_spell", "spell");

CharacterDatabase.PExecute("DELETE FROM character_spell WHERE spell >= %u", count);
}