database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +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

15
writeengine/wrapper/we_tablemetadata.cpp
View File

@ -24,21 +24,20 @@
using namespace std;
#include <boost/thread/thread.hpp>
#include <map>
#include <mutex>
#include <boost/thread/mutex.hpp>
#include "we_tablemetadata.h"
namespace WriteEngine
{
/*static*/
std::mutex TableMetaData::map_mutex;
boost::mutex TableMetaData::map_mutex;
/*static*/
TableMetaData::TableMetaDataMap TableMetaData::fTableMetaDataMap;
TableMetaData* TableMetaData::makeTableMetaData(uint32_t tableOid)
{
std::unique_lock lock(map_mutex);
boost::mutex::scoped_lock lock(map_mutex);
TableMetaData* instance;
TableMetaDataMap::const_iterator it = fTableMetaDataMap.find(tableOid);
@ -55,7 +54,7 @@ TableMetaData* TableMetaData::makeTableMetaData(uint32_t tableOid)
/* static */
void TableMetaData::removeTableMetaData(uint32_t tableOid)
{
std::unique_lock lock(map_mutex);
boost::mutex::scoped_lock lock(map_mutex);
TableMetaDataMap::iterator it = fTableMetaDataMap.find(tableOid);
if (it != fTableMetaDataMap.end())
@ -74,7 +73,7 @@ TableMetaData::~TableMetaData()
ColExtsInfo& TableMetaData::getColExtsInfo(OID columnOid)
{
std::unique_lock lock(fColsExtsInfoLock);
boost::mutex::scoped_lock lock(fColsExtsInfoLock);
ColsExtsInfoMap::iterator it = fColsExtsInfoMap.find(columnOid);
if (it != fColsExtsInfoMap.end())
@ -91,7 +90,7 @@ ColExtsInfo& TableMetaData::getColExtsInfo(OID columnOid)
void TableMetaData::setColExtsInfo(OID columnOid, ColExtsInfo colExtsInfo)
{
std::unique_lock lock(fColsExtsInfoLock);
boost::mutex::scoped_lock lock(fColsExtsInfoLock);
ColsExtsInfoMap::iterator it = fColsExtsInfoMap.find(columnOid);
if (it != fColsExtsInfoMap.end())
@ -106,7 +105,7 @@ void TableMetaData::setColExtsInfo(OID columnOid, ColExtsInfo colExtsInfo)
ColsExtsInfoMap& TableMetaData::getColsExtsInfoMap()
{
std::unique_lock lock(fColsExtsInfoLock);
boost::mutex::scoped_lock lock(fColsExtsInfoLock);
return fColsExtsInfoMap;
}
} // namespace WriteEngine

4
writeengine/wrapper/we_tablemetadata.h
View File

@ -84,9 +84,9 @@ class TableMetaData
explicit TableMetaData();
explicit TableMetaData(const TableMetaData& rhs);
~TableMetaData();
static std::mutex map_mutex;
static boost::mutex map_mutex;
static TableMetaDataMap fTableMetaDataMap;
std::mutex fColsExtsInfoLock;
boost::mutex fColsExtsInfoLock;
ColsExtsInfoMap fColsExtsInfoMap;
};

4
writeengine/wrapper/writeengine.cpp
View File

@ -3408,8 +3408,8 @@ int WriteEngineWrapper::insertColumnRec_SYS(const TxnID& txnid, const CSCTypesLi
if (rc == NO_ERROR)
{
// MCOL-66 The DBRM can't handle concurrent transactions to sys tables
static std::mutex dbrmMutex;
std::unique_lock lk(dbrmMutex);
static boost::mutex dbrmMutex;
boost::mutex::scoped_lock lk(dbrmMutex);
if (newExtent)
{