From c45aa180e8471931709544c93a11662d84ca27e6 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Thu, 5 Jul 2018 02:24:36 +0300 Subject: [PATCH] Reviewing #2521 --- .../AggregateFunctionHistogram.cpp | 15 +++++++++------ .../AggregateFunctionHistogram.h | 3 ++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dbms/src/AggregateFunctions/AggregateFunctionHistogram.cpp b/dbms/src/AggregateFunctions/AggregateFunctionHistogram.cpp index 79ad325b419..f224abf0903 100644 --- a/dbms/src/AggregateFunctions/AggregateFunctionHistogram.cpp +++ b/dbms/src/AggregateFunctions/AggregateFunctionHistogram.cpp @@ -1,11 +1,13 @@ -#include "AggregateFunctionHistogram.h" -#include "AggregateFunctionFactory.h" -#include "FactoryHelpers.h" -#include "Helpers.h" +#include +#include +#include +#include #include -namespace DB { + +namespace DB +{ namespace ErrorCodes { @@ -14,7 +16,8 @@ namespace ErrorCodes extern const int BAD_ARGUMENTS; } -namespace { +namespace +{ AggregateFunctionPtr createAggregateFunctionHistogram(const std::string & name, const DataTypes & arguments, const Array & params) { diff --git a/dbms/src/AggregateFunctions/AggregateFunctionHistogram.h b/dbms/src/AggregateFunctions/AggregateFunctionHistogram.h index abd6ae3c59c..694e2cf3791 100644 --- a/dbms/src/AggregateFunctions/AggregateFunctionHistogram.h +++ b/dbms/src/AggregateFunctions/AggregateFunctionHistogram.h @@ -185,7 +185,8 @@ private: public: void insertResultInto(ColumnVector & to_lower, ColumnVector & to_upper, ColumnVector & to_weights, UInt32 max_bins) { - if (!points) return; + if (!points) + return; compress(max_bins); unique();