You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-08-08 14:22:09 +03:00
No boost condition (#2822)
This patch replaces boost primitives with stdlib counterparts.
This commit is contained in:
@@ -23,7 +23,8 @@
|
||||
#include <limits>
|
||||
using namespace std;
|
||||
|
||||
#include <boost/thread/mutex.hpp>
|
||||
#include <map>
|
||||
#include <mutex>
|
||||
#include <boost/scoped_ptr.hpp>
|
||||
#include <boost/scoped_array.hpp>
|
||||
using namespace boost;
|
||||
@@ -33,13 +34,13 @@ using namespace boost;
|
||||
namespace dmlpackageprocessor
|
||||
{
|
||||
/*static*/
|
||||
boost::mutex TablelockData::map_mutex;
|
||||
std::mutex TablelockData::map_mutex;
|
||||
/*static*/
|
||||
TablelockData::TablelockDataMap TablelockData::fTablelockDataMap;
|
||||
/* static */
|
||||
TablelockData* TablelockData::makeTablelockData(uint32_t sessionID)
|
||||
{
|
||||
boost::mutex::scoped_lock lock(map_mutex);
|
||||
std::unique_lock lock(map_mutex);
|
||||
TablelockData* instance;
|
||||
TablelockDataMap::const_iterator it = fTablelockDataMap.find(sessionID);
|
||||
|
||||
@@ -56,7 +57,7 @@ TablelockData* TablelockData::makeTablelockData(uint32_t sessionID)
|
||||
/* static */
|
||||
void TablelockData::removeTablelockData(uint32_t sessionID)
|
||||
{
|
||||
boost::mutex::scoped_lock lock(map_mutex);
|
||||
std::unique_lock lock(map_mutex);
|
||||
TablelockDataMap::iterator it = fTablelockDataMap.find(sessionID);
|
||||
|
||||
if (it != fTablelockDataMap.end())
|
||||
@@ -75,13 +76,13 @@ TablelockData::~TablelockData()
|
||||
|
||||
void TablelockData::setTablelock(uint32_t tableOid, uint64_t tablelockId)
|
||||
{
|
||||
boost::mutex::scoped_lock lk(fOIDTablelock);
|
||||
std::unique_lock lk(fOIDTablelock);
|
||||
fOIDTablelockMap[tableOid] = tablelockId;
|
||||
}
|
||||
|
||||
uint64_t TablelockData::getTablelockId(uint32_t tableOid)
|
||||
{
|
||||
boost::mutex::scoped_lock lk(fOIDTablelock);
|
||||
std::unique_lock lk(fOIDTablelock);
|
||||
uint64_t tablelockId = 0;
|
||||
OIDTablelock::iterator it = fOIDTablelockMap.find(tableOid);
|
||||
|
||||
@@ -95,7 +96,7 @@ uint64_t TablelockData::getTablelockId(uint32_t tableOid)
|
||||
|
||||
TablelockData::OIDTablelock& TablelockData::getOidTablelockMap()
|
||||
{
|
||||
boost::mutex::scoped_lock lk(fOIDTablelock);
|
||||
std::unique_lock lk(fOIDTablelock);
|
||||
|
||||
return fOIDTablelockMap;
|
||||
}
|
||||
|
Reference in New Issue
Block a user