diff --git a/dbcon/joblist/tuplehashjoin.cpp b/dbcon/joblist/tuplehashjoin.cpp index ebc657d58..1f164a11f 100644 --- a/dbcon/joblist/tuplehashjoin.cpp +++ b/dbcon/joblist/tuplehashjoin.cpp @@ -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; } diff --git a/dbcon/joblist/tupleunion.cpp b/dbcon/joblist/tupleunion.cpp index f62c94b9d..85f90860b 100644 --- a/dbcon/joblist/tupleunion.cpp +++ b/dbcon/joblist/tupleunion.cpp @@ -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),