From d31cb0921497f1442fee2288cc8215f22897364b Mon Sep 17 00:00:00 2001 From: Chris Miles Date: Wed, 27 Dec 2023 20:04:01 -0600 Subject: [PATCH] [Logs] Bulk insert new log settings (#3810) --- common/eqemu_logsys.cpp | 18 +++-- .../base/base_logsys_categories_repository.h | 74 ++++++++++++++++++- 2 files changed, 83 insertions(+), 9 deletions(-) diff --git a/common/eqemu_logsys.cpp b/common/eqemu_logsys.cpp index 3509baa7b..6391cfe29 100644 --- a/common/eqemu_logsys.cpp +++ b/common/eqemu_logsys.cpp @@ -651,6 +651,9 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings() } // Auto inject categories that don't exist in the database... + + std::vector db_categories_to_add{}; + for (int i = Logs::AA; i != Logs::MaxCategoryID; i++) { bool is_missing_in_database = std::find(db_categories.begin(), db_categories.end(), i) == db_categories.end(); @@ -665,11 +668,7 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings() } if (is_missing_in_database && !is_deprecated_category) { - LogInfo( - "Automatically adding new log category [{}] ({})", - Logs::LogCategoryName[i], - i - ); + LogInfo("Automatically adding new log category [{}] ({})", Logs::LogCategoryName[i], i); auto new_category = LogsysCategoriesRepository::NewEntity(); new_category.log_category_id = i; @@ -678,11 +677,16 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings() new_category.log_to_gmsay = log_settings[i].log_to_gmsay; new_category.log_to_file = log_settings[i].log_to_file; new_category.log_to_discord = log_settings[i].log_to_discord; - - LogsysCategoriesRepository::InsertOne(*m_database, new_category); + db_categories_to_add.emplace_back(new_category); } } + if (!db_categories_to_add.empty()) { + LogsysCategoriesRepository::ReplaceMany(*m_database, db_categories_to_add); + LoadLogDatabaseSettings(); + return this; + } + LogInfo("Loaded [{}] log categories", categories.size()); auto webhooks = DiscordWebhooksRepository::GetWhere(*m_database, fmt::format("id < {}", MAX_DISCORD_WEBHOOK_ID)); diff --git a/common/repositories/base/base_logsys_categories_repository.h b/common/repositories/base/base_logsys_categories_repository.h index 867ca894c..5c0abcc14 100644 --- a/common/repositories/base/base_logsys_categories_repository.h +++ b/common/repositories/base/base_logsys_categories_repository.h @@ -6,7 +6,7 @@ * Any modifications to base repositories are to be made by the generator only * * @generator ./utils/scripts/generators/repository-generator.pl - * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories + * @docs https://docs.eqemu.io/developer/repositories */ #ifndef EQEMU_BASE_LOGSYS_CATEGORIES_REPOSITORY_H @@ -16,6 +16,7 @@ #include "../../strings.h" #include + class BaseLogsysCategoriesRepository { public: struct LogsysCategories { @@ -128,8 +129,9 @@ public: { auto results = db.QueryDatabase( fmt::format( - "{} WHERE id = {} LIMIT 1", + "{} WHERE {} = {} LIMIT 1", BaseSelect(), + PrimaryKey(), logsys_categories_id ) ); @@ -378,6 +380,74 @@ public: return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0); } + static std::string BaseReplace() + { + return fmt::format( + "REPLACE INTO {} ({}) ", + TableName(), + ColumnsRaw() + ); + } + + static int ReplaceOne( + Database& db, + const LogsysCategories &e + ) + { + std::vector v; + + v.push_back(std::to_string(e.log_category_id)); + v.push_back("'" + Strings::Escape(e.log_category_description) + "'"); + v.push_back(std::to_string(e.log_to_console)); + v.push_back(std::to_string(e.log_to_file)); + v.push_back(std::to_string(e.log_to_gmsay)); + v.push_back(std::to_string(e.log_to_discord)); + v.push_back(std::to_string(e.discord_webhook_id)); + + auto results = db.QueryDatabase( + fmt::format( + "{} VALUES ({})", + BaseReplace(), + Strings::Implode(",", v) + ) + ); + + return (results.Success() ? results.RowsAffected() : 0); + } + + static int ReplaceMany( + Database& db, + const std::vector &entries + ) + { + std::vector insert_chunks; + + for (auto &e: entries) { + std::vector v; + + v.push_back(std::to_string(e.log_category_id)); + v.push_back("'" + Strings::Escape(e.log_category_description) + "'"); + v.push_back(std::to_string(e.log_to_console)); + v.push_back(std::to_string(e.log_to_file)); + v.push_back(std::to_string(e.log_to_gmsay)); + v.push_back(std::to_string(e.log_to_discord)); + v.push_back(std::to_string(e.discord_webhook_id)); + + insert_chunks.push_back("(" + Strings::Implode(",", v) + ")"); + } + + std::vector v; + + auto results = db.QueryDatabase( + fmt::format( + "{} VALUES {}", + BaseReplace(), + Strings::Implode(",", insert_chunks) + ) + ); + + return (results.Success() ? results.RowsAffected() : 0); + } }; #endif //EQEMU_BASE_LOGSYS_CATEGORIES_REPOSITORY_H