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

Merge pull request #492 from mariadb-corporation/MCOL-392-fixes

Browse Source 
Fix a bunch of issues around TIME data type
This commit is contained in:
David.Hall
2018-06-07 09:18:56 -05:00
committed by GitHub
parent 12b1d99f51 e2141e0b69
commit 53b29a03ad
7 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
utils/funcexp/func_add_time.cpp
View File

@ -223,7 +223,14 @@ int64_t Func_add_time::getIntVal(rowgroup::Row& row,
bool& isNull,
CalpontSystemCatalog::ColType& op_ct)
{
return getDatetimeIntVal(row, parm, isNull, op_ct);
if (parm[0]->data()->resultType().colDataType == execplan::CalpontSystemCatalog::TIME)
{
return getTimeIntVal(row, parm, isNull, op_ct);
}
else
{
return getDatetimeIntVal(row, parm, isNull, op_ct);
}
}
string Func_add_time::getStrVal(rowgroup::Row& row,

4
utils/funcexp/func_dayname.cpp
View File

@ -145,7 +145,9 @@ string Func_dayname::getStrVal(rowgroup::Row& row,
bool& isNull,
CalpontSystemCatalog::ColType& op_ct)
{
uint32_t weekday = getIntVal(row, parm, isNull, op_ct);
int32_t weekday = getIntVal(row, parm, isNull, op_ct);
if (weekday == -1)
return "";
return helpers::weekdayFullNames[weekday];
}

4
utils/funcexp/func_monthname.cpp
View File

@ -47,7 +47,9 @@ string Func_monthname::getStrVal(rowgroup::Row& row,
bool& isNull,
CalpontSystemCatalog::ColType& op_ct)
{
uint32_t month = getIntVal(row, parm, isNull, op_ct);
int32_t month = getIntVal(row, parm, isNull, op_ct);
if (month == -1)
return "";
return helpers::monthFullNames[month];
}