thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-21 01:00:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added Decimal support

Browse Source
This commit is contained in:
Maksim Kita 2020-11-12 14:27:02 +03:00
parent 476fb3b677
commit db5d0944ed
3 changed files with 60 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/Functions/FunctionsConversion.h
View File

@ -97,7 +97,7 @@ struct NameToUnixTimestamp { static constexpr auto name = "toUnixTimestamp"; };
struct AccurateAdditions
{
UInt32 scale;
UInt32 scale { 0 };
};
enum class ConvertStrategy
@ -181,18 +181,26 @@ struct ConvertImpl
{
if constexpr (IsDataTypeDecimal<FromDataType> || IsDataTypeDecimal<ToDataType>)
{
if constexpr (IsDataTypeDecimal<FromDataType> && IsDataTypeDecimal<ToDataType>)
vec_to[i] = convertDecimals<FromDataType, ToDataType>(vec_from[i], vec_from.getScale(), vec_to.getScale());
else if constexpr (IsDataTypeDecimal<FromDataType> && IsDataTypeNumber<ToDataType>)
vec_to[i] = convertFromDecimal<FromDataType, ToDataType>(vec_from[i], vec_from.getScale());
else if constexpr (IsDataTypeNumber<FromDataType> && IsDataTypeDecimal<ToDataType>)
vec_to[i] = convertToDecimal<FromDataType, ToDataType>(vec_from[i], vec_to.getScale());
else
try
{
if constexpr (IsDataTypeDecimal<FromDataType> && IsDataTypeDecimal<ToDataType>)
vec_to[i] = convertDecimals<FromDataType, ToDataType>(vec_from[i], vec_from.getScale(), vec_to.getScale());
else if constexpr (IsDataTypeDecimal<FromDataType> && IsDataTypeNumber<ToDataType>)
vec_to[i] = convertFromDecimal<FromDataType, ToDataType>(vec_from[i], vec_from.getScale());
else if constexpr (IsDataTypeNumber<FromDataType> && IsDataTypeDecimal<ToDataType>)
vec_to[i] = convertToDecimal<FromDataType, ToDataType>(vec_from[i], vec_to.getScale());
else
{
throw Exception("Unsupported data type in conversion function", ErrorCodes::CANNOT_CONVERT_TYPE);
}
}
catch (...)
{
/// Handle decimal overflow that propagated as exception
if constexpr (convert_strategy == ConvertStrategy::Accurate)
(*vec_null_map_to)[i] = true;
else
throw Exception("Unsupported data type in conversion function", ErrorCodes::CANNOT_CONVERT_TYPE);
throw;
}
}
else if constexpr (is_big_int_v<FromFieldType> || is_big_int_v<ToFieldType>)
@ -216,8 +224,8 @@ struct ConvertImpl
{
if constexpr (convert_strategy == ConvertStrategy::Accurate)
{
if (accurate::greaterOp(vec_from[i], std::numeric_limits<ToFieldType>::max()) ||
accurate::greaterOp(std::numeric_limits<ToFieldType>::min(), vec_from[i]))
if (accurate::greaterOp(vec_from[i], std::numeric_limits<ToFieldType>::max())
|| accurate::greaterOp(std::numeric_limits<ToFieldType>::min(), vec_from[i]))
{
(*vec_null_map_to)[i] = true;
continue;
@ -232,8 +240,8 @@ struct ConvertImpl
{
if constexpr (convert_strategy == ConvertStrategy::Accurate)
{
if (accurate::greaterOp(vec_from[i], std::numeric_limits<ToFieldType>::max()) ||
accurate::greaterOp(std::numeric_limits<ToFieldType>::min(), vec_from[i]))
if (accurate::greaterOp(vec_from[i], std::numeric_limits<ToFieldType>::max())
|| accurate::greaterOp(std::numeric_limits<ToFieldType>::min(), vec_from[i]))
{
(*vec_null_map_to)[i] = true;
continue;
@ -247,8 +255,8 @@ struct ConvertImpl
{
if constexpr (convert_strategy == ConvertStrategy::Accurate)
{
if (accurate::greaterOp(vec_from[i], std::numeric_limits<ToFieldType>::max()) ||
accurate::greaterOp(std::numeric_limits<ToFieldType>::min(), vec_from[i]))
if (accurate::greaterOp(vec_from[i], std::numeric_limits<ToFieldType>::max())
|| accurate::greaterOp(std::numeric_limits<ToFieldType>::min(), vec_from[i]))
{
(*vec_null_map_to)[i] = true;
continue;
@ -2104,7 +2112,7 @@ private:
}
template <typename ToDataType>
WrapperType createWrapper(const DataTypePtr & from_type, const ToDataType * const, bool requested_result_is_nullable) const
WrapperType createWrapper(const DataTypePtr & from_type, const ToDataType * const to_type, bool requested_result_is_nullable) const
{
TypeIndex from_type_index = from_type->getTypeId();
WhichDataType which(from_type_index);
@ -2122,9 +2130,12 @@ private:
FunctionPtr function = FunctionTo<ToDataType>::Type::create();
return createFunctionAdaptor(function, from_type);
}
return [from_type_index]
(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable *, size_t input_rows_count)
auto nullable_column_wrapper = createToNullableColumnWrapper();
bool is_accurate_cast = is_accurate_cast_or_null;
return [is_accurate_cast, nullable_column_wrapper, from_type_index, to_type]
(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable * column_nullable, size_t input_rows_count)
{
ColumnPtr result_column;
auto res = callOnIndexAndDataType<ToDataType>(from_type_index, [&](const auto & types) -> bool
@ -2145,8 +2156,14 @@ private:
/// Additionally check if callOnIndexAndDataType wasn't called at all.
if (!res)
{
// throw Exception{"Conversion from " + std::string(getTypeName(from_type)) + " to " + to_type->getName() +
// " is not supported", ErrorCodes::CANNOT_CONVERT_TYPE};
if (is_accurate_cast)
return nullable_column_wrapper(arguments, result_type, column_nullable, input_rows_count);
else
{
throw Exception{
"Conversion from " + std::string(getTypeName(from_type_index)) + " to " + to_type->getName() + " is not supported",
ErrorCodes::CANNOT_CONVERT_TYPE};
}
}
return result_column;
@ -2202,7 +2219,7 @@ private:
bool is_accurate_cast = is_accurate_cast_or_null;
return [is_accurate_cast, nullable_column_wrapper, type_index, scale, to_type]
(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable *columnNullable, size_t input_rows_count)
(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable *column_nullable, size_t input_rows_count)
{
ColumnPtr result_column;
auto res = callOnIndexAndDataType<ToDataType>(type_index, [&](const auto & types) -> bool
@ -2211,7 +2228,19 @@ private:
using LeftDataType = typename Types::LeftType;
using RightDataType = typename Types::RightType;
if constexpr (IsDataTypeDecimalOrNumber<LeftDataType> && IsDataTypeDecimalOrNumber<RightDataType>)
{
if (is_accurate_cast)
{
AccurateAdditions additions;
additions.scale = scale;
result_column = ConvertImpl<LeftDataType, RightDataType, NameCast>::execute(arguments, result_type, input_rows_count, additions);
return true;
}
}
result_column = ConvertImpl<LeftDataType, RightDataType, NameCast>::execute(arguments, result_type, input_rows_count, scale);
return true;
});
@ -2219,7 +2248,7 @@ private:
if (!res)
{
if (is_accurate_cast)
return nullable_column_wrapper(arguments, result_type, columnNullable, input_rows_count);
return nullable_column_wrapper(arguments, result_type, column_nullable, input_rows_count);
else
throw Exception{
"Conversion from " + std::string(getTypeName(type_index)) + " to " + to_type->getName() + " is not supported",

3
tests/queries/0_stateless/01556_accurate_cast_or_null.reference
View File

@ -15,3 +15,6 @@
5
\N
\N
1.000000000
\N
\N

7
tests/queries/0_stateless/01556_accurate_cast_or_null.sql
View File

@ -1,6 +1,6 @@
SELECT accurateCastOrNull(-1, 'UInt8');
SELECT accurateCastOrNull(5, 'UInt8');
SELECT accurateCastOrNull(257, 'Int8');
SELECT accurateCastOrNull(257, 'UInt8');
SELECT accurateCastOrNull(-1, 'UInt16');
SELECT accurateCastOrNull(5, 'UInt16');
SELECT accurateCastOrNull(65536, 'UInt16');
@ -12,9 +12,12 @@ SELECT accurateCastOrNull(5, 'UInt64');
SELECT accurateCastOrNull(-1, 'UInt256');
SELECT accurateCastOrNull(5, 'UInt256');
SELECT accurateCastOrNull(-129, 'Int8');
SELECT accurateCastOrNull(5, 'Int8');
SELECT accurateCastOrNull(128, 'Int8');
SELECT accurateCastOrNull(10, 'Decimal32(9)');
SELECT accurateCastOrNull(1, 'Decimal32(9)');
SELECT accurateCastOrNull(-10, 'Decimal32(9)');
SELECT accurateCastOrNull('123', 'FixedString(2)');