thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-04 05:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

some other changes to deduction guides

Browse Source
This commit is contained in:
myrrc 2020-10-22 19:32:06 +03:00
parent 2a589d7c15
commit f18232739b
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/AggregateFunctions/AggregateFunctionAvgWeighted.h
View File

@ -8,24 +8,26 @@ namespace DB
template <class Values, class Weights> template <class Values, class Weights>
struct AvgWeightedFunctionTypesDeduction struct AvgWeightedFunctionTypesDeduction
{ {
template <class T> struct NextAvgType { using Type = T; }; template <class> struct NextAvgType { };
template <> struct NextAvgType<Int8> { using Type = Int16; }; template <> struct NextAvgType<Int8> { using Type = Int16; };
template <> struct NextAvgType<Int16> { using Type = Int32; }; template <> struct NextAvgType<Int16> { using Type = Int32; };
template <> struct NextAvgType<Int32> { using Type = Int64; }; template <> struct NextAvgType<Int32> { using Type = Int64; };
template <> struct NextAvgType<Int64> { using Type = Int128; }; template <> struct NextAvgType<Int64> { using Type = Int128; };
template <> struct NextAvgType<Int128> { using Type = Int256; };
template <> struct NextAvgType<Int256> { using Type = Int256; };
template <> struct NextAvgType<UInt8> { using Type = UInt16; }; template <> struct NextAvgType<UInt8> { using Type = UInt16; };
template <> struct NextAvgType<UInt16> { using Type = UInt32; }; template <> struct NextAvgType<UInt16> { using Type = UInt32; };
template <> struct NextAvgType<UInt32> { using Type = UInt64; }; template <> struct NextAvgType<UInt32> { using Type = UInt64; };
template <> struct NextAvgType<UInt64> { using Type = UInt128; }; template <> struct NextAvgType<UInt64> { using Type = UInt128; };
template <> struct NextAvgType<UInt128> { using Type = UInt256; };
template <> struct NextAvgType<UInt256> { using Type = UInt256; }; // Promoted to Float as these types don't go well when operating with above ones
template <> struct NextAvgType<UInt128> { using Type = Float64; };
template <> struct NextAvgType<UInt256> { using Type = Float64; };
template <> struct NextAvgType<Int128> { using Type = Float64; };
template <> struct NextAvgType<Int256> { using Type = Float64; };
template <> struct NextAvgType<Decimal32> { using Type = Decimal128; }; template <> struct NextAvgType<Decimal32> { using Type = Decimal128; };
template <> struct NextAvgType<Decimal64> { using Type = Decimal128; }; template <> struct NextAvgType<Decimal64> { using Type = Decimal128; };
template <> struct NextAvgType<Decimal128> { using Type = Decimal256; }; template <> struct NextAvgType<Decimal128> { using Type = Decimal128; };
template <> struct NextAvgType<Decimal256> { using Type = Decimal256; }; template <> struct NextAvgType<Decimal256> { using Type = Decimal256; };
template <> struct NextAvgType<Float32> { using Type = Float64; }; template <> struct NextAvgType<Float32> { using Type = Float64; };
@ -43,11 +45,11 @@ struct AvgWeightedFunctionTypesDeduction
static constexpr bool BothDecimal = UDecimal && VDecimal; static constexpr bool BothDecimal = UDecimal && VDecimal;
static constexpr bool NoneDecimal = !UDecimal && !VDecimal; static constexpr bool NoneDecimal = !UDecimal && !VDecimal;
template <class T>
static constexpr bool IsIntegral = std::is_integral_v<T>;
/// we do not include extended integral types here as they produce errors while diving on Decimals. /// we do not include extended integral types here as they produce errors while diving on Decimals.
/// || std::is_same_v<T, Int128> || std::is_same_v<T, Int256> template <class T> static constexpr bool IsIntegral = std::is_integral_v<T>;
/// || std::is_same_v<T, UInt128> || std::is_same_v<T, UInt256>; template <class T> static constexpr bool IsExtendedIntegral =
std::is_same_v<T, Int128> || std::is_same_v<T, Int256>
|| std::is_same_v<T, UInt128> || std::is_same_v<T, UInt256>;
static constexpr bool BothOrNoneDecimal = BothDecimal || NoneDecimal; static constexpr bool BothOrNoneDecimal = BothDecimal || NoneDecimal;
@ -80,8 +82,11 @@ struct AvgWeightedFunctionTypesDeduction
* *
* When the denominator only is Decimal, it will be casted to Float64 as integral / Decimal produces a compile * When the denominator only is Decimal, it will be casted to Float64 as integral / Decimal produces a compile
* time error. * time error.
*
* Extended integer types can't be multiplied by doubles (I don't know, why), so we also convert them to
* double.
*/ */
using Denom = std::conditional_t<VDecimal && !UDecimal, using Denom = std::conditional_t<(VDecimal && !UDecimal) || IsExtendedIntegral<V>,
Float64, Float64,
NextAvgTypeT<V>>; NextAvgTypeT<V>>;
}; };
@ -123,10 +128,13 @@ public:
const auto & values = static_cast<const DecimalOrVectorCol<Values> &>(*columns[0]); const auto & values = static_cast<const DecimalOrVectorCol<Values> &>(*columns[0]);
const auto & weights = static_cast<const DecimalOrVectorCol<Weights> &>(*columns[1]); const auto & weights = static_cast<const DecimalOrVectorCol<Weights> &>(*columns[1]);
const auto value = values.getData()[row_num]; using Numerator = typename Base::Numerator;
const auto weight = weights.getData()[row_num]; using Denominator = typename Base::Denominator;
this->data(place).numerator += static_cast<typename Base::Numerator>(value) * weight; const Numerator value = Numerator(values.getData()[row_num]);
const Denominator weight = Denominator(weights.getData()[row_num]);
this->data(place).numerator += value * weight;
this->data(place).denominator += weight; this->data(place).denominator += weight;
} }