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-1402 Fix addtime/subtime

Browse Source 
The changes to addtime/subtime for TIME datatype broke the handling of
the adding and subtracting of time. This fixes that.
This commit is contained in:
Andrew Hutchings
2018-05-09 20:34:56 +01:00
parent 24b8c790d5
commit 305bae1bcb
2 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
utils/dataconvert/dataconvert.cpp
View File

@ -2769,7 +2769,8 @@ int64_t DataConvert::stringToTime(const string& data)
if (*end != '\0') if (*end != '\0')
return -1; return -1;
hour = day * 24;
day = -1;
time = data.substr(pos + 1, data.length() - pos - 1); time = data.substr(pos + 1, data.length() - pos - 1);
} }
else else
@ -2795,11 +2796,11 @@ int64_t DataConvert::stringToTime(const string& data)
if (pos == string::npos) if (pos == string::npos)
{ {
hour = atoi(hms.c_str()); hour += atoi(hms.c_str());
} }
else else
{ {
hour = atoi(hms.substr(0, pos).c_str()); hour += atoi(hms.substr(0, pos).c_str());
ms = hms.substr(pos + 1, hms.length() - pos - 1); ms = hms.substr(pos + 1, hms.length() - pos - 1);
} }

51
utils/funcexp/func_add_time.cpp
View File

@ -83,8 +83,17 @@ int64_t addTime(DateTime& dt1, Time& dt2)
if ((hour < 0) || (hour > 23)) if ((hour < 0) || (hour > 23))
{ {
dt.hour = hour % 24;
dt2.day = hour / 24; dt2.day = hour / 24;
hour = hour % 24;
}
if (hour < 0)
{
dt.hour = hour + 24;
dt2.day--;
}
else
{
dt.hour = hour;
} }
day = (signed)(dt1.day + dt2.day); day = (signed)(dt1.day + dt2.day);
@ -141,6 +150,7 @@ int64_t addTime(DateTime& dt1, Time& dt2)
int64_t addTime(Time& dt1, Time& dt2) int64_t addTime(Time& dt1, Time& dt2)
{ {
Time dt; Time dt;
dt.is_neg = false;
dt.hour = 0; dt.hour = 0;
dt.minute = 0; dt.minute = 0;
dt.second = 0; dt.second = 0;
@ -174,18 +184,19 @@ int64_t addTime(Time& dt1, Time& dt2)
dt2.hour--; dt2.hour--;
} }
dt.hour = (signed)(dt1.hour + dt2.hour + min / 60); dt.hour = tmp = (signed)(dt1.hour + dt2.hour + min / 60);
// Saturation // Saturation
if (dt.hour > 838) if (tmp > 838)
{ {
dt.hour = 838; dt.hour = 838;
dt.minute = 59; dt.minute = 59;
dt.second = 59; dt.second = 59;
dt.msecond = 999999; dt.msecond = 999999;
} }
else if (dt.hour < -838) else if (tmp < -838)
{ {
dt.is_neg = true;
dt.hour = -838; dt.hour = -838;
dt.minute = 59; dt.minute = 59;
dt.second = 59; dt.second = 59;
@ -277,29 +288,18 @@ int64_t Func_add_time::getDatetimeIntVal(rowgroup::Row& row,
int val_sign = 1; int val_sign = 1;
if (t2.day != 0 && t2.hour < 0) if (t2.hour < 0)
{
isNull = true;
return -1;
}
else if (t2.day < 0 || t2.hour < 0)
{ {
val_sign = -1; val_sign = -1;
} }
if ((abs(t2.day) * 24 + abs(t2.hour)) > 838) if (abs(t2.hour) > 838)
{ {
t2.hour = 838; t2.hour = 838;
t2.minute = 59; t2.minute = 59;
t2.second = 59; t2.second = 59;
t2.msecond = 999999; t2.msecond = 999999;
} }
else
{
t2.hour = abs(t2.day) * 24 + t2.hour;
}
t2.day = 0;
if (val_sign * sign < 0) if (val_sign * sign < 0)
{ {
@ -316,6 +316,8 @@ int64_t Func_add_time::getDatetimeIntVal(rowgroup::Row& row,
t2.msecond = abs(t2.msecond); t2.msecond = abs(t2.msecond);
} }
t2.day = 0;
return addTime(dt1, t2); return addTime(dt1, t2);
} }
@ -332,6 +334,8 @@ int64_t Func_add_time::getTimeIntVal(rowgroup::Row& row,
const string& val2 = parm[1]->data()->getStrVal(row, isNull); const string& val2 = parm[1]->data()->getStrVal(row, isNull);
int sign = parm[2]->data()->getIntVal(row, isNull); int sign = parm[2]->data()->getIntVal(row, isNull);
Time dt1; Time dt1;
dt1.day = 0;
dt1.is_neg = val1 >> 63;
dt1.hour = (val1 >> 40) & 0xfff; dt1.hour = (val1 >> 40) & 0xfff;
dt1.minute = (val1 >> 32) & 0xff; dt1.minute = (val1 >> 32) & 0xff;
dt1.second = (val1 >> 24) & 0xff; dt1.second = (val1 >> 24) & 0xff;
@ -356,27 +360,18 @@ int64_t Func_add_time::getTimeIntVal(rowgroup::Row& row,
int val_sign = 1; int val_sign = 1;
if (t2.day != 0 && t2.hour < 0) if (t2.hour < 0)
{
isNull = true;
return -1;
}
else if (t2.day < 0 || t2.hour < 0)
{ {
val_sign = -1; val_sign = -1;
} }
if ((abs(t2.day) * 24 + abs(t2.hour)) > 838) if (abs(t2.hour) > 838)
{ {
t2.hour = 838; t2.hour = 838;
t2.minute = 59; t2.minute = 59;
t2.second = 59; t2.second = 59;
t2.msecond = 999999; t2.msecond = 999999;
} }
else
{
t2.hour = abs(t2.day) * 24 + t2.hour;
}
t2.day = 0; t2.day = 0;