database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-04 04:42:30 +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
utils/cacheutils/cacheutils.cpp
View File

@ -51,7 +51,7 @@ using namespace BRM;
namespace
{
// Only one of the cacheutils fcns can run at a time
std::mutex CacheOpsMutex;
boost::mutex CacheOpsMutex;
// This global is updated only w/ atomic ops
volatile uint32_t MultiReturnCode;
@ -151,7 +151,7 @@ namespace cacheutils
*/
int flushPrimProcCache()
{
std::unique_lock lk(CacheOpsMutex);
boost::mutex::scoped_lock lk(CacheOpsMutex);
try
{
@ -180,7 +180,7 @@ int flushPrimProcBlocks(const BRM::BlockList_t& list)
if (list.empty())
return 0;
std::unique_lock lk(CacheOpsMutex);
boost::mutex::scoped_lock lk(CacheOpsMutex);
#if defined(__LP64__) || defined(_WIN64)
@ -239,7 +239,7 @@ int flushPrimProcAllverBlocks(const vector<LBID_t>& list)
try
{
std::unique_lock lk(CacheOpsMutex);
boost::mutex::scoped_lock lk(CacheOpsMutex);
rc = sendToAll(bs);
return rc;
}
@ -258,7 +258,7 @@ int flushOIDsFromCache(const vector<BRM::OID_t>& oids)
* uint32_t * - OID array
*/
std::unique_lock lk(CacheOpsMutex, std::defer_lock);
boost::mutex::scoped_lock lk(CacheOpsMutex, boost::defer_lock_t());
ByteStream bs;
ISMPacketHeader ism;
@ -287,7 +287,7 @@ int flushPartition(const std::vector<BRM::OID_t>& oids, set<BRM::LogicalPartitio
* uint32_t * - OID array
*/
std::unique_lock lk(CacheOpsMutex, std::defer_lock);
boost::mutex::scoped_lock lk(CacheOpsMutex, boost::defer_lock_t());
ByteStream bs;
ISMPacketHeader ism;
@ -314,7 +314,7 @@ int dropPrimProcFdCache()
try
{
std::unique_lock lk(CacheOpsMutex);
boost::mutex::scoped_lock lk(CacheOpsMutex);
int rc = sendToAll(bs);
return rc;
}