thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 00:22:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

clickhouse: fixed crash on conversion of invalid dates (invalid dates now quietly produce invalid results) [#CONV-6318].

Browse Source
This commit is contained in:
Michael Kolupaev 2013-01-10 09:24:30 +00:00
parent af42c9a5cc
commit bf9d7c4127
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dbms/include/DB/Functions/FunctionsConversion.h
View File

@ -84,11 +84,13 @@ struct ConvertImpl<DataTypeDate, DataTypeDateTime, Name>
vec_to.resize(size);
for (size_t i = 0; i < size; ++i)
vec_to[i] = date_lut.fromDayNum(Yandex::DayNum_t(vec_from[i]));
{
vec_to[i] = date_lut.safeFromDayNum(Yandex::DayNum_t(vec_from[i]));
}
}
else if (const ColumnConst<FromFieldType> * col_from = dynamic_cast<const ColumnConst<FromFieldType> *>(&*block.getByPosition(arguments[0]).column))
{
block.getByPosition(result).column = new ColumnConst<ToFieldType>(col_from->size(), date_lut.fromDayNum(Yandex::DayNum_t(col_from->getData())));
block.getByPosition(result).column = new ColumnConst<ToFieldType>(col_from->size(), date_lut.safeFromDayNum(Yandex::DayNum_t(col_from->getData())));
}
else
throw Exception("Illegal column " + block.getByPosition(arguments[0]).column->getName()
@ -121,11 +123,11 @@ struct ConvertImpl<DataTypeDateTime, DataTypeDate, Name>
vec_to.resize(size);
for (size_t i = 0; i < size; ++i)
vec_to[i] = date_lut.toDayNum(vec_from[i]);
vec_to[i] = date_lut.safeToDayNum(vec_from[i]);
}
else if (const ColumnConst<FromFieldType> * col_from = dynamic_cast<const ColumnConst<FromFieldType> *>(&*block.getByPosition(arguments[0]).column))
{
block.getByPosition(result).column = new ColumnConst<ToFieldType>(col_from->size(), date_lut.toDayNum(col_from->getData()));
block.getByPosition(result).column = new ColumnConst<ToFieldType>(col_from->size(), date_lut.safeToDayNum(col_from->getData()));
}
else
throw Exception("Illegal column " + block.getByPosition(arguments[0]).column->getName()