Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-11-03 18:37:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(cdclient): FdbToSqlite can convert into a connection of its own

Browse Source 
So a worker can make a new CDServer.sqlite without touching the shared
CDClient connection or the logger.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-29 22:42:40 -05:00
parent 1a8e4e387c
commit 1e0fc92f2e
2 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dCommon/FdbToSqlite.cpp
View File

@@ -28,21 +28,29 @@ FdbToSqlite::Convert::Convert(std::string binaryOutPath) {
this->m_BinaryOutPath = binaryOutPath; this->m_BinaryOutPath = binaryOutPath;
} }
bool FdbToSqlite::Convert::ConvertDatabase(AssetStream& buffer) { FdbToSqlite::Convert::Convert(CppSQLite3DB& db) : m_Db(&db) {}
void FdbToSqlite::Convert::ExecDML(const std::string& sql) {
if (m_Db) m_Db->execDML(sql.c_str());
else CDClientDatabase::ExecuteDML(sql);
}
bool FdbToSqlite::Convert::ConvertDatabase(std::istream& buffer) {
if (m_ConversionStarted) return false; if (m_ConversionStarted) return false;
this->m_ConversionStarted = true; this->m_ConversionStarted = true;
try { try {
CDClientDatabase::Connect(m_BinaryOutPath + "/CDServer.sqlite"); if (!m_Db) CDClientDatabase::Connect(m_BinaryOutPath + "/CDServer.sqlite");
CDClientDatabase::ExecuteQuery("BEGIN TRANSACTION;"); ExecDML("BEGIN TRANSACTION;");
int32_t numberOfTables = ReadInt32(buffer); int32_t numberOfTables = ReadInt32(buffer);
ReadTables(numberOfTables, buffer); ReadTables(numberOfTables, buffer);
CDClientDatabase::ExecuteQuery("COMMIT;"); ExecDML("COMMIT;");
} catch (CppSQLite3Exception& e) { } catch (CppSQLite3Exception& e) {
LOG("Encountered error %s converting FDB to SQLite", e.errorMessage()); m_Error = e.errorMessage();
if (!m_Db) LOG("Encountered error %s converting FDB to SQLite", e.errorMessage());
return false; return false;
} }
@@ -91,7 +99,7 @@ std::string FdbToSqlite::Convert::ReadColumnHeader(std::istream& cdClientBuffer)
auto columns = ReadColumns(numberOfColumns, cdClientBuffer); auto columns = ReadColumns(numberOfColumns, cdClientBuffer);
std::string newTable = "CREATE TABLE IF NOT EXISTS '" + tableName + "' (" + columns + ");"; std::string newTable = "CREATE TABLE IF NOT EXISTS '" + tableName + "' (" + columns + ");";
CDClientDatabase::ExecuteDML(newTable); ExecDML(newTable);
cdClientBuffer.seekg(prevPosition); cdClientBuffer.seekg(prevPosition);
@@ -241,6 +249,6 @@ void FdbToSqlite::Convert::ReadRowValues(int32_t& numberOfColumns, std::string&
insertedRow << ");"; insertedRow << ");";
auto copiedString = insertedRow.str(); auto copiedString = insertedRow.str();
CDClientDatabase::ExecuteDML(copiedString); ExecDML(copiedString);
cdClientBuffer.seekg(prevPosition); cdClientBuffer.seekg(prevPosition);
} }

20
dCommon/FdbToSqlite.h
View File

@@ -11,6 +11,8 @@
enum class eSqliteDataType : int32_t; enum class eSqliteDataType : int32_t;
#include "CppSQLite3.h"
namespace FdbToSqlite { namespace FdbToSqlite {
class Convert { class Convert {
public: public:
@@ -22,12 +24,21 @@ namespace FdbToSqlite {
*/ */
Convert(std::string binaryOutPath); Convert(std::string binaryOutPath);
/**
* Converts into a connection of the caller's own instead of the shared CDClient one, so it can run on a
* worker thread. Nothing is logged; GetError says what went wrong.
*/
explicit Convert(CppSQLite3DB& db);
// Why the last ConvertDatabase failed
[[nodiscard]] const std::string& GetError() const { return m_Error; }
/** /**
* Converts the input file to sqlite. Calling multiple times is safe. * Converts the input file to sqlite. Calling multiple times is safe.
* *
* @return true if the database was converted properly, false otherwise. * @return true if the database was converted properly, false otherwise.
*/ */
bool ConvertDatabase(AssetStream& buffer); bool ConvertDatabase(std::istream& buffer);
/** /**
* @brief Reads a 32 bit int from the fdb file. * @brief Reads a 32 bit int from the fdb file.
@@ -139,6 +150,13 @@ namespace FdbToSqlite {
* The path where the CDServer will be stored * The path where the CDServer will be stored
*/ */
std::string m_BinaryOutPath{}; std::string m_BinaryOutPath{};
// The caller's own connection, or nullptr for the shared CDClient one
CppSQLite3DB* m_Db{};
std::string m_Error{};
void ExecDML(const std::string& sql);
}; //! class FdbToSqlite }; //! class FdbToSqlite
}; //! namespace FdbToSqlite }; //! namespace FdbToSqlite