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

Fix decimal to date/datetime casting

Browse Source
This commit is contained in:
Andrew Hutchings
2016-09-27 17:31:05 +01:00
parent 55844a0f0b
commit 54fcfb20c5
2 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
utils/dataconvert/dataconvert.cpp
View File

@@ -1805,6 +1805,14 @@ int64_t DataConvert::intToDate(int64_t data)
//snprintf( buf, 10, "%llu", (long long unsigned int)data); //snprintf( buf, 10, "%llu", (long long unsigned int)data);
//string date = buf; //string date = buf;
char buf[21] = {0}; char buf[21] = {0};
Date aday;
if (data == 0)
{
aday.year = 0;
aday.month = 0;
aday.day = 0;
return *(reinterpret_cast<uint32_t*>(&aday));
}
snprintf( buf, 15, "%llu", (long long unsigned int)data); snprintf( buf, 15, "%llu", (long long unsigned int)data);
string year, month, day, hour, min, sec, msec; string year, month, day, hour, min, sec, msec;
@@ -1866,7 +1874,6 @@ int64_t DataConvert::intToDate(int64_t data)
default: default:
return -1; return -1;
} }
Date aday;
if (year.empty()) if (year.empty())
{ {
// MMDD format. assume current year // MMDD format. assume current year

31
utils/funcexp/func_cast.cpp
View File

@@ -510,20 +510,12 @@ int32_t Func_cast_date::getDateIntVal(rowgroup::Row& row,
case execplan::CalpontSystemCatalog::DECIMAL: case execplan::CalpontSystemCatalog::DECIMAL:
case execplan::CalpontSystemCatalog::UDECIMAL: case execplan::CalpontSystemCatalog::UDECIMAL:
{ {
if (parm[0]->data()->resultType().scale != 0) val = dataconvert::DataConvert::intToDate(parm[0]->data()->getIntVal(row, isNull));
{ if (val == -1)
isNull = true; isNull = true;
break;
}
else else
{ return val;
val = dataconvert::DataConvert::intToDate(parm[0]->data()->getIntVal(row, isNull)); break;
if (val == -1)
isNull = true;
else
return val;
break;
}
} }
case execplan::CalpontSystemCatalog::VARCHAR: case execplan::CalpontSystemCatalog::VARCHAR:
case execplan::CalpontSystemCatalog::CHAR: case execplan::CalpontSystemCatalog::CHAR:
@@ -715,18 +707,11 @@ int64_t Func_cast_datetime::getDatetimeIntVal(rowgroup::Row& row,
case execplan::CalpontSystemCatalog::DECIMAL: case execplan::CalpontSystemCatalog::DECIMAL:
case execplan::CalpontSystemCatalog::UDECIMAL: case execplan::CalpontSystemCatalog::UDECIMAL:
{ {
if (parm[0]->data()->resultType().scale) val = dataconvert::DataConvert::intToDatetime(parm[0]->data()->getIntVal(row, isNull));
{ if (val == -1)
val = dataconvert::DataConvert::intToDatetime(parm[0]->data()->getIntVal(row, isNull));
if (val == -1)
isNull = true;
else
return val;
}
else
{
isNull = true; isNull = true;
} else
return val;
break; break;
} }
case execplan::CalpontSystemCatalog::VARCHAR: case execplan::CalpontSystemCatalog::VARCHAR: