database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

MCOL-5491 Enable StringStore for long strings in JSON_ARRAYAGG processing.

Browse Source 
This patch is the JSON_ARRAYAGG clone of the changes done in MCOL-5429
where we enabled usage of StringStore for long strings in
GROUP_CONCAT() processing to reduce memory footprint of PrimProc and
thus avoiding a potential OS triggered OOM crash.
This commit is contained in:
Gagan Goel
2023-05-12 19:45:02 +00:00
parent 0be1c3dc8f
commit 87eb875379
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
dbcon/joblist/jsonarrayagg.cpp
View File

@ -260,6 +260,14 @@ void JsonArrayInfo::mapColumns(const RowGroup& projRG)
(*k)->fRowGroup = RowGroup(oids.size(), pos, oids, keys, types, csNums, scale, precision,
projRG.getStringTableThreshold(), false);
// MCOL-5491/MCOL-5429 Use stringstore if the datatype of the
// json_arrayagg/group_concat field is a long string.
if ((*k)->fRowGroup.hasLongString())
{
(*k)->fRowGroup.setUseStringTable(true);
}
(*k)->fMapping = makeMapping(projRG, (*k)->fRowGroup);
}
}
@ -311,9 +319,24 @@ void JsonArrayAggregatAgUM::initialize()
fConcator->initialize(fGroupConcat);
fGroupConcat->fRowGroup.initRow(&fRow, true);
fData.reset(new uint8_t[fRow.getSize()]);
fRow.setData(rowgroup::Row::Pointer(fData.get()));
// MCOL-5491/MCOL-5429 Use stringstore if the datatype of the
// json_arrayagg/group_concat field is a long string.
if (fGroupConcat->fRowGroup.hasLongString())
{
fRowGroup = fGroupConcat->fRowGroup;
fRowGroup.setUseStringTable(true);
fRowRGData.reinit(fRowGroup, 1);
fRowGroup.setData(&fRowRGData);
fRowGroup.resetRowGroup(0);
fRowGroup.initRow(&fRow);
fRowGroup.getRow(0, &fRow);
}
else
{
fGroupConcat->fRowGroup.initRow(&fRow, true);
fData.reset(new uint8_t[fRow.getSize()]);
fRow.setData(rowgroup::Row::Pointer(fData.get()));
}
}
void JsonArrayAggregatAgUM::processRow(const rowgroup::Row& inRow)