Moved ParseAndFilterLatency into TFormatHandlerStatistic

Author: GrigoriyPA

ydb/core/fq/libs/row_dispatcher/events/topic_session_stats.h

@@ -33,11 +33,9 @@ struct TTopicSessionClientStatistic {
 
 struct TParserStatistic {
     TDuration ParserLatency;
-    TDuration ParseAndFilterLatency;
 
     void Add(const TParserStatistic& stat) {
         ParserLatency = stat.ParserLatency != TDuration::Zero() ? stat.ParserLatency : ParserLatency;
-        ParseAndFilterLatency = stat.ParseAndFilterLatency != TDuration::Zero() ? stat.ParseAndFilterLatency : ParseAndFilterLatency;
     }
 };
 
@@ -50,10 +48,14 @@ struct TFiltersStatistic {
 };
 
 struct TFormatHandlerStatistic {
+    TDuration ParseAndFilterLatency;
+
     TParserStatistic ParserStats;
     TFiltersStatistic FilterStats;
 
     void Add(const TFormatHandlerStatistic& stat) {
+        ParseAndFilterLatency = stat.ParseAndFilterLatency != TDuration::Zero() ? stat.ParseAndFilterLatency : ParseAndFilterLatency;
+
         ParserStats.Add(stat.ParserStats);
         FilterStats.Add(stat.FilterStats);
     }

ydb/core/fq/libs/row_dispatcher/format_handler/format_handler.cpp

@@ -426,7 +426,7 @@ class TTopicFormatHandler : public NActors::TActor<TTopicFormatHandler>, public
     TFormatHandlerStatistic GetStatistics() override {
         TFormatHandlerStatistic statistics;
         if (Parser) {
-            statistics.ParserStats = Parser->GetStatistics();
+            Parser->FillStatistics(statistics);
         }
         if (Filters) {
             statistics.FilterStats = Filters->GetStatistics();

ydb/core/fq/libs/row_dispatcher/format_handler/parsers/parser_abstract.h

@@ -31,7 +31,7 @@ class ITopicParser : public TThrRefBase, public TNonCopyable {
     virtual const TVector<ui64>& GetOffsets() const = 0;
     virtual TValueStatus<const TVector<NYql::NUdf::TUnboxedValue>*> GetParsedColumn(ui64 columnId) const = 0;
 
-    virtual TParserStatistic GetStatistics() = 0;
+    virtual void FillStatistics(TFormatHandlerStatistic& statistic) = 0;
 };
 
 }  // namespace NFq::NRowDispatcher

ydb/core/fq/libs/row_dispatcher/format_handler/parsers/parser_base.cpp

@@ -66,13 +66,11 @@ void TTopicParserBase::Refresh(bool force) {
     Y_UNUSED(force);
 }
 
-TParserStatistic TTopicParserBase::GetStatistics() {
-    TParserStatistic statistics;
-    statistics.ParserLatency = Stats.ParserLatency;
-    statistics.ParseAndFilterLatency = Stats.ParseAndFilterLatency;
-    Stats.Clear();
+void TTopicParserBase::FillStatistics(TFormatHandlerStatistic& statistic) {
+    statistic.ParseAndFilterLatency = Stats.ParseAndFilterLatency;
+    statistic.ParserStats.ParserLatency = Stats.ParserLatency;
 
-    return statistics;
+    Stats.Clear();
 }
 
 void TTopicParserBase::ParseBuffer() {

ydb/core/fq/libs/row_dispatcher/format_handler/parsers/parser_base.h

@@ -41,7 +41,7 @@ class TTopicParserBase : public ITopicParser, public TTypeParser {
 
 public:
     virtual void Refresh(bool force = false) override;
-    virtual TParserStatistic GetStatistics() override;
+    virtual void FillStatistics(TFormatHandlerStatistic& statistic) override;
 
 protected:
     // Called with binded alloc

ydb/core/fq/libs/row_dispatcher/row_dispatcher.cpp

@@ -673,7 +673,7 @@ TString TRowDispatcher::GetInternalState() {
 
             for (const auto& [formatName, formatStats] : sessionInfo.Stat.FormatHandlers) {
                 str << "    " << formatName 
-                    << " parse and filter lantecy  " << formatStats.ParserStats.ParseAndFilterLatency
+                    << " parse and filter lantecy  " << formatStats.ParseAndFilterLatency
                     << " (parse " << formatStats.ParserStats.ParserLatency << ", filter " << formatStats.FilterStats.FilterLatency << ")\n";
             }