Skip to content

Commit 4fe9cd6

Browse files
drrtuydrrtuy
authored
Revert "No boost condition (mariadb-corporation#2822)" (mariadb-corporation#2828)
This reverts commit f916e64.
1 parent f916e64 commit 4fe9cd6

File tree

245 files changed

+2007
-1261
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

245 files changed

+2007
-1261
lines changed

‎dbcon/ddlpackageproc/altertableprocessor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ void AlterTableProcessor::addColumn(uint32_t sessionID, execplan::CalpontSystemC
788788
bool alterFlag = true;
789789

790790
// MCOL-66 The DBRM can't handle concurrent DDL
791-
std::unique_lock lk(dbrmMutex);
791+
boost::mutex::scoped_lock lk(dbrmMutex);
792792

793793
if (inTableName.fSchema != CALPONT_SCHEMA)
794794
{
@@ -1262,7 +1262,7 @@ void AlterTableProcessor::dropColumn(uint32_t sessionID, execplan::CalpontSystem
12621262
pmNum = (*dbRootPMMap)[dbRoot];
12631263

12641264
// MCOL-66 The DBRM can't handle concurrent DDL
1265-
std::unique_lock lk(dbrmMutex);
1265+
boost::mutex::scoped_lock lk(dbrmMutex);
12661266

12671267
try
12681268
{

‎dbcon/ddlpackageproc/createtableprocessor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ CreateTableProcessor::DDLResult CreateTableProcessor::processPackage(
307307
boost::shared_ptr<std::map<int, int> > dbRootPMMap = oamcache->getDBRootToPMMap();
308308
pmNum = (*dbRootPMMap)[dbRoot];
309309
// MCOL-66 The DBRM can't handle concurrent DDL
310-
std::unique_lock lk(dbrmMutex);
310+
boost::mutex::scoped_lock lk(dbrmMutex);
311311

312312
try
313313
{

‎dbcon/ddlpackageproc/ddlpackageprocessor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ using namespace ddlpackage;
7979

8080
namespace ddlpackageprocessor
8181
{
82-
std::mutex DDLPackageProcessor::dbrmMutex;
82+
boost::mutex DDLPackageProcessor::dbrmMutex;
8383

8484
DDLPackageProcessor::~DDLPackageProcessor()
8585
{

‎dbcon/ddlpackageproc/ddlpackageprocessor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@ class DDLPackageProcessor
861861
int commitTransaction(uint64_t uniqueId, BRM::TxnID txnID);
862862

863863
// MCOL-66 The DBRM can't handle concurrent DDL
864-
static std::mutex dbrmMutex;
864+
static boost::mutex dbrmMutex;
865865

866866
private:
867867
/** @brief clean beginning and ending glitches and spaces from string

‎dbcon/ddlpackageproc/droptableprocessor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ DropTableProcessor::DDLResult DropTableProcessor::processPackage(
130130
std::vector<int> moduleIds = oamcache->getModuleIds();
131131

132132
// MCOL-66 The DBRM can't handle concurrent DDL
133-
std::unique_lock lk(dbrmMutex);
133+
boost::mutex::scoped_lock lk(dbrmMutex);
134134

135135
try
136136
{
@@ -1035,7 +1035,7 @@ TruncTableProcessor::DDLResult TruncTableProcessor::processPackage(
10351035
ByteStream::byte tmp8;
10361036

10371037
// MCOL-66 The DBRM can't handle concurrent DDL
1038-
std::unique_lock lk(dbrmMutex);
1038+
boost::mutex::scoped_lock lk(dbrmMutex);
10391039

10401040
try
10411041
{

‎dbcon/dmlpackage/calpontdmlfactory.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
using namespace std;
4141
namespace dmlpackage
4242
{
43-
std::mutex CalpontDMLFactory::fParserLock;
43+
boost::mutex CalpontDMLFactory::fParserLock;
4444

4545
dmlpackage::CalpontDMLPackage* CalpontDMLFactory::makeCalpontDMLPackage(
4646
dmlpackage::VendorDMLStatement& vpackage, std::string defaultSchema /*= ""*/)
@@ -51,7 +51,7 @@ dmlpackage::CalpontDMLPackage* CalpontDMLFactory::makeCalpontDMLPackage(
5151
{
5252
std::string dmlStatement = vpackage.get_DMLStatement();
5353
//@Bug 2680. DMLParser is not thread safe.
54-
std::unique_lock lk(fParserLock);
54+
boost::mutex::scoped_lock lk(fParserLock);
5555
DMLParser parser;
5656

5757
if (defaultSchema.size())

‎dbcon/dmlpackage/calpontdmlfactory.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class CalpontDMLFactory
6060

6161
protected:
6262
private:
63-
static std::mutex fParserLock;
63+
static boost::mutex fParserLock;
6464
};
6565

6666
} // namespace dmlpackage

‎dbcon/dmlpackageproc/autoincrementdata.cpp

+7-8
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,21 @@
2323
#include <limits>
2424
using namespace std;
2525

26-
#include <map>
27-
#include <mutex>
26+
#include <boost/thread/mutex.hpp>
2827
#include <boost/scoped_ptr.hpp>
2928
#include <boost/scoped_array.hpp>
3029
using namespace boost;
3130

3231
#include "autoincrementdata.h"
3332

3433
/*static*/
35-
std::mutex AutoincrementData::map_mutex;
34+
boost::mutex AutoincrementData::map_mutex;
3635
/*static*/
3736
AutoincrementData::AutoincDataMap AutoincrementData::fAutoincDataMap;
3837
/* static */
3938
AutoincrementData* AutoincrementData::makeAutoincrementData(uint32_t sessionID)
4039
{
41-
std::unique_lock lock(map_mutex);
40+
boost::mutex::scoped_lock lock(map_mutex);
4241
AutoincrementData* instance;
4342
AutoincDataMap::const_iterator it = fAutoincDataMap.find(sessionID);
4443

@@ -55,7 +54,7 @@ AutoincrementData* AutoincrementData::makeAutoincrementData(uint32_t sessionID)
5554
/* static */
5655
void AutoincrementData::removeAutoincrementData(uint32_t sessionID)
5756
{
58-
std::unique_lock lock(map_mutex);
57+
boost::mutex::scoped_lock lock(map_mutex);
5958
AutoincDataMap::iterator it = fAutoincDataMap.find(sessionID);
6059

6160
if (it != fAutoincDataMap.end())
@@ -74,13 +73,13 @@ AutoincrementData::~AutoincrementData()
7473

7574
void AutoincrementData::setNextValue(uint32_t columnOid, long long nextValue)
7675
{
77-
std::unique_lock lk(fOIDnextvalLock);
76+
boost::mutex::scoped_lock lk(fOIDnextvalLock);
7877
fOidNextValueMap[columnOid] = nextValue;
7978
}
8079

8180
long long AutoincrementData::getNextValue(uint32_t columnOid)
8281
{
83-
std::unique_lock lk(fOIDnextvalLock);
82+
boost::mutex::scoped_lock lk(fOIDnextvalLock);
8483
long long nextValue = 0;
8584
OIDNextValue::iterator it = fOidNextValueMap.find(columnOid);
8685

@@ -94,7 +93,7 @@ long long AutoincrementData::getNextValue(uint32_t columnOid)
9493

9594
AutoincrementData::OIDNextValue& AutoincrementData::getOidNextValueMap()
9695
{
97-
std::unique_lock lk(fOIDnextvalLock);
96+
boost::mutex::scoped_lock lk(fOIDnextvalLock);
9897

9998
return fOidNextValueMap;
10099
}

‎dbcon/dmlpackageproc/autoincrementdata.h

+4-5
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@
2323

2424
#include <stdint.h>
2525

26-
#include <map>
27-
#include <mutex>
28-
#include <condition_variable>
26+
#include <boost/thread/mutex.hpp>
27+
#include <boost/thread/condition.hpp>
2928

3029
class AutoincrementData
3130
{
@@ -44,9 +43,9 @@ class AutoincrementData
4443
explicit AutoincrementData(const AutoincrementData& rhs);
4544
~AutoincrementData();
4645

47-
static std::mutex map_mutex;
46+
static boost::mutex map_mutex;
4847
static AutoincDataMap fAutoincDataMap;
4948
OIDNextValue fOidNextValueMap;
50-
std::mutex fOIDnextvalLock;
49+
boost::mutex fOIDnextvalLock;
5150
};
5251

‎dbcon/dmlpackageproc/commandpackageprocessor.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ namespace dmlpackageprocessor
5151
{
5252
// Tracks active cleartablelock commands by storing set of table lock IDs
5353
/*static*/ std::set<uint64_t> CommandPackageProcessor::fActiveClearTableLockCmds;
54-
/*static*/ std::mutex CommandPackageProcessor::fActiveClearTableLockCmdMutex;
54+
/*static*/ boost::mutex CommandPackageProcessor::fActiveClearTableLockCmdMutex;
5555

5656
DMLPackageProcessor::DMLResult CommandPackageProcessor::processPackage(
5757
dmlpackage::CalpontDMLPackage& cpackage)
@@ -1068,7 +1068,7 @@ void CommandPackageProcessor::clearTableLock(uint64_t uniqueId, const dmlpackage
10681068
// Remove tableLockID out of the active cleartableLock command list
10691069
if (lockGrabbed)
10701070
{
1071-
std::unique_lock lock(fActiveClearTableLockCmdMutex);
1071+
boost::mutex::scoped_lock lock(fActiveClearTableLockCmdMutex);
10721072
fActiveClearTableLockCmds.erase(tableLockID);
10731073
}
10741074

@@ -1107,7 +1107,7 @@ void CommandPackageProcessor::clearTableLock(uint64_t uniqueId, const dmlpackage
11071107
//------------------------------------------------------------------------------
11081108
void CommandPackageProcessor::establishTableLockToClear(uint64_t tableLockID, BRM::TableLockInfo& lockInfo)
11091109
{
1110-
std::unique_lock lock(fActiveClearTableLockCmdMutex);
1110+
boost::mutex::scoped_lock lock(fActiveClearTableLockCmdMutex);
11111111

11121112
// Get current table lock info
11131113
bool getLockInfo = fDbrm->getTableLockInfo(tableLockID, &lockInfo);

‎dbcon/dmlpackageproc/commandpackageprocessor.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@
3030
#include <boost/algorithm/string.hpp>
3131
#include "dmlpackageprocessor.h"
3232
#include "dmltable.h"
33-
#include <map>
34-
#include <mutex>
35-
#include <condition_variable>
33+
#include <boost/thread/mutex.hpp>
34+
#include <boost/thread/condition.hpp>
3635

3736
#define EXPORT
3837

@@ -62,7 +61,7 @@ class CommandPackageProcessor : public DMLPackageProcessor
6261

6362
// Tracks active cleartablelock commands by storing set of table lock IDs
6463
static std::set<uint64_t> fActiveClearTableLockCmds;
65-
static std::mutex fActiveClearTableLockCmdMutex;
64+
static boost::mutex fActiveClearTableLockCmdMutex;
6665
};
6766

6867
} // namespace dmlpackageprocessor

‎dbcon/dmlpackageproc/tablelockdata.cpp

+7-8
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
#include <limits>
2424
using namespace std;
2525

26-
#include <map>
27-
#include <mutex>
26+
#include <boost/thread/mutex.hpp>
2827
#include <boost/scoped_ptr.hpp>
2928
#include <boost/scoped_array.hpp>
3029
using namespace boost;
@@ -34,13 +33,13 @@ using namespace boost;
3433
namespace dmlpackageprocessor
3534
{
3635
/*static*/
37-
std::mutex TablelockData::map_mutex;
36+
boost::mutex TablelockData::map_mutex;
3837
/*static*/
3938
TablelockData::TablelockDataMap TablelockData::fTablelockDataMap;
4039
/* static */
4140
TablelockData* TablelockData::makeTablelockData(uint32_t sessionID)
4241
{
43-
std::unique_lock lock(map_mutex);
42+
boost::mutex::scoped_lock lock(map_mutex);
4443
TablelockData* instance;
4544
TablelockDataMap::const_iterator it = fTablelockDataMap.find(sessionID);
4645

@@ -57,7 +56,7 @@ TablelockData* TablelockData::makeTablelockData(uint32_t sessionID)
5756
/* static */
5857
void TablelockData::removeTablelockData(uint32_t sessionID)
5958
{
60-
std::unique_lock lock(map_mutex);
59+
boost::mutex::scoped_lock lock(map_mutex);
6160
TablelockDataMap::iterator it = fTablelockDataMap.find(sessionID);
6261

6362
if (it != fTablelockDataMap.end())
@@ -76,13 +75,13 @@ TablelockData::~TablelockData()
7675

7776
void TablelockData::setTablelock(uint32_t tableOid, uint64_t tablelockId)
7877
{
79-
std::unique_lock lk(fOIDTablelock);
78+
boost::mutex::scoped_lock lk(fOIDTablelock);
8079
fOIDTablelockMap[tableOid] = tablelockId;
8180
}
8281

8382
uint64_t TablelockData::getTablelockId(uint32_t tableOid)
8483
{
85-
std::unique_lock lk(fOIDTablelock);
84+
boost::mutex::scoped_lock lk(fOIDTablelock);
8685
uint64_t tablelockId = 0;
8786
OIDTablelock::iterator it = fOIDTablelockMap.find(tableOid);
8887

@@ -96,7 +95,7 @@ uint64_t TablelockData::getTablelockId(uint32_t tableOid)
9695

9796
TablelockData::OIDTablelock& TablelockData::getOidTablelockMap()
9897
{
99-
std::unique_lock lk(fOIDTablelock);
98+
boost::mutex::scoped_lock lk(fOIDTablelock);
10099

101100
return fOIDTablelockMap;
102101
}

‎dbcon/dmlpackageproc/tablelockdata.h

+4-5
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@
2323

2424
#include <stdint.h>
2525

26-
#include <map>
27-
#include <mutex>
28-
#include <condition_variable>
26+
#include <boost/thread/mutex.hpp>
27+
#include <boost/thread/condition.hpp>
2928

3029
#define EXPORT
3130

@@ -48,10 +47,10 @@ class TablelockData
4847
explicit TablelockData(const TablelockData& rhs);
4948
~TablelockData();
5049

51-
static std::mutex map_mutex;
50+
static boost::mutex map_mutex;
5251
static TablelockDataMap fTablelockDataMap;
5352
OIDTablelock fOIDTablelockMap;
54-
std::mutex fOIDTablelock;
53+
boost::mutex fOIDTablelock;
5554
};
5655

5756
} // namespace dmlpackageprocessor

0 commit comments

Comments
 (0)