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

Merge pull request #9636 from azat/fix-sum-remote

Browse Source 
Fix various sum*() functions via remote() usage (incorrect function name)
This commit is contained in:
alexey-milovidov 2020-03-15 01:00:39 +03:00 committed by GitHub
commit 3ef1d40b97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dbms/src/AggregateFunctions/AggregateFunctionSum.cpp
View File

@ -21,7 +21,7 @@ struct SumSimple
/// @note It uses slow Decimal128 (cause we need such a variant). sumWithOverflow is faster for Decimal32/64 /// @note It uses slow Decimal128 (cause we need such a variant). sumWithOverflow is faster for Decimal32/64
using ResultType = std::conditional_t<IsDecimalNumber<T>, Decimal128, NearestFieldType<T>>; using ResultType = std::conditional_t<IsDecimalNumber<T>, Decimal128, NearestFieldType<T>>;
using AggregateDataType = AggregateFunctionSumData<ResultType>; using AggregateDataType = AggregateFunctionSumData<ResultType>;
using Function = AggregateFunctionSum<T, ResultType, AggregateDataType>; using Function = AggregateFunctionSum<T, ResultType, AggregateDataType, AggregateFunctionTypeSum>;
}; };
template <typename T> template <typename T>
@ -29,7 +29,7 @@ struct SumSameType
{ {
using ResultType = T; using ResultType = T;
using AggregateDataType = AggregateFunctionSumData<ResultType>; using AggregateDataType = AggregateFunctionSumData<ResultType>;
using Function = AggregateFunctionSum<T, ResultType, AggregateDataType>; using Function = AggregateFunctionSum<T, ResultType, AggregateDataType, AggregateFunctionTypeSumWithOverflow>;
}; };
template <typename T> template <typename T>
@ -37,7 +37,7 @@ struct SumKahan
{ {
using ResultType = Float64; using ResultType = Float64;
using AggregateDataType = AggregateFunctionSumKahanData<ResultType>; using AggregateDataType = AggregateFunctionSumKahanData<ResultType>;
using Function = AggregateFunctionSum<T, ResultType, AggregateDataType>; using Function = AggregateFunctionSum<T, ResultType, AggregateDataType, AggregateFunctionTypeSumKahan>;
}; };
template <typename T> using AggregateFunctionSumSimple = typename SumSimple<T>::Function; template <typename T> using AggregateFunctionSumSimple = typename SumSimple<T>::Function;

25
dbms/src/AggregateFunctions/AggregateFunctionSum.h
View File

@ -91,24 +91,39 @@ struct AggregateFunctionSumKahanData
}; };
enum AggregateFunctionSumType
{
AggregateFunctionTypeSum,
AggregateFunctionTypeSumWithOverflow,
AggregateFunctionTypeSumKahan,
};
/// Counts the sum of the numbers. /// Counts the sum of the numbers.
template <typename T, typename TResult, typename Data> template <typename T, typename TResult, typename Data, AggregateFunctionSumType Type>
class AggregateFunctionSum final : public IAggregateFunctionDataHelper<Data, AggregateFunctionSum<T, TResult, Data>> class AggregateFunctionSum final : public IAggregateFunctionDataHelper<Data, AggregateFunctionSum<T, TResult, Data, Type>>
{ {
public: public:
using ResultDataType = std::conditional_t<IsDecimalNumber<T>, DataTypeDecimal<TResult>, DataTypeNumber<TResult>>; using ResultDataType = std::conditional_t<IsDecimalNumber<T>, DataTypeDecimal<TResult>, DataTypeNumber<TResult>>;
using ColVecType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>; using ColVecType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
using ColVecResult = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<TResult>, ColumnVector<TResult>>; using ColVecResult = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<TResult>, ColumnVector<TResult>>;
String getName() const override { return "sum"; } String getName() const override
{
if constexpr (Type == AggregateFunctionTypeSum)
return "sum";
else if constexpr (Type == AggregateFunctionTypeSumWithOverflow)
return "sumWithOverflow";
else if constexpr (Type == AggregateFunctionTypeSumKahan)
return "sumKahan";
__builtin_unreachable();
}
AggregateFunctionSum(const DataTypes & argument_types_) AggregateFunctionSum(const DataTypes & argument_types_)
: IAggregateFunctionDataHelper<Data, AggregateFunctionSum<T, TResult, Data>>(argument_types_, {}) : IAggregateFunctionDataHelper<Data, AggregateFunctionSum<T, TResult, Data, Type>>(argument_types_, {})
, scale(0) , scale(0)
{} {}
AggregateFunctionSum(const IDataType & data_type, const DataTypes & argument_types_) AggregateFunctionSum(const IDataType & data_type, const DataTypes & argument_types_)
: IAggregateFunctionDataHelper<Data, AggregateFunctionSum<T, TResult, Data>>(argument_types_, {}) : IAggregateFunctionDataHelper<Data, AggregateFunctionSum<T, TResult, Data, Type>>(argument_types_, {})
, scale(getDecimalScale(data_type)) , scale(getDecimalScale(data_type))
{} {}

3
dbms/tests/queries/0_stateless/01098_sum.reference Normal file
View File

@ -0,0 +1,3 @@
0
0
0

3
dbms/tests/queries/0_stateless/01098_sum.sql Normal file
View File

@ -0,0 +1,3 @@
select sumKahan(dummy) from remote('127.{2,3}', system.one);
select sumWithOverflow(dummy) from remote('127.{2,3}', system.one);
select sum(dummy) from remote('127.{2,3}', system.one);