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

dbms: fixed error with division [#CONV-2944].

Browse Source
This commit is contained in:
Alexey Milovidov 2013-02-16 21:23:55 +00:00
parent 7b790fb2a8
commit 4b1888ecf3
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/include/DB/Core/ErrorCodes.h
View File

@ -159,7 +159,7 @@ namespace ErrorCodes
NO_ATTRIBUTES_LISTED,
INDEX_OF_COLUMN_IN_SORT_CLAUSE_IS_OUT_OF_RANGE,
UNKNOWN_DIRECTION_OF_SORTING,
DIVISION_BY_ZERO,
ILLEGAL_DIVISION,
AGGREGATE_FUNCTION_NOT_APPLICABLE,
UNKNOWN_RELATION,
DICTIONARIES_WAS_NOT_LOADED,

18
dbms/include/DB/Functions/FunctionsArithmetic.h
View File

@ -112,11 +112,17 @@ struct DivideFloatingImpl
};
template <typename T>
inline void throwIfZero(T x)
template <typename A, typename B>
inline void throwIfDivisionLeadsToFPE(A a, B b)
{
if (unlikely(x == 0))
throw Exception("Division by zero", ErrorCodes::DIVISION_BY_ZERO);
/// Возможно, лучше вместо проверок использовать siglongjmp?
if (unlikely(b == 0))
throw Exception("Division by zero", ErrorCodes::ILLEGAL_DIVISION);
/// http://avva.livejournal.com/2548306.html
if (unlikely(std::tr1::is_signed<A>::value && std::tr1::is_signed<B>::value && a == std::numeric_limits<A>::min() && b == -1))
throw Exception("Division of minimal signed number by minus one", ErrorCodes::ILLEGAL_DIVISION);
}
template<typename A, typename B>
@ -126,7 +132,7 @@ struct DivideIntegralImpl
static inline ResultType apply(A a, B b)
{
throwIfZero(b);
throwIfDivisionLeadsToFPE(a, b);
return static_cast<ResultType>(a) / b;
}
};
@ -138,7 +144,7 @@ struct ModuloImpl
static inline ResultType apply(A a, B b)
{
throwIfZero(typename NumberTraits::ToInteger<A>::Type(b));
throwIfDivisionLeadsToFPE(typename NumberTraits::ToInteger<A>::Type(a), typename NumberTraits::ToInteger<A>::Type(b));
return typename NumberTraits::ToInteger<A>::Type(a)
% typename NumberTraits::ToInteger<A>::Type(b);
}