You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-29 08:21:15 +03:00
This reverts commit f916e64927
.
This commit is contained in:
@ -72,7 +72,7 @@ using namespace idbdatafile;
|
||||
namespace redistribute
|
||||
{
|
||||
// static variables
|
||||
std::mutex RedistributeWorkerThread::fActionMutex;
|
||||
boost::mutex RedistributeWorkerThread::fActionMutex;
|
||||
volatile bool RedistributeWorkerThread::fStopAction = false;
|
||||
volatile bool RedistributeWorkerThread::fCommitted = false;
|
||||
string RedistributeWorkerThread::fWesInUse;
|
||||
@ -85,7 +85,7 @@ RedistributeWorkerThread::RedistributeWorkerThread(ByteStream& bs, IOSocket& ios
|
||||
|
||||
RedistributeWorkerThread::~RedistributeWorkerThread()
|
||||
{
|
||||
std::unique_lock lock(fActionMutex);
|
||||
boost::mutex::scoped_lock lock(fActionMutex);
|
||||
|
||||
if (fNewFilePtr)
|
||||
closeFile(fNewFilePtr);
|
||||
@ -124,7 +124,7 @@ void RedistributeWorkerThread::handleRequest()
|
||||
{
|
||||
// clear stop flag if ever set.
|
||||
{
|
||||
std::unique_lock lock(fActionMutex);
|
||||
boost::mutex::scoped_lock lock(fActionMutex);
|
||||
fStopAction = false;
|
||||
fCommitted = false;
|
||||
}
|
||||
@ -172,7 +172,7 @@ void RedistributeWorkerThread::handleRequest()
|
||||
|
||||
sendResponse(RED_ACTN_REQUEST);
|
||||
|
||||
std::unique_lock lock(fActionMutex);
|
||||
boost::mutex::scoped_lock lock(fActionMutex);
|
||||
fWesInUse.clear();
|
||||
fMsgQueueClient.reset();
|
||||
|
||||
@ -865,7 +865,7 @@ int RedistributeWorkerThread::updateDbrm()
|
||||
{
|
||||
int rc1 = BRM::ERR_OK;
|
||||
int rc2 = BRM::ERR_OK;
|
||||
std::unique_lock lock(fActionMutex);
|
||||
boost::mutex::scoped_lock lock(fActionMutex);
|
||||
|
||||
// cannot stop after extent map is updated.
|
||||
if (!fStopAction)
|
||||
@ -1061,7 +1061,7 @@ void RedistributeWorkerThread::addToDirSet(const char* fileName, bool isSource)
|
||||
|
||||
void RedistributeWorkerThread::handleStop()
|
||||
{
|
||||
std::unique_lock lock(fActionMutex);
|
||||
boost::mutex::scoped_lock lock(fActionMutex);
|
||||
|
||||
// cannot stop after extent map is updated.
|
||||
if (!fCommitted)
|
||||
|
Reference in New Issue
Block a user