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

Fixed a couple minor things I ran into working on another task

Browse Source 
- Made TupleUnion not allocate 64MB per frame.
 - Saw a crash, where a THJS would be destroyed w/o being used.
   Fixed the bad reference.
This commit is contained in:
Patrick LeBlanc
2020-01-06 14:17:43 -05:00
parent bd592aa714
commit 80ff0bfa56
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dbcon/joblist/tuplehashjoin.cpp
View File

@ -132,8 +132,9 @@ TupleHashJoinStep::~TupleHashJoinStep()
if (ownsOutputDL) if (ownsOutputDL)
delete outputDL; delete outputDL;
for (uint i = 0 ; i < smallDLs.size(); i++) if (memUsedByEachJoin)
resourceManager->returnMemory(memUsedByEachJoin[i], sessionMemLimit); for (uint i = 0 ; i < smallDLs.size(); i++)
resourceManager->returnMemory(memUsedByEachJoin[i], sessionMemLimit);
//cout << "deallocated THJS, UM memory available: " << resourceManager.availableMemory() << endl; //cout << "deallocated THJS, UM memory available: " << resourceManager.availableMemory() << endl;
} }

1
dbcon/joblist/tupleunion.cpp
View File

@ -94,7 +94,6 @@ TupleUnion::TupleUnion(CalpontSystemCatalog::OID tableOID, const JobInfo& jobInf
outputIt(-1), outputIt(-1),
memUsage(0), memUsage(0),
rm(jobInfo.rm), rm(jobInfo.rm),
allocator(64 * 1024 * 1024 + 1),
runnersDone(0), runnersDone(0),
distinctCount(0), distinctCount(0),
distinctDone(0), distinctDone(0),