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

Quantiles: better [#METR-20381].

Browse Source
This commit is contained in:
Alexey Milovidov 2016-03-13 22:00:59 +03:00
parent 1203a0a9c4
commit d06a5906bf
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileExactWeighted.h
View File

@ -134,7 +134,7 @@ public:
std::sort(array, array + size, [](const Pair & a, const Pair & b) { return a.first < b.first; }); std::sort(array, array + size, [](const Pair & a, const Pair & b) { return a.first < b.first; });
UInt64 threshold = sum_weight * level; UInt64 threshold = std::ceil(sum_weight * level);
UInt64 accumulated = 0; UInt64 accumulated = 0;
const Pair * it = array; const Pair * it = array;
@ -267,7 +267,7 @@ public:
const Pair * end = array + size; const Pair * end = array + size;
size_t level_index = 0; size_t level_index = 0;
UInt64 threshold = sum_weight * levels.levels[levels.permutation[level_index]]; UInt64 threshold = std::ceil(sum_weight * levels.levels[levels.permutation[level_index]]);
while (it < end) while (it < end)
{ {
@ -281,7 +281,7 @@ public:
if (level_index == num_levels) if (level_index == num_levels)
return; return;
threshold = sum_weight * levels.levels[levels.permutation[level_index]]; threshold = std::ceil(sum_weight * levels.levels[levels.permutation[level_index]]);
} }
++it; ++it;

6
dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileTiming.h
View File

@ -402,7 +402,7 @@ namespace detail
/// Получить значение квантиля уровня level. Уровень должен быть от 0 до 1. /// Получить значение квантиля уровня level. Уровень должен быть от 0 до 1.
UInt16 get(double level) const UInt16 get(double level) const
{ {
UInt64 pos = count * level; UInt64 pos = std::ceil(count * level);
UInt64 accumulated = 0; UInt64 accumulated = 0;
Iterator it(*this); Iterator it(*this);
@ -428,7 +428,7 @@ namespace detail
const auto indices_end = indices + size; const auto indices_end = indices + size;
auto index = indices; auto index = indices;
UInt64 pos = count * levels[*index]; UInt64 pos = std::ceil(count * levels[*index]);
UInt64 accumulated = 0; UInt64 accumulated = 0;
Iterator it(*this); Iterator it(*this);
@ -445,7 +445,7 @@ namespace detail
if (index == indices_end) if (index == indices_end)
return; return;
pos = count * levels[*index]; pos = std::ceil(count * levels[*index]);
} }
it.next(); it.next();