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:
@ -31,7 +31,7 @@
|
||||
#include "we_sdhandler.h"
|
||||
#include "we_splitterapp.h"
|
||||
|
||||
#include <condition_variable>
|
||||
#include <boost/thread/condition.hpp>
|
||||
#include <boost/scoped_array.hpp>
|
||||
#include <boost/thread.hpp>
|
||||
using namespace boost;
|
||||
@ -279,7 +279,7 @@ void WEFileReadThread::add2InputDataFileList(std::string& FileName)
|
||||
void WEFileReadThread::shutdown()
|
||||
{
|
||||
this->setContinue(false);
|
||||
std::unique_lock aLock(fFileMutex); // wait till readDataFile() finish
|
||||
boost::mutex::scoped_lock aLock(fFileMutex); // wait till readDataFile() finish
|
||||
|
||||
// if(fInFile.is_open()) fInFile.close(); //@BUG 4326
|
||||
if (fIfFile.is_open())
|
||||
@ -323,7 +323,7 @@ void WEFileReadThread::feedData()
|
||||
|
||||
// cout << "Length " << aSbs->length() <<endl; - for debug
|
||||
fSdh.updateRowTx(aRowCnt, TgtPmId);
|
||||
std::unique_lock aLock(fSdh.fSendMutex);
|
||||
boost::mutex::scoped_lock aLock(fSdh.fSendMutex);
|
||||
fSdh.send2Pm(aSbs, TgtPmId);
|
||||
aLock.unlock();
|
||||
setTgtPmId(0); // reset PmId. Send the data to next least data
|
||||
@ -367,7 +367,7 @@ void WEFileReadThread::feedData()
|
||||
//------------------------------------------------------------------------------
|
||||
unsigned int WEFileReadThread::readDataFile(messageqcpp::SBS& Sbs)
|
||||
{
|
||||
std::unique_lock aLock(fFileMutex);
|
||||
boost::mutex::scoped_lock aLock(fFileMutex);
|
||||
|
||||
// For now we are going to send KEEPALIVES
|
||||
//*Sbs << (ByteStream::byte)(WE_CLT_SRV_KEEPALIVE);
|
||||
@ -431,7 +431,7 @@ unsigned int WEFileReadThread::readDataFile(messageqcpp::SBS& Sbs)
|
||||
//------------------------------------------------------------------------------
|
||||
unsigned int WEFileReadThread::readBinaryDataFile(messageqcpp::SBS& Sbs, unsigned int recLen)
|
||||
{
|
||||
std::unique_lock aLock(fFileMutex);
|
||||
boost::mutex::scoped_lock aLock(fFileMutex);
|
||||
|
||||
if ((fInFile.good()) && (!fInFile.eof()))
|
||||
{
|
||||
|
Reference in New Issue
Block a user