database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

chore(build) update boost to 1.88

Browse Source
This commit is contained in:
Leonid Fedorov
2025-04-14 16:02:17 +00:00
committed by Leonid Fedorov
parent d09b7496e4
commit 4a8f5830fd
22 changed files with 36 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
primitives/primproc/primitiveserver.cpp
View File

@ -142,8 +142,8 @@ int noVB = 0;
BPPMap bppMap;
boost::mutex bppLock;
boost::mutex djMutex; // lock for djLock, lol.
std::map<uint64_t, shared_mutex*> djLock; // djLock synchronizes destroy and joiner msgs, see bug 2619
boost::mutex djMutex; // lock for djLock, lol.
std::map<uint64_t, boost::shared_mutex*> djLock; // djLock synchronizes destroy and joiner msgs, see bug 2619
volatile int32_t asyncCounter;
const int asyncMax = 20; // current number of asynchronous loads
@ -1430,7 +1430,7 @@ struct BPPHandler
return SBPPV();
}
inline shared_mutex& getDJLock(uint32_t uniqueID)
inline boost::shared_mutex& getDJLock(uint32_t uniqueID)
{
boost::mutex::scoped_lock lk(djMutex);
auto it = djLock.find(uniqueID);
@ -1438,7 +1438,7 @@ struct BPPHandler
return *it->second;
else
{
auto ret = djLock.insert(make_pair(uniqueID, new shared_mutex())).first;
auto ret = djLock.insert(make_pair(uniqueID, new boost::shared_mutex())).first;
return *ret->second;
}
}
@ -1470,7 +1470,7 @@ struct BPPHandler
if (bppv)
{
shared_lock<shared_mutex> lk(getDJLock(uniqueID));
boost::shared_lock<boost::shared_mutex> lk(getDJLock(uniqueID));
bppv->get()[0]->addToJoiner(bs);
return 0;
}
@ -1513,7 +1513,7 @@ struct BPPHandler
}
}
boost::unique_lock<shared_mutex> lk(getDJLock(uniqueID));
boost::unique_lock<boost::shared_mutex> lk(getDJLock(uniqueID));
for (i = 0; i < bppv->get().size(); i++)
{
err = bppv->get()[i]->endOfJoiner();
@ -1555,7 +1555,12 @@ struct BPPHandler
bs >> stepID;
bs >> uniqueID;
boost::shared_ptr<BPPV> bppv = nullptr;
boost::unique_lock<boost::shared_mutex> lk(getDJLock(uniqueID));
boost::mutex::scoped_lock scoped(bppLock);
bppKeysIt = std::find(bppKeys.begin(), bppKeys.end(), uniqueID);
if (bppKeysIt != bppKeys.end())
{
boost::unique_lock<shared_mutex> lk(getDJLock(uniqueID));
boost::mutex::scoped_lock scoped(bppLock);