database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +03:00
Code Activity

Merge pull request #999 from pleblanc1976/random-bug-fixes

Browse Source 
Fixed a couple minor things I ran into working on another task
This commit is contained in:
Jose Rojas
2020-01-08 10:35:23 -06:00
committed by GitHub
parent bf356cdb86 80ff0bfa56
commit 8e6fde3b71
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)
delete outputDL;
for (uint i = 0 ; i < smallDLs.size(); i++)
resourceManager->returnMemory(memUsedByEachJoin[i], sessionMemLimit);
if (memUsedByEachJoin)
for (uint i = 0 ; i < smallDLs.size(); i++)
resourceManager->returnMemory(memUsedByEachJoin[i], sessionMemLimit);
//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),
memUsage(0),
rm(jobInfo.rm),
allocator(64 * 1024 * 1024 + 1),
runnersDone(0),
distinctCount(0),
distinctDone(0),