database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +03:00
Code Activity

fix(PP,BPP): reduced the BPPMap lock scope to avoid holding lock whilst calling heavy BPPV dtor. It became heavy b/c of CountingAllocator.

Browse Source
This commit is contained in:
drrtuy
2025-04-18 12:18:07 +00:00
parent e34f7d2530
commit 3d1c49bd6b
1 changed files with 51 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
primitives/primproc/primitiveserver.cpp
View File

@@ -1557,6 +1557,8 @@ struct BPPHandler
bs >> stepID; bs >> stepID;
bs >> uniqueID; bs >> uniqueID;
boost::shared_ptr<BPPV> bppv = nullptr;
{
boost::unique_lock<shared_mutex> lk(getDJLock(uniqueID)); boost::unique_lock<shared_mutex> lk(getDJLock(uniqueID));
boost::mutex::scoped_lock scoped(bppLock); boost::mutex::scoped_lock scoped(bppLock);
@@ -1571,11 +1573,10 @@ struct BPPHandler
if (it != bppMap.end()) if (it != bppMap.end())
{ {
boost::shared_ptr<BPPV> bppv = it->second; bppv = it->second;
if (bppv->joinDataReceived) if (bppv->joinDataReceived)
{ {
bppv->abort();
bppMap.erase(it); bppMap.erase(it);
} }
else else
@@ -1611,6 +1612,12 @@ struct BPPHandler
fPrimitiveServerPtr->getOOBProcessorThreadPool()->removeJobs(uniqueID); fPrimitiveServerPtr->getOOBProcessorThreadPool()->removeJobs(uniqueID);
lk.unlock(); lk.unlock();
deleteDJLock(uniqueID); deleteDJLock(uniqueID);
}
if (bppv)
{
bppv->abort();
}
return 0; return 0;
} }