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

feat(TNS, sorting, distinct): TNS now accounts data used by RGDatas and distinct maps.

Browse Source
This commit is contained in:
drrtuy
2025-03-11 19:21:44 +00:00
parent c6dabe7eb5
commit 09926b3157
6 changed files with 87 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/loggingcpp/ErrorMessage.txt
View File

@ -110,6 +110,8 @@
2061 ERR_NOT_SUPPORTED_GROUPBY_ORDERBY_EXPRESSION %1% is not in GROUP BY clause, not a column or an expression that contains function.
2063 ERR_TNS_DISTINCT_IS_TOO_BIG DISTINCT memory limit is exceeded whilst running TNS step.
# Sub-query errors
3001 ERR_NON_SUPPORT_SUB_QUERY_TYPE This subquery type is not supported yet.
3002 ERR_MORE_THAN_1_ROW Subquery returns more than 1 row.

3
utils/windowfunction/idborderby.cpp
View File

@ -737,7 +737,8 @@ IdbOrderBy::IdbOrderBy()
IdbOrderBy::~IdbOrderBy()
{
if (fRm)
// returnRGDataMemory2RM() returns all memory before the dtor is called.
if (fRm && fMemSize > 0)
fRm->returnMemory(fMemSize, fSessionMemLimit);
// delete compare objects

15
utils/windowfunction/idborderby.h
View File

@ -33,6 +33,7 @@
#include <unordered_set>
#include "countingallocator.h"
#include "resourcemanager.h"
#include "rowgroup.h"
#include "hasher.h"
// #include "stlpoolallocator.h"
@ -433,6 +434,20 @@ class IdbOrderBy : public IdbCompare
{
return *fOrderByQueue;
}
void returnAllRGDataMemory2RM()
{
while (!fOrderByQueue->empty())
{
fOrderByQueue->pop();
}
fRm->returnMemory(fMemSize, fSessionMemLimit);
fMemSize = 0;
}
void returnRGDataMemory2RM(const size_t rgDataSize)
{
fRm->returnMemory(rgDataSize, fSessionMemLimit);
fMemSize -= rgDataSize;
}
CompareRule& getRule()
{
return fRule;