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
No boost condition (#2822)
This patch replaces boost primitives with stdlib counterparts.
This commit is contained in:
@ -38,7 +38,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
#include "bytestream.h"
|
||||
#include "rwlock_local.h"
|
||||
|
||||
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
@ -48,7 +48,7 @@
|
||||
#include <map>
|
||||
using namespace std;
|
||||
|
||||
#include <boost/thread/condition.hpp>
|
||||
#include <condition_variable>
|
||||
#include <boost/scoped_array.hpp>
|
||||
#include <boost/thread.hpp>
|
||||
#include <boost/filesystem.hpp>
|
||||
@ -569,7 +569,7 @@ void WEDataLoader::onCpimportSuccess()
|
||||
|
||||
if (aRet)
|
||||
{
|
||||
boost::mutex::scoped_lock aLock(fClntMsgMutex);
|
||||
std::unique_lock aLock(fClntMsgMutex);
|
||||
// aBrmRptParser.unserialize(obs); - was for testing
|
||||
updateTxBytes(obs.length());
|
||||
|
||||
@ -606,7 +606,7 @@ void WEDataLoader::onCpimportSuccess()
|
||||
obs.reset();
|
||||
obs << (ByteStream::byte)WE_CLT_SRV_CPIPASS;
|
||||
obs << (ByteStream::byte)fPmId; // PM id
|
||||
boost::mutex::scoped_lock aLock(fClntMsgMutex);
|
||||
std::unique_lock aLock(fClntMsgMutex);
|
||||
updateTxBytes(obs.length());
|
||||
|
||||
try
|
||||
@ -661,7 +661,7 @@ void WEDataLoader::onCpimportFailure()
|
||||
|
||||
if (aRet)
|
||||
{
|
||||
boost::mutex::scoped_lock aLock(fClntMsgMutex);
|
||||
std::unique_lock aLock(fClntMsgMutex);
|
||||
updateTxBytes(obs.length());
|
||||
|
||||
try
|
||||
@ -707,7 +707,7 @@ void WEDataLoader::sendCpimportFailureNotice()
|
||||
ByteStream obs;
|
||||
obs << (ByteStream::byte)WE_CLT_SRV_CPIFAIL;
|
||||
obs << (ByteStream::byte)fPmId; // PM id
|
||||
boost::mutex::scoped_lock aLock(fClntMsgMutex);
|
||||
std::unique_lock aLock(fClntMsgMutex);
|
||||
updateTxBytes(obs.length());
|
||||
|
||||
try
|
||||
@ -753,7 +753,7 @@ void WEDataLoader::onReceiveKeepAlive(ByteStream& Ibs)
|
||||
ByteStream obs;
|
||||
obs << (ByteStream::byte)WE_CLT_SRV_KEEPALIVE;
|
||||
obs << (ByteStream::byte)fPmId; // PM id
|
||||
boost::mutex::scoped_lock aLock(fClntMsgMutex);
|
||||
std::unique_lock aLock(fClntMsgMutex);
|
||||
updateTxBytes(obs.length());
|
||||
|
||||
try
|
||||
@ -812,7 +812,7 @@ void WEDataLoader::onReceiveKeepAlive(ByteStream& Ibs)
|
||||
ByteStream obs;
|
||||
obs << (ByteStream::byte)WE_CLT_SRV_EOD;
|
||||
obs << (ByteStream::byte)fPmId; // PM id
|
||||
boost::mutex::scoped_lock aLock(fClntMsgMutex);
|
||||
std::unique_lock aLock(fClntMsgMutex);
|
||||
updateTxBytes(obs.length());
|
||||
|
||||
try
|
||||
@ -934,7 +934,7 @@ void WEDataLoader::onReceiveEod(ByteStream& Ibs)
|
||||
ByteStream obs;
|
||||
obs << (ByteStream::byte)WE_CLT_SRV_EOD;
|
||||
obs << (ByteStream::byte)fPmId; // PM id
|
||||
boost::mutex::scoped_lock aLock(fClntMsgMutex);
|
||||
std::unique_lock aLock(fClntMsgMutex);
|
||||
updateTxBytes(obs.length());
|
||||
|
||||
try
|
||||
@ -1033,7 +1033,7 @@ void WEDataLoader::onReceiveMode(ByteStream& Ibs)
|
||||
aObs << (ByteStream::byte)WE_CLT_SRV_DBRCNT;
|
||||
aObs << (ByteStream::byte)fPmId;
|
||||
aObs << (ByteStream::byte)aDbCnt;
|
||||
boost::mutex::scoped_lock aLock(fClntMsgMutex);
|
||||
std::unique_lock aLock(fClntMsgMutex);
|
||||
updateTxBytes(aObs.length());
|
||||
|
||||
try
|
||||
@ -1124,7 +1124,7 @@ void WEDataLoader::onReceiveCmdLineArgs(ByteStream& Ibs)
|
||||
}
|
||||
|
||||
obs << (ByteStream::byte)fPmId; // PM id
|
||||
boost::mutex::scoped_lock aLock(fClntMsgMutex);
|
||||
std::unique_lock aLock(fClntMsgMutex);
|
||||
updateTxBytes(obs.length());
|
||||
|
||||
try
|
||||
@ -1259,7 +1259,7 @@ void WEDataLoader::onReceiveCleanup(ByteStream& Ibs)
|
||||
else
|
||||
obs << (ByteStream::byte)0; // cleanup failed
|
||||
|
||||
boost::mutex::scoped_lock aLock(fClntMsgMutex);
|
||||
std::unique_lock aLock(fClntMsgMutex);
|
||||
updateTxBytes(obs.length());
|
||||
|
||||
try
|
||||
@ -1310,7 +1310,7 @@ void WEDataLoader::onReceiveRollback(ByteStream& Ibs)
|
||||
else
|
||||
obs << (ByteStream::byte)0; // Rollback failed
|
||||
|
||||
boost::mutex::scoped_lock aLock(fClntMsgMutex);
|
||||
std::unique_lock aLock(fClntMsgMutex);
|
||||
updateTxBytes(obs.length());
|
||||
|
||||
try
|
||||
@ -1353,7 +1353,7 @@ void WEDataLoader::onReceiveImportFileName(ByteStream& Ibs)
|
||||
obs << (ByteStream::byte)WE_CLT_SRV_IMPFILEERROR;
|
||||
obs << (ByteStream::byte)fPmId;
|
||||
updateTxBytes(obs.length());
|
||||
boost::mutex::scoped_lock aLock(fClntMsgMutex);
|
||||
std::unique_lock aLock(fClntMsgMutex);
|
||||
|
||||
try
|
||||
{
|
||||
@ -1390,7 +1390,7 @@ void WEDataLoader::onReceiveImportFileName(ByteStream& Ibs)
|
||||
ByteStream obs;
|
||||
obs << (ByteStream::byte)WE_CLT_SRV_IMPFILEERROR;
|
||||
obs << (ByteStream::byte)fPmId; // PM id
|
||||
boost::mutex::scoped_lock aLock(fClntMsgMutex);
|
||||
std::unique_lock aLock(fClntMsgMutex);
|
||||
updateTxBytes(obs.length());
|
||||
|
||||
try
|
||||
@ -1470,7 +1470,7 @@ void WEDataLoader::onReceiveErrFileRqst(ByteStream& Ibs)
|
||||
|
||||
if (aRet)
|
||||
{
|
||||
boost::mutex::scoped_lock aLock(fClntMsgMutex);
|
||||
std::unique_lock aLock(fClntMsgMutex);
|
||||
updateTxBytes(obs.length());
|
||||
|
||||
try
|
||||
@ -1517,7 +1517,7 @@ void WEDataLoader::onReceiveBadFileRqst(ByteStream& Ibs)
|
||||
|
||||
if (aRet)
|
||||
{
|
||||
boost::mutex::scoped_lock aLock(fClntMsgMutex);
|
||||
std::unique_lock aLock(fClntMsgMutex);
|
||||
updateTxBytes(obs.length());
|
||||
|
||||
try
|
||||
@ -1569,7 +1569,7 @@ void WEDataLoader::sendDataRequest()
|
||||
}
|
||||
}
|
||||
|
||||
boost::mutex::scoped_lock aLock(fClntMsgMutex);
|
||||
std::unique_lock aLock(fClntMsgMutex);
|
||||
ByteStream obs;
|
||||
obs << (ByteStream::byte)WE_CLT_SRV_DATARQST;
|
||||
obs << (ByteStream::byte)fPmId; // PM id
|
||||
|
Reference in New Issue
Block a user