Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-04-04 14:56:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: use copy ellision (#1963)

Browse Source 
* use copy ellision

tested that the server still starts

* Update dDatabase/GameDatabase/MySQL/MySQLDatabase.h

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
David Markowitz
2026-03-31 15:35:28 -07:00
committed by GitHub
parent 8dfdca7fbd
commit 247576e101
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dDatabase/GameDatabase/MySQL/MySQLDatabase.h
View File

@@ -9,8 +9,8 @@
typedef std::unique_ptr<sql::PreparedStatement>& UniquePreppedStmtRef; typedef std::unique_ptr<sql::PreparedStatement>& UniquePreppedStmtRef;
typedef std::unique_ptr<sql::ResultSet> UniqueResultSet; typedef std::unique_ptr<sql::ResultSet> UniqueResultSet;
// Holds a PreparedStatement and its ResultSet together to ensure the statement // This struct is used to keep the PreparedStatement alive alongside the ResultSet, since the ResultSet will be invalidated if the PreparedStatement is destroyed.
// outlives the result. // Declaring the members in reverse order of usage to ensure the PreparedStatement is destroyed after the ResultSet. This is guaranteed by the C++ standard.
struct PreparedStmtResultSet { struct PreparedStmtResultSet {
std::unique_ptr<sql::PreparedStatement> m_stmt; std::unique_ptr<sql::PreparedStatement> m_stmt;
std::unique_ptr<sql::ResultSet> m_resultSet; std::unique_ptr<sql::ResultSet> m_resultSet;
@@ -18,14 +18,6 @@ struct PreparedStmtResultSet {
PreparedStmtResultSet(sql::PreparedStatement* stmt = nullptr, sql::ResultSet* resultSet = nullptr) PreparedStmtResultSet(sql::PreparedStatement* stmt = nullptr, sql::ResultSet* resultSet = nullptr)
: m_stmt(stmt), m_resultSet(resultSet) {} : m_stmt(stmt), m_resultSet(resultSet) {}
PreparedStmtResultSet(PreparedStmtResultSet&&) = default;
PreparedStmtResultSet& operator=(PreparedStmtResultSet&&) = default;
~PreparedStmtResultSet() {
m_resultSet.reset();
m_stmt.reset();
}
sql::ResultSet* operator->() const { sql::ResultSet* operator->() const {
return m_resultSet.get(); return m_resultSet.get();
} }
@@ -161,12 +153,12 @@ private:
// The return type is a PreparedStmtResultSet which keeps the PreparedStatement alive alongside the ResultSet. // The return type is a PreparedStmtResultSet which keeps the PreparedStatement alive alongside the ResultSet.
template<typename... Args> template<typename... Args>
inline PreparedStmtResultSet ExecuteSelect(const std::string& query, Args&&... args) { inline PreparedStmtResultSet ExecuteSelect(const std::string& query, Args&&... args) {
std::unique_ptr<sql::PreparedStatement> preppedStmt(CreatePreppedStmt(query)); PreparedStmtResultSet toReturn;
SetParams(preppedStmt, std::forward<Args>(args)...); toReturn.m_stmt.reset(CreatePreppedStmt(query));
std::unique_ptr<sql::ResultSet> resultSet; SetParams(toReturn.m_stmt, std::forward<Args>(args)...);
DLU_SQL_TRY_CATCH_RETHROW(resultSet.reset(preppedStmt->executeQuery())); DLU_SQL_TRY_CATCH_RETHROW(toReturn.m_resultSet.reset(toReturn.m_stmt->executeQuery()));
// Release ownership of the pointers to the PreparedStatement and ResultSet to the PreparedStmtResultSet struct, which will ensure they are properly cleaned up. // Return the PreparedStmtResultSet, which now owns both the PreparedStatement and ResultSet via unique_ptr and will ensure they are properly cleaned up.
return PreparedStmtResultSet(preppedStmt.release(), resultSet.release()); return toReturn;
} }
template<typename... Args> template<typename... Args>