database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +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

26
dbcon/joblist/tuplehashjoin.cpp
View File

@ -81,7 +81,7 @@ TupleHashJoinStep::TupleHashJoinStep(const JobInfo& jobInfo)
, isExeMgr(jobInfo.isExeMgr)
, lastSmallOuterJoiner(-1)
, fTokenJoin(-1)
, fStatsMutexPtr(new std::mutex())
, fStatsMutexPtr(new boost::mutex())
, fFunctionJoinKeys(jobInfo.keyInfo->functionJoinKeys)
, sessionMemLimit(jobInfo.umMemLimit)
, rgdLock(false)
@ -148,7 +148,7 @@ void TupleHashJoinStep::run()
{
uint32_t i;
std::unique_lock lk(jlLock);
boost::mutex::scoped_lock lk(jlLock);
if (runRan)
return;
@ -190,7 +190,7 @@ void TupleHashJoinStep::run()
void TupleHashJoinStep::join()
{
std::unique_lock lk(jlLock);
boost::mutex::scoped_lock lk(jlLock);
if (joinRan)
return;
@ -218,7 +218,7 @@ void TupleHashJoinStep::trackMem(uint index)
ssize_t memBefore = 0, memAfter = 0;
bool gotMem;
std::unique_lock<std::mutex> scoped(memTrackMutex);
boost::unique_lock<boost::mutex> scoped(memTrackMutex);
while (!stopMemTracking)
{
memAfter = joiner->getMemUsage();
@ -232,7 +232,7 @@ void TupleHashJoinStep::trackMem(uint index)
memBefore = memAfter;
}
memTrackDone.wait_for(scoped, std::chrono::seconds(1));
memTrackDone.timed_wait(scoped, boost::posix_time::seconds(1));
}
// one more iteration to capture mem usage since last poll, for this one
@ -376,7 +376,7 @@ void TupleHashJoinStep::startSmallRunners(uint index)
joiner->doneInserting();
}
std::unique_lock lk(*fStatsMutexPtr);
boost::mutex::scoped_lock lk(*fStatsMutexPtr);
fExtendedInfo += extendedInfo;
formatMiniStats(index);
}
@ -427,7 +427,7 @@ void TupleHashJoinStep::smallRunnerFcn(uint32_t index, uint threadID, uint64_t*
if disk join is enabled, use it.
else abort.
*/
std::unique_lock<std::mutex> sl(saneErrMsg);
boost::unique_lock<boost::mutex> sl(saneErrMsg);
if (cancelled())
return;
if (!allowDJS || isDML || (fSessionId & 0x80000000) || (tableOid() < 3000 && tableOid() >= 1000))
@ -739,7 +739,7 @@ void TupleHashJoinStep::hjRunner()
for (i = 0; i <= smallSideCount; i++)
fifos[i].reset(new RowGroupDL(1, 5));
std::unique_lock sl(djsLock);
boost::mutex::scoped_lock sl(djsLock);
for (i = 0; i < smallSideCount; i++)
{
@ -1000,7 +1000,7 @@ uint32_t TupleHashJoinStep::nextBand(messageqcpp::ByteStream& bs)
idbassert(fDelivery);
std::unique_lock lk(deliverMutex);
boost::mutex::scoped_lock lk(deliverMutex);
RowGroup* deliveredRG;
@ -1672,7 +1672,7 @@ void TupleHashJoinStep::processFE2(RowGroup& input, RowGroup& output, Row& inRow
void TupleHashJoinStep::sendResult(const vector<RGData>& res)
{
std::unique_lock lock(outputDLLock);
boost::mutex::scoped_lock lock(outputDLLock);
for (uint32_t i = 0; i < res.size(); i++)
// INSERT_ADAPTER(outputDL, res[i]);
@ -1681,7 +1681,7 @@ void TupleHashJoinStep::sendResult(const vector<RGData>& res)
void TupleHashJoinStep::grabSomeWork(vector<RGData>* work)
{
std::unique_lock lock(inputDLLock);
boost::mutex::scoped_lock lock(inputDLLock);
work->clear();
if (!moreInput)
@ -1934,7 +1934,7 @@ void TupleHashJoinStep::segregateJoiners()
}
#endif
std::unique_lock sl(djsLock);
boost::mutex::scoped_lock sl(djsLock);
/* For now if there is no largeBPS all joins need to either be DJS or not, not mixed */
if (!largeBPS)
{
@ -2009,7 +2009,7 @@ void TupleHashJoinStep::segregateJoiners()
void TupleHashJoinStep::abort()
{
JobStep::abort();
std::unique_lock sl(djsLock);
boost::mutex::scoped_lock sl(djsLock);
if (djs)
{