From 9296ef50089b8427734f8a9b0e59b6ba98b2b0d0 Mon Sep 17 00:00:00 2001 From: Ivan Lezhankin Date: Tue, 23 Oct 2018 17:59:24 +0300 Subject: [PATCH] Temporarily disable precalculated bias estimations for precisions other than 17. --- dbms/scripts/gen-bias-data.py | 2 +- .../AggregateFunctionUniqCombined.h | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dbms/scripts/gen-bias-data.py b/dbms/scripts/gen-bias-data.py index 7edc9948e76..034cfcca7dd 100755 --- a/dbms/scripts/gen-bias-data.py +++ b/dbms/scripts/gen-bias-data.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.4 +#!/usr/bin/python3 # -*- coding: utf-8 -*- import sys diff --git a/dbms/src/AggregateFunctions/AggregateFunctionUniqCombined.h b/dbms/src/AggregateFunctions/AggregateFunctionUniqCombined.h index 1e855cb8f5f..fac220b7bbb 100644 --- a/dbms/src/AggregateFunctions/AggregateFunctionUniqCombined.h +++ b/dbms/src/AggregateFunctions/AggregateFunctionUniqCombined.h @@ -68,12 +68,20 @@ namespace detail template struct AggregateFunctionUniqCombinedDataWithKey +{ + using Set = CombinedCardinalityEstimator>, 16, K - 3, K, TrivialHash, Key>; + + Set set; +}; + +template +struct AggregateFunctionUniqCombinedDataWithKey { using Set = CombinedCardinalityEstimator>, 16, - K - 3, - K, + 14, + 17, TrivialHash, Key, HyperLogLogBiasEstimator,