You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-30 19:23:07 +03:00
This reverts commit f916e64927
.
This commit is contained in:
@ -65,13 +65,13 @@ using namespace execplan;
|
||||
namespace redistribute
|
||||
{
|
||||
// static variables
|
||||
std::mutex RedistributeControlThread::fActionMutex;
|
||||
boost::mutex RedistributeControlThread::fActionMutex;
|
||||
volatile bool RedistributeControlThread::fStopAction = false;
|
||||
string RedistributeControlThread::fWesInUse;
|
||||
|
||||
void RedistributeControlThread::setStopAction(bool s)
|
||||
{
|
||||
std::unique_lock lock(fActionMutex);
|
||||
boost::mutex::scoped_lock lock(fActionMutex);
|
||||
fStopAction = s;
|
||||
}
|
||||
|
||||
@ -147,7 +147,7 @@ void RedistributeControlThread::doRedistribute()
|
||||
fControl->logMessage(fErrorMsg + " @controlThread::doRedistribute");
|
||||
|
||||
{
|
||||
std::unique_lock lock(fActionMutex);
|
||||
boost::mutex::scoped_lock lock(fActionMutex);
|
||||
fWesInUse.clear();
|
||||
}
|
||||
}
|
||||
@ -766,7 +766,7 @@ int RedistributeControlThread::connectToWes(int dbroot)
|
||||
|
||||
try
|
||||
{
|
||||
std::unique_lock lock(fActionMutex);
|
||||
boost::mutex::scoped_lock lock(fActionMutex);
|
||||
fWesInUse = oss.str();
|
||||
fMsgQueueClient.reset(new MessageQueueClient(fWesInUse, fConfig));
|
||||
}
|
||||
@ -783,7 +783,7 @@ int RedistributeControlThread::connectToWes(int dbroot)
|
||||
|
||||
if (ret != 0)
|
||||
{
|
||||
std::unique_lock lock(fActionMutex);
|
||||
boost::mutex::scoped_lock lock(fActionMutex);
|
||||
fWesInUse.clear();
|
||||
|
||||
fMsgQueueClient.reset();
|
||||
@ -797,7 +797,7 @@ void RedistributeControlThread::doStopAction()
|
||||
fConfig = Config::makeConfig();
|
||||
fControl = RedistributeControl::instance();
|
||||
|
||||
std::unique_lock lock(fActionMutex);
|
||||
boost::mutex::scoped_lock lock(fActionMutex);
|
||||
|
||||
if (!fWesInUse.empty())
|
||||
{
|
||||
|
Reference in New Issue
Block a user