database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-27 21:01:50 +03:00
Code Activity

Revert "No boost condition (#2822)" (#2828)

Browse Source 
This reverts commit f916e64927.
This commit is contained in:
Roman Nozdrin
2023-04-22 13:49:50 +01:00
committed by GitHub
parent f916e64927
commit 4fe9cd64a3
245 changed files with 2007 additions and 1261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
versioning/BRM/sessionmanagerserver.cpp
View File

@ -36,8 +36,7 @@
#include <limits>
using namespace std;
#include <map>
#include <mutex>
#include <boost/thread/mutex.hpp>
#include <boost/scoped_ptr.hpp>
using namespace boost;
@ -235,7 +234,7 @@ const QueryContext SessionManagerServer::verID()
{
QueryContext ret;
std::unique_lock lk(mutex);
boost::mutex::scoped_lock lk(mutex);
ret.currentScn = _verID;
for (iterator i = activeTxns.begin(); i != activeTxns.end(); ++i)
@ -248,7 +247,7 @@ const QueryContext SessionManagerServer::sysCatVerID()
{
QueryContext ret;
std::unique_lock lk(mutex);
boost::mutex::scoped_lock lk(mutex);
ret.currentScn = _sysCatVerID;
for (iterator i = activeTxns.begin(); i != activeTxns.end(); ++i)
@ -262,7 +261,7 @@ const TxnID SessionManagerServer::newTxnID(const SID session, bool block, bool i
TxnID ret; // ctor must set valid = false
iterator it;
std::unique_lock lk(mutex);
boost::mutex::scoped_lock lk(mutex);
// if it already has a txn...
it = activeTxns.find(session);
@ -298,7 +297,7 @@ const TxnID SessionManagerServer::newTxnID(const SID session, bool block, bool i
void SessionManagerServer::finishTransaction(TxnID& txn)
{
iterator it;
std::unique_lock lk(mutex);
boost::mutex::scoped_lock lk(mutex);
bool found = false;
if (!txn.valid)
@ -334,7 +333,7 @@ const TxnID SessionManagerServer::getTxnID(const SID session)
TxnID ret;
iterator it;
std::unique_lock lk(mutex);
boost::mutex::scoped_lock lk(mutex);
it = activeTxns.find(session);
@ -351,7 +350,7 @@ std::shared_ptr<SIDTIDEntry[]> SessionManagerServer::SIDTIDMap(int& len)
{
int j;
std::shared_ptr<SIDTIDEntry[]> ret;
std::unique_lock lk(mutex);
boost::mutex::scoped_lock lk(mutex);
iterator it;
ret.reset(new SIDTIDEntry[activeTxns.size()]);
@ -370,7 +369,7 @@ std::shared_ptr<SIDTIDEntry[]> SessionManagerServer::SIDTIDMap(int& len)
void SessionManagerServer::setSystemState(uint32_t state)
{
std::unique_lock lk(mutex);
boost::mutex::scoped_lock lk(mutex);
systemState |= state;
saveSystemState();
@ -378,7 +377,7 @@ void SessionManagerServer::setSystemState(uint32_t state)
void SessionManagerServer::clearSystemState(uint32_t state)
{
std::unique_lock lk(mutex);
boost::mutex::scoped_lock lk(mutex);
systemState &= ~state;
saveSystemState();
@ -386,7 +385,7 @@ void SessionManagerServer::clearSystemState(uint32_t state)
uint32_t SessionManagerServer::getTxnCount()
{
std::unique_lock lk(mutex);
boost::mutex::scoped_lock lk(mutex);
return activeTxns.size();
}