From 3eb7ee8308f4944b97e263efe256a8ce5ff07af2 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Sun, 18 Sep 2022 10:35:25 +0200 Subject: [PATCH 1/2] Remove noise from build process --- contrib/krb5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/krb5 b/contrib/krb5 index d879821c7a4..b89e20367b0 160000 --- a/contrib/krb5 +++ b/contrib/krb5 @@ -1 +1 @@ -Subproject commit d879821c7a4c70b0c3ad739d9951d1a2b1903df7 +Subproject commit b89e20367b074bd02dd118a6534099b21e88b3c3 From f78d028177a5cb7f4765a62f23f9c6809c791303 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Mon, 19 Sep 2022 00:23:46 +0200 Subject: [PATCH 2/2] Fix clang-tidy --- .../AggregateFunctionCategoricalInformationValue.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.cpp b/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.cpp index 99ffc87e076..89ffdfa6109 100644 --- a/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.cpp +++ b/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.cpp @@ -35,12 +35,12 @@ private: using Counter = UInt64; size_t category_count; - Counter & counter(AggregateDataPtr __restrict place, size_t i, bool what) const + static Counter & counter(AggregateDataPtr __restrict place, size_t i, bool what) { return reinterpret_cast(place)[i * 2 + (what ? 1 : 0)]; } - const Counter & counter(ConstAggregateDataPtr __restrict place, size_t i, bool what) const + static const Counter & counter(ConstAggregateDataPtr __restrict place, size_t i, bool what) { return reinterpret_cast(place)[i * 2 + (what ? 1 : 0)]; }