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-521 more multi-param work with constant NULL

Browse Source
This commit is contained in:
David Hall
2018-09-13 14:12:10 -05:00
parent 70cec8f484
commit 3fac7b1e19
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
utils/rowgroup/rowaggregation.cpp
View File

@ -2015,18 +2015,9 @@ void RowAggregation::doUDAF(const Row& rowIn, int64_t colIn, int64_t colOut,
for (uint32_t i = 0; i < paramCount; ++i) for (uint32_t i = 0; i < paramCount; ++i)
{ {
// If UDAF_IGNORE_NULLS is on, bIsNull gets set the first time
// we find a null. We still need to eat the rest of the parameters
// to sync updateEntry
if (bIsNull)
{
++funcColsIdx;
continue;
}
SP_ROWAGG_FUNC_t pFunctionCol = fFunctionCols[funcColsIdx]; SP_ROWAGG_FUNC_t pFunctionCol = fFunctionCols[funcColsIdx];
mcsv1sdk::ColumnDatum& datum = valsIn[i]; mcsv1sdk::ColumnDatum& datum = valsIn[i];
// Turn on NULL flags // Turn on NULL flags based on the data
dataFlags[i] = 0; dataFlags[i] = 0;
// If this particular parameter is a constant, then we need // If this particular parameter is a constant, then we need
@ -2043,9 +2034,11 @@ void RowAggregation::doUDAF(const Row& rowIn, int64_t colIn, int64_t colOut,
{ {
if (fRGContext.getRunFlag(mcsv1sdk::UDAF_IGNORE_NULLS)) if (fRGContext.getRunFlag(mcsv1sdk::UDAF_IGNORE_NULLS))
{ {
bIsNull = true; // When Ignore nulls, if there are multiple parameters and any
++funcColsIdx; // one of them is NULL, we ignore the entry. We need to increment
continue; // funcColsIdx the number of extra parameters.
funcColsIdx += paramCount - i - 1;
return;
} }
dataFlags[i] |= mcsv1sdk::PARAM_IS_NULL; dataFlags[i] |= mcsv1sdk::PARAM_IS_NULL;