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-79 NULLIF() function returns incorrect values

Browse Source
This commit is contained in:
David Hall
2016-05-24 14:43:15 -05:00
parent e39acb55dc
commit 8ad31a0ef2
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
utils/funcexp/func_nullif.cpp
View File

@ -95,11 +95,14 @@ int64_t Func_nullif::getIntVal(rowgroup::Row& row,
if (parm[0]->data()->resultType().colDataType == if (parm[0]->data()->resultType().colDataType ==
execplan::CalpontSystemCatalog::DATETIME) execplan::CalpontSystemCatalog::DATETIME)
{ {
// If we're comparing to a datetime field, promote. // NULLIF arg0 is DATETIME, arg1 is DATE,
exp2 = parm[0]->data()->getDatetimeIntVal(row, isNull); // Upgrade arg1 to datetime
exp2 = parm[1]->data()->getDatetimeIntVal(row, isNull);
} }
else else
{ {
// NULLIF arg0 is not DATETIME (might be date), arg1 is not DATE
// Use arg1 as DATE
exp2 = parm[1]->data()->getDateIntVal(row, isNull); exp2 = parm[1]->data()->getDateIntVal(row, isNull);
} }
@ -117,6 +120,8 @@ int64_t Func_nullif::getIntVal(rowgroup::Row& row,
if (parm[0]->data()->resultType().colDataType == if (parm[0]->data()->resultType().colDataType ==
execplan::CalpontSystemCatalog::DATE) execplan::CalpontSystemCatalog::DATE)
{ {
// NULLIF arg0 is DATE, arg1 is DATETIME,
// Upgrade arg1 to datetime
// When comparing exp1 as a Date, we can't simply promote. We have // When comparing exp1 as a Date, we can't simply promote. We have
// to be careful of the return value in case of not null return. // to be careful of the return value in case of not null return.
int64_t exp1 = parm[0]->data()->getDatetimeIntVal(row, isNull); int64_t exp1 = parm[0]->data()->getDatetimeIntVal(row, isNull);