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

feat(): replace getMaxDataSize with getMaxDataSizeWithStrings to accurately account for mem

Browse Source
This commit is contained in:
drrtuy
2025-03-04 21:10:39 +00:00
parent da28750ffc
commit be5711cf0d
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dbcon/joblist/tuple-bps.cpp
View File

@@ -275,9 +275,10 @@ uint64_t TupleBPS::JoinLocalData::generateJoinResultSet(const uint32_t depth,
uint64_t baseRid = local_outputRG.getBaseRid();
outputData.push_back(joinedData);
// Don't let the join results buffer get out of control.
if (tbps->resourceManager()->getMemory(local_outputRG.getMaxDataSize(), false))
auto outputDataSize = local_outputRG.getMaxDataSizeWithStrings();
if (tbps->resourceManager()->getMemory(outputDataSize, false))
{
memSizeForOutputRG += local_outputRG.getMaxDataSize();
memSizeForOutputRG += outputDataSize;
}
else
{