Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-10-09 17:08:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: sqlite transaction bug

Browse Source
This commit is contained in:
David Markowitz
2025-09-28 23:04:12 -07:00
parent 650e8e746d
commit fd3de387ba
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dDatabase/GameDatabase/SQLite/SQLiteDatabase.cpp
View File

@@ -61,9 +61,9 @@ bool SQLiteDatabase::GetAutoCommit() {
void SQLiteDatabase::SetAutoCommit(bool value) { void SQLiteDatabase::SetAutoCommit(bool value) {
if (value) { if (value) {
if (GetAutoCommit()) con->compileStatement("BEGIN;").execDML();
} else {
if (!GetAutoCommit()) con->compileStatement("COMMIT;").execDML(); if (!GetAutoCommit()) con->compileStatement("COMMIT;").execDML();
} else {
if (GetAutoCommit()) con->compileStatement("BEGIN;").execDML();
} }
} }

4
dDatabase/GameDatabase/SQLite/Tables/ObjectIdTracker.cpp
View File

@@ -15,11 +15,10 @@ void SQLiteDatabase::InsertDefaultPersistentId() {
IObjectIdTracker::Range SQLiteDatabase::GetPersistentIdRange() { IObjectIdTracker::Range SQLiteDatabase::GetPersistentIdRange() {
IObjectIdTracker::Range range; IObjectIdTracker::Range range;
auto prevCommit = GetAutoCommit(); auto prevCommit = GetAutoCommit();
SetAutoCommit(false); SetAutoCommit(false); // This begins the transaction for us if one is not already in progress
// THIS MUST ABSOLUTELY NOT FAIL. These IDs are expected to be unique. As such a transactional select is used to safely get a range // THIS MUST ABSOLUTELY NOT FAIL. These IDs are expected to be unique. As such a transactional select is used to safely get a range
// of IDs that will never be used again. A separate feature could track unused IDs and recycle them, but that is not implemented. // of IDs that will never be used again. A separate feature could track unused IDs and recycle them, but that is not implemented.
ExecuteCustomQuery("BEGIN TRANSACTION;");
// 200 seems like a good range to reserve at once. Only way this would be noticable is if a player // 200 seems like a good range to reserve at once. Only way this would be noticable is if a player
// added hundreds of items at once. // added hundreds of items at once.
// Doing the update first ensures that all other connections are blocked from accessing this table until we commit. // Doing the update first ensures that all other connections are blocked from accessing this table until we commit.
@@ -34,6 +33,7 @@ IObjectIdTracker::Range SQLiteDatabase::GetPersistentIdRange() {
range.maxID = selectResult.getInt64Field("last_object_id"); range.maxID = selectResult.getInt64Field("last_object_id");
range.minID = range.maxID - 199; range.minID = range.maxID - 199;
// We must commit here manually, this will unlock the database for all other servers
ExecuteCustomQuery("COMMIT;"); ExecuteCustomQuery("COMMIT;");
SetAutoCommit(prevCommit); SetAutoCommit(prevCommit);
return range; return range;