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-392 Function fixes

Browse Source 
Fixes most of the functions in funcexp so that time and datetime's
microseconds are handled correctly
This commit is contained in:
Andrew Hutchings
2018-04-27 21:18:14 +01:00
parent bd50bbb8bb
commit 957dc44615
11 changed files with 271 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
utils/funcexp/func_hour.cpp
View File

@ -48,6 +48,7 @@ int64_t Func_hour::getIntVal(rowgroup::Row& row,
CalpontSystemCatalog::ColType& op_ct)
{
int64_t val = 0;
bool isTime = false;
switch (parm[0]->data()->resultType().colDataType)
{
@ -110,7 +111,8 @@ int64_t Func_hour::getIntVal(rowgroup::Row& row,
case execplan::CalpontSystemCatalog::TIME:
{
val = parm[0]->data()->getDatetimeIntVal(row, isNull);
isTime = true;
val = parm[0]->data()->getTimeIntVal(row, isNull);
break;
}
@ -123,10 +125,20 @@ int64_t Func_hour::getIntVal(rowgroup::Row& row,
if (isNull)
return -1;
if ( val < 1000000000 )
return 0;
if (isTime)
{
// If negative, mask so it doesn't turn positive
int64_t mask = 0;
if ((val >> 40) & 0x800)
mask = 0xfffffffffffff000;
val = mask | ((val >> 40) & 0xfff);
}
else
{
val = (val >> 32) & 0x3f;
}
return (uint32_t)((val >> 32) & 0x3f);
return val;
}