database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MCOL-707 Fix memory accounting for ORDER BY

Browse Source 
Missed off window function order by memory accounting in my first commit
for MCOL-707. Fixed in the same way
This commit is contained in:
Andrew Hutchings
2017-05-10 22:59:52 +01:00
parent 4adb50f171
commit f369ee6212
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/windowfunction/idborderby.cpp
View File

@ -339,13 +339,13 @@ void IdbOrderBy::initialize(const RowGroup& rg)
IdbCompare::initialize(rg); IdbCompare::initialize(rg);
uint64_t newSize = fRowsPerRG * rg.getRowSize(); uint64_t newSize = fRowsPerRG * rg.getRowSize();
if (!fRm->getMemory(newSize, fSessionMemLimit)) fMemSize += newSize;
if (!fRm->getMemory(newSize, fSessionMemLimit))
{ {
cerr << IDBErrorInfo::instance()->errorMsg(fErrorCode) cerr << IDBErrorInfo::instance()->errorMsg(fErrorCode)
<< " @" << __FILE__ << ":" << __LINE__; << " @" << __FILE__ << ":" << __LINE__;
throw IDBExcept(fErrorCode); throw IDBExcept(fErrorCode);
} }
fMemSize += newSize;
fData.reinit(fRowGroup, fRowsPerRG); fData.reinit(fRowGroup, fRowsPerRG);
fRowGroup.setData(&fData); fRowGroup.setData(&fData);
fRowGroup.resetRowGroup(0); fRowGroup.resetRowGroup(0);