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

MCOL-3713: UM join mem overflow abort problem

Browse Source 
A little cleanup.  It's working.
This commit is contained in:
Patrick LeBlanc
2020-01-07 10:58:23 -05:00
parent a55495a73f
commit 0dbf3280bb
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dbcon/joblist/tuplehashjoin.cpp
View File

@ -133,8 +133,10 @@ TupleHashJoinStep::~TupleHashJoinStep()
delete outputDL; delete outputDL;
if (memUsedByEachJoin) if (memUsedByEachJoin)
{
for (uint i = 0 ; i < smallDLs.size(); i++) for (uint i = 0 ; i < smallDLs.size(); i++)
resourceManager->returnMemory(memUsedByEachJoin[i], sessionMemLimit); resourceManager->returnMemory(memUsedByEachJoin[i], sessionMemLimit);
}
//cout << "deallocated THJS, UM memory available: " << resourceManager.availableMemory() << endl; //cout << "deallocated THJS, UM memory available: " << resourceManager.availableMemory() << endl;
} }
@ -314,8 +316,6 @@ void TupleHashJoinStep::startSmallRunners(uint index)
memTrackMutex.unlock(); memTrackMutex.unlock();
jobstepThreadPool.join(memMonitor); jobstepThreadPool.join(memMonitor);
extendedInfo += "\n";
/* If there was an error or an abort, drain the input DL, /* If there was an error or an abort, drain the input DL,
do endOfInput on the output */ do endOfInput on the output */
if (cancelled()) if (cancelled())
@ -337,6 +337,8 @@ void TupleHashJoinStep::startSmallRunners(uint index)
" size = " << joiner->size() << endl; " size = " << joiner->size() << endl;
*/ */
extendedInfo += "\n";
ostringstream oss; ostringstream oss;
if (!joiner->onDisk()) if (!joiner->onDisk())
{ {
@ -707,10 +709,9 @@ void TupleHashJoinStep::hjRunner()
/* Need to clean this stuff up. If the query was cancelled before this, and this would have had /* Need to clean this stuff up. If the query was cancelled before this, and this would have had
a disk join, it's still necessary to construct the DJS objects to finish the abort. a disk join, it's still necessary to construct the DJS objects to finish the abort.
Update: Is this more complicated than scanning joiners for either ondisk() or (not isFinished()) Update: Is this more complicated than scanning joiners for either ondisk() or (not isFinished())
and draining the corresponding inputs & telling downstream EOF? */ and draining the corresponding inputs & telling downstream EOF? todo, think about it */
if (!djsJoiners.empty()) if (!djsJoiners.empty())
{ {
cout << "Starting disk join" << endl;
joinIsTooBig = false; joinIsTooBig = false;
if (!cancelled()) if (!cancelled())