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

14
versioning/BRM/oidserver.cpp
View File

@ -104,7 +104,7 @@ using namespace idbdatafile;
namespace
{
std::mutex CtorMutex;
boost::mutex CtorMutex;
class EOFException : public exception
{
@ -113,7 +113,7 @@ class EOFException : public exception
namespace BRM
{
std::mutex OIDServer::fMutex;
boost::mutex OIDServer::fMutex;
void OIDServer::writeData(uint8_t* buf, off_t offset, int size) const
{
@ -239,7 +239,7 @@ void OIDServer::initializeBitmap() const
firstOID = static_cast<int>(ltmp);
std::unique_lock lk(fMutex);
boost::mutex::scoped_lock lk(fMutex);
h1 = reinterpret_cast<struct FEntry*>(buf);
// write the initial header
h1[0].begin = firstOID;
@ -269,7 +269,7 @@ void OIDServer::initializeBitmap() const
OIDServer::OIDServer() : fFp(NULL), fFd(-1)
{
std::unique_lock lk(CtorMutex);
boost::mutex::scoped_lock lk(CtorMutex);
config::Config* conf;
string tmp;
@ -634,7 +634,7 @@ int OIDServer::allocVBOID(uint16_t dbroot)
try
{
uint16_t size = vbOidDBRootMap.size();
std::unique_lock lk(fMutex);
boost::mutex::scoped_lock lk(fMutex);
writeData((uint8_t*)&size, StartOfVBOidSection, 2);
writeData((uint8_t*)&dbroot, offset, 2);
}
@ -679,7 +679,7 @@ int OIDServer::allocOIDs(int num)
struct FEntry freelist[FreeListEntries];
int i, size, bestMatchIndex, bestMatchSize, bestMatchBegin = 0;
std::unique_lock lk(fMutex);
boost::mutex::scoped_lock lk(fMutex);
readData(reinterpret_cast<uint8_t*>(freelist), 0, HeaderSize);
// scan freelist using best fit strategy (an attempt to maximize hits on
@ -800,7 +800,7 @@ int OIDServer::size() const
int ret = 0, offset = 0, bytenum = 0;
uint8_t buf[4096], mask = 0;
std::unique_lock lk(fMutex);
boost::mutex::scoped_lock lk(fMutex);
for (offset = HeaderSize; offset < StartOfVBOidSection; offset += 4096)
{