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

dbms: Server: refactoring. [#METR-16188]

Browse Source
This commit is contained in:
Alexey Arno 2015-05-20 15:04:33 +03:00
parent 758add05b4
commit 3658260d63
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dbms/include/DB/AggregateFunctions/AggregateFunctionsStatistics.h
View File

@ -170,7 +170,7 @@ struct VarSampImpl
static inline Float64 apply(Float64 m2, UInt64 count)
{
if (count < 2)
return 0.0;
return std::numeric_limits<Float64>::infinity();
else
return m2 / (count - 1);
}
@ -196,7 +196,9 @@ struct VarPopImpl
static inline Float64 apply(Float64 m2, UInt64 count)
{
if (count < 2)
if (count == 0)
return std::numeric_limits<Float64>::infinity();
else if (count == 1)
return 0.0;
else
return m2 / count;
@ -217,11 +219,13 @@ struct StdDevPopImpl
}
/** Если флаг compute_marginal_moments установлен, этот класс предоставялет наследнику
* CovarianceData поддержку маргинальных моментов для вычисления корреляции.
*/
template<bool compute_marginal_moments>
class BaseCovarianceData
{
protected:
BaseCovarianceData() = default;
virtual ~BaseCovarianceData() = default;
void incrementMarginalMoments(Float64 left_incr, Float64 right_incr) {}
void mergeWith(const BaseCovarianceData & source) {}
@ -233,7 +237,6 @@ template<>
class BaseCovarianceData<true>
{
protected:
BaseCovarianceData() = default;
virtual ~BaseCovarianceData() = default;
void incrementMarginalMoments(Float64 left_incr, Float64 right_incr)
@ -277,8 +280,6 @@ private:
using Base = BaseCovarianceData<compute_marginal_moments>;
public:
CovarianceData() = default;
void update(const IColumn & column_left, const IColumn & column_right, size_t row_num)
{
T left_received = static_cast<const ColumnVector<T> &>(column_left).getData()[row_num];