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-4188 Regression fixes for MCOL-641.

Browse Source 
1. Add wide decimal support to AggregateColumn::evaluate
and TreeNode::getDecimalVal().
2. Use the pm aggregate attributes to determine um aggregate
attributes in TupleAggregateStep::prep2PhasesAggregate.
This commit is contained in:
Gagan Goel
2020-11-19 18:56:40 -05:00
parent aa64d81cde
commit a159f8a0b6
8 changed files with 125 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
dbcon/execplan/aggregatecolumn.cpp
View File

@ -525,14 +525,26 @@ void AggregateColumn::evaluate(Row& row, bool& isNull)
case CalpontSystemCatalog::UDECIMAL:
switch (fResultType.colWidth)
{
case 16:
{
datatypes::TSInt128 val = row.getTSInt128Field(fInputIndex);
if (val.isNull())
isNull = true;
else
fResult.decimalVal = IDB_Decimal(val, fResultType.scale, fResultType.precision);
break;
}
case 1:
if (row.equals<1>(TINYINTNULL, fInputIndex))
isNull = true;
else
{
fResult.decimalVal.value = row.getIntField<1>(fInputIndex);
fResult.decimalVal.scale = (unsigned)fResultType.scale;
}
fResult.decimalVal = IDB_Decimal(
row.getIntField<1>(fInputIndex),
fResultType.scale,
fResultType.precision);
break;
@ -540,10 +552,10 @@ void AggregateColumn::evaluate(Row& row, bool& isNull)
if (row.equals<2>(SMALLINTNULL, fInputIndex))
isNull = true;
else
{
fResult.decimalVal.value = row.getIntField<2>(fInputIndex);
fResult.decimalVal.scale = (unsigned)fResultType.scale;
}
fResult.decimalVal = IDB_Decimal(
row.getIntField<2>(fInputIndex),
fResultType.scale,
fResultType.precision);
break;
@ -551,10 +563,10 @@ void AggregateColumn::evaluate(Row& row, bool& isNull)
if (row.equals<4>(INTNULL, fInputIndex))
isNull = true;
else
{
fResult.decimalVal.value = row.getIntField<4>(fInputIndex);
fResult.decimalVal.scale = (unsigned)fResultType.scale;
}
fResult.decimalVal = IDB_Decimal(
row.getIntField<4>(fInputIndex),
fResultType.scale,
fResultType.precision);
break;
@ -562,10 +574,10 @@ void AggregateColumn::evaluate(Row& row, bool& isNull)
if (row.equals<8>(BIGINTNULL, fInputIndex))
isNull = true;
else
{
fResult.decimalVal.value = (int64_t)row.getUintField<8>(fInputIndex);
fResult.decimalVal.scale = (unsigned)fResultType.scale;
}
fResult.decimalVal = IDB_Decimal(
(int64_t) row.getUintField<8>(fInputIndex),
fResultType.scale,
fResultType.precision);
break;
}