database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

MCOL 3474 Fix TIMEDIFF w/ non-temporal data types

Browse Source
This commit is contained in:
jmrojas2332
2019-12-03 06:47:36 +00:00
parent 57724e5515
commit 252268ef63
2 changed files with 79 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
utils/funcexp/func_timediff.cpp
View File

@ -45,7 +45,7 @@ namespace funcexp
namespace helpers
{
const string timediff( int64_t time1, int64_t time2)
const string timediff( int64_t time1, int64_t time2, bool isDateTime)
{
long long seconds;
long long microseconds;
@ -56,9 +56,9 @@ const string timediff( int64_t time1, int64_t time2)
l_sign = -l_sign;
if ( time1 > time2 )
helpers::calc_time_diff(time1, time2, l_sign, &seconds, &microseconds);
helpers::calc_time_diff(time1, time2, l_sign, &seconds, &microseconds, isDateTime);
else
helpers::calc_time_diff(time2, time1, l_sign, &seconds, &microseconds);
helpers::calc_time_diff(time2, time1, l_sign, &seconds, &microseconds, isDateTime);
long t_seconds;
int hour = seconds / 3600L;
@ -162,8 +162,20 @@ string Func_timediff::getStrVal(rowgroup::Row& row,
case execplan::CalpontSystemCatalog::CHAR:
case execplan::CalpontSystemCatalog::TEXT:
text = parm[0]->data()->getStrVal(row, isNull);
isTime1 = std::count(text.begin(), text.end(), '-') <= 1; // Time can have at most 1 dash (signifies negative)
val1 = dataconvert::DataConvert::stringToDatetime(text, &isDate1);
if (text.length() >= 14) // datetime has length at least 14
{
val1 = dataconvert::DataConvert::stringToDatetime(text, &isDate1);
}
else if (text.length() == 8 && text.find("-") == string::npos && text.find(":") == string::npos) // special case, this is exactly a date
{
val1 = dataconvert::DataConvert::intToDatetime(parm[0]->data()->getIntVal(row, isNull), &isDate1);
}
else
{
val1 = dataconvert::DataConvert::stringToTime(text);
isTime1 = true;
}
break;
case execplan::CalpontSystemCatalog::BIGINT:
@ -171,7 +183,14 @@ string Func_timediff::getStrVal(rowgroup::Row& row,
case execplan::CalpontSystemCatalog::MEDINT:
case execplan::CalpontSystemCatalog::TINYINT:
case execplan::CalpontSystemCatalog::SMALLINT:
val1 = dataconvert::DataConvert::intToDatetime(parm[0]->data()->getIntVal(row, isNull), &isDate1);
text = parm[0]->data()->getStrVal(row, isNull);
if (text.length() >= 14) // datetime has length at least 14
val1 = dataconvert::DataConvert::intToDatetime(parm[0]->data()->getIntVal(row, isNull), &isDate1);
else
{
val1 = dataconvert::DataConvert::intToTime(parm[0]->data()->getIntVal(row, isNull));
isTime1 = true;
}
break;
case execplan::CalpontSystemCatalog::DECIMAL:
@ -182,7 +201,14 @@ string Func_timediff::getStrVal(rowgroup::Row& row,
}
else
{
val1 = dataconvert::DataConvert::intToDatetime(parm[0]->data()->getIntVal(row, isNull), &isDate1);
text = parm[0]->data()->getStrVal(row, isNull);
if (text.length() >= 14) // datetime has length at least 14
val1 = dataconvert::DataConvert::intToDatetime(parm[0]->data()->getIntVal(row, isNull), &isDate1);
else
{
val1 = dataconvert::DataConvert::intToTime(parm[0]->data()->getIntVal(row, isNull));
isTime1 = true;
}
break;
}
@ -226,8 +252,19 @@ string Func_timediff::getStrVal(rowgroup::Row& row,
case execplan::CalpontSystemCatalog::CHAR:
case execplan::CalpontSystemCatalog::TEXT:
text = parm[1]->data()->getStrVal(row, isNull);
isTime2 = std::count(text.begin(), text.end(), '-') <= 1; // Time can have at most 1 dash (signifies negative)
val2 = dataconvert::DataConvert::stringToDatetime(text, &isDate2);
if (text.length() >= 14) // datetime has length at least 14
{
val2 = dataconvert::DataConvert::stringToDatetime(text, &isDate2);
}
else if (text.length() == 8 && text.find("-") == string::npos && text.find(":") == string::npos) // special case, this is exactly a date
{
val2 = dataconvert::DataConvert::intToDatetime(parm[1]->data()->getIntVal(row, isNull), &isDate2);
}
else
{
val2 = dataconvert::DataConvert::stringToTime(text);
isTime2 = true;
}
break;
case execplan::CalpontSystemCatalog::BIGINT:
@ -235,7 +272,14 @@ string Func_timediff::getStrVal(rowgroup::Row& row,
case execplan::CalpontSystemCatalog::MEDINT:
case execplan::CalpontSystemCatalog::TINYINT:
case execplan::CalpontSystemCatalog::SMALLINT:
val2 = dataconvert::DataConvert::intToDatetime(parm[1]->data()->getIntVal(row, isNull), &isDate2);
text = parm[1]->data()->getStrVal(row, isNull);
if (text.length() >= 14) // datetime has length at least 14
val2 = dataconvert::DataConvert::intToDatetime(parm[1]->data()->getIntVal(row, isNull), &isDate2);
else
{
val2 = dataconvert::DataConvert::intToTime(parm[1]->data()->getIntVal(row, isNull));
isTime2 = true;
}
break;
case execplan::CalpontSystemCatalog::DECIMAL:
@ -246,7 +290,14 @@ string Func_timediff::getStrVal(rowgroup::Row& row,
}
else
{
val2 = dataconvert::DataConvert::intToDatetime(parm[1]->data()->getIntVal(row, isNull), &isDate2);
text = parm[1]->data()->getStrVal(row, isNull);
if (text.length() >= 14) // datetime has length at least 14
val2 = dataconvert::DataConvert::intToDatetime(parm[1]->data()->getIntVal(row, isNull), &isDate2);
else
{
val2 = dataconvert::DataConvert::intToTime(parm[1]->data()->getIntVal(row, isNull));
isTime2 = true;
}
break;
}
@ -262,7 +313,7 @@ string Func_timediff::getStrVal(rowgroup::Row& row,
// both date format or both datetime format. Diff between time and datetime returns NULL in MariaDB
if ((isDate1 && isDate2) || ((!isDate1 && !isDate2) && (isTime1 == isTime2)))
return helpers::timediff( val1, val2);
return helpers::timediff( val1, val2, !isTime1);
isNull = true;
return "";