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-4255 dev fix ROUND(datecolumn)

Browse Source 
The behavior of Server changed
This commit is contained in:
David Hall
2020-11-03 15:36:51 -06:00
parent dfc755cadf
commit 1b7fea9a12
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
utils/funcexp/func_round.cpp
View File

@ -136,7 +136,18 @@ uint64_t Func_round::getUintVal(Row& row,
bool& isNull, bool& isNull,
CalpontSystemCatalog::ColType& op_ct) CalpontSystemCatalog::ColType& op_ct)
{ {
return parm[0]->data()->getUintVal(row, isNull); uint64_t x;
if (UNLIKELY(op_ct.colDataType == execplan::CalpontSystemCatalog::DATE))
{
IDB_Decimal d = getDecimalVal(row, parm, isNull, op_ct);
x = static_cast<uint64_t>(d.value);
}
else
{
x = parm[0]->data()->getUintVal(row, isNull);
}
return x;
} }
@ -432,15 +443,9 @@ IDB_Decimal Func_round::getDecimalVal(Row& row,
{ {
s = parm[1]->data()->getIntVal(row, isNull); s = parm[1]->data()->getIntVal(row, isNull);
if ( s > 11 )
s = 0;
if ( s > 0 ) if ( s > 0 )
{ {
for ( int i = 0 ; i < s ; i++) s = 0; // Dates don't have digits after int part
{
value = value + "0";
}
} }
else else
{ {