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-4043 Fix memory leaks - 2

Browse Source 
Perform deletes of Compare objects in the OrderByData dtor,
which were allocated by CompareRule::compileRules().
This commit is contained in:
Gagan Goel
2020-06-11 19:21:11 -04:00
parent feee26f1ab
commit 6c05717b4c
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
utils/windowfunction/idborderby.cpp
View File

@ -693,6 +693,24 @@ OrderByData::OrderByData(const std::vector<IdbSortSpec>& spec, const rowgroup::R
} }
// OrderByData class dtor
OrderByData::~OrderByData()
{
// delete compare objects
vector<Compare*>::iterator i = fRule.fCompares.begin();
while (i != fRule.fCompares.end())
{
if (*i)
{
delete *i;
*i = NULL;
}
i++;
}
}
// IdbOrderBy class implementation // IdbOrderBy class implementation
IdbOrderBy::IdbOrderBy() : IdbOrderBy::IdbOrderBy() :
fDistinct(false), fMemSize(0), fRowsPerRG(rowgroup::rgCommonSize), fDistinct(false), fMemSize(0), fRowsPerRG(rowgroup::rgCommonSize),

2
utils/windowfunction/idborderby.h
View File

@ -338,7 +338,7 @@ class OrderByData : public IdbCompare
{ {
public: public:
OrderByData(const std::vector<IdbSortSpec>&, const rowgroup::RowGroup&); OrderByData(const std::vector<IdbSortSpec>&, const rowgroup::RowGroup&);
virtual ~OrderByData() {}; virtual ~OrderByData();
bool operator() (rowgroup::Row::Pointer p1, rowgroup::Row::Pointer p2) bool operator() (rowgroup::Row::Pointer p1, rowgroup::Row::Pointer p2)
{ {