review fixes

Author: ztlpn

ydb/core/protos/statistics.proto

@@ -201,6 +201,5 @@ message TEvAggregateStatisticsResponse {
 
 message TSimpleColumnStatistics {
     optional uint64 Count = 1;
-    optional uint64 CountNonNull = 2;
-    optional uint64 CountDistinct = 3;
+    optional uint64 CountDistinct = 2;
 };

ydb/core/statistics/aggregator/select_builder.cpp

@@ -16,10 +16,9 @@ ui32 TSelectBuilder::AddBuiltinAggregation(std::optional<TString> columnName, TS
     return Columns.back().Seq;
 }
 
-ui32 TSelectBuilder::AddFactory(const TStringBuf& udafName) {
-    // TODO: check UDAF existence, determine paramcount
+ui32 TSelectBuilder::AddFactory(const TStringBuf& udafName, size_t paramCount) {
+    // TODO: check UDAF existence, validate paramcount
     ui32 curId = Udaf2Factory.size();
-    size_t paramCount = 2;
     auto [it, emplaced] = Udaf2Factory.try_emplace(udafName, curId, udafName, paramCount);
     return it->second.Id;
 }

ydb/core/statistics/aggregator/select_builder.h

@@ -21,7 +21,7 @@ class TSelectBuilder {
     }
 
 private:
-    ui32 AddFactory(const TStringBuf& udafName);
+    ui32 AddFactory(const TStringBuf& udafName, size_t paramCount);
 
 private:
     struct TFactory {
@@ -49,7 +49,7 @@ class TSelectBuilder {
 
 template<typename... TArgs>
 ui32 TSelectBuilder::AddUDAFAggregation(TString columnName, const TStringBuf& udafName, TArgs&&... params) {
-    auto factory = AddFactory(udafName);
+    auto factory = AddFactory(udafName, sizeof...(params));
 
     // TODO: parameters escaping/binding
     TString paramsStr = Join(',', params...);