owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Completely removed the transaction checker in release (which was here but as a noop checker)

Browse Source
This commit is contained in:
emeric
2024-03-15 16:26:59 +01:00
parent 28405bb96e
commit 0f37daaa30
6 changed files with 54 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/database/impl/Session.cpp
+10 -1
View File
@@ -53,26 +53,34 @@ namespace lms::db
: _lock{ mutex },
_transaction{ session }
{
#if LMS_CHECK_TRANSACTION_ACCESSES
TransactionChecker::pushWriteTransaction(_transaction.session());
#endif
}
WriteTransaction::~WriteTransaction()
{
#if LMS_CHECK_TRANSACTION_ACCESSES
TransactionChecker::popWriteTransaction(_transaction.session());
#endif
core::tracing::ScopedTrace _trace{ "Database", core::tracing::Level::Detailed, "CommitWriteTransaction" };
core::tracing::ScopedTrace _trace{ "Database", core::tracing::Level::Detailed, "Commit" };
_transaction.commit();
}
ReadTransaction::ReadTransaction(Wt::Dbo::Session& session)
: _transaction{ session }
{
#if LMS_CHECK_TRANSACTION_ACCESSES
TransactionChecker::pushReadTransaction(_transaction.session());
#endif
}
ReadTransaction::~ReadTransaction()
{
#if LMS_CHECK_TRANSACTION_ACCESSES
TransactionChecker::popReadTransaction(_transaction.session());
#endif
}
Session::Session(Db& db)
@@ -119,6 +127,7 @@ namespace lms::db
// Initial creation case
try
{
auto transaction{ createWriteTransaction() };
_session.createTables();
LMS_LOG(DB, INFO, "Tables created");
}
src/libs/database/impl/TransactionChecker.cpp
+6 -18
View File
@@ -19,19 +19,13 @@
#include "database/TransactionChecker.hpp"
static_assert(LMS_CHECK_TRANSACTION_ACCESSES, "File should be excluded from build");
#include <cassert>
#include "database/Session.hpp"
#if !defined(NDEBUG)
#define LMS_CHECK_TRANSACTION_ACCESSES 1
#else
#define LMS_CHECK_TRANSACTION_ACCESSES 0
#endif
namespace lms::db
{
#if LMS_CHECK_TRANSACTION_ACCESSES
namespace
{
struct StackEntry
@@ -42,7 +36,6 @@ namespace lms::db
static thread_local std::vector<StackEntry> transactionStack;
}
#endif
void TransactionChecker::pushWriteTransaction(Wt::Dbo::Session& session)
{
@@ -64,26 +57,21 @@ namespace lms::db
popTransaction(TransactionType::Read, session);
}
void TransactionChecker::pushTransaction([[maybe_unused]] TransactionType type, [[maybe_unused]] Wt::Dbo::Session& session)
void TransactionChecker::pushTransaction(TransactionType type, Wt::Dbo::Session& session)
{
#if LMS_CHECK_TRANSACTION_ACCESSES
assert(transactionStack.empty() || transactionStack.back().session == &session);
transactionStack.push_back(StackEntry{ type, &session });
#endif // LMS_CHECK_TRANSACTION_ACCESSES
}
void TransactionChecker::popTransaction([[maybe_unused]] TransactionType type, [[maybe_unused]] Wt::Dbo::Session& session)
void TransactionChecker::popTransaction(TransactionType type, Wt::Dbo::Session& session)
{
#if LMS_CHECK_TRANSACTION_ACCESSES
assert(!transactionStack.empty());
assert(transactionStack.back().type == type);
assert(transactionStack.back().session == &session);
transactionStack.pop_back();
#endif // LMS_CHECK_TRANSACTION_ACCESSES
}
void TransactionChecker::checkWriteTransaction([[maybe_unused]] Wt::Dbo::Session& session)
void TransactionChecker::checkWriteTransaction(Wt::Dbo::Session& session)
{
assert(!transactionStack.empty());
assert(transactionStack.back().type == TransactionType::Write);
@@ -95,7 +83,7 @@ namespace lms::db
checkWriteTransaction(session.getDboSession());
}
void TransactionChecker::checkReadTransaction([[maybe_unused]] Wt::Dbo::Session& session)
void TransactionChecker::checkReadTransaction(Wt::Dbo::Session& session)
{
assert(!transactionStack.empty());
assert(transactionStack.back().session == &session);