reorganize scan counter (wip: need to fix compilation)

Author: swalrus1

ydb/core/tx/columnshard/columnshard.cpp

@@ -160,18 +160,12 @@ void TColumnShard::Handle(TEvPrivate::TEvReadFinished::TPtr& ev, const TActorCon
     InFlightReadsTracker.RemoveInFlightRequest(ev->Get()->RequestCookie, index);
 
     ui64 txId = ev->Get()->TxId;
-    bool success = ev->Get()->Success;
     if (ScanTxInFlight.contains(txId)) {
         TDuration duration = TAppData::TimeProvider->Now() - ScanTxInFlight[txId];
         Stats.GetTabletCounters().IncCounter(COUNTER_SCAN_LATENCY, duration);
         ScanTxInFlight.erase(txId);
         Stats.GetTabletCounters().SetCounter(COUNTER_SCAN_IN_FLY, ScanTxInFlight.size());
         Stats.GetTabletCounters().IncCounter(COUNTER_IMMEDIATE_TX_COMPLETED);
-        if (success) {
-            Stats.GetTabletCounters().IncCounter(COUNTER_READ_SUCCESS);
-        } else {
-            Stats.GetTabletCounters().IncCounter(COUNTER_READ_FAIL);
-        }
     }
 }
 
@@ -333,8 +327,8 @@ void TColumnShard::FillOlapStats(
     statsBuilder.FillColumnTableStats(Stats.GetColumnTableCounters());
     statsBuilder.FillTabletStats(Stats.GetTabletCounters());
     statsBuilder.FillBackgroundControllerStats(Stats.GetBackgroundControllerCounters());
+    statsBuilder.FillScanCountersStats(Stats.GetScanCounters());
     statsBuilder.FillExecutorStats(*Executor());
-    statsBuilder.FillTxCompleteLag(GetTxCompleteLag());
     if (TablesManager.HasPrimaryIndex()) {
         statsBuilder.FillColumnEngineStats(TablesManager.MutablePrimaryIndex().GetTotalStats());
     }
@@ -366,8 +360,8 @@ void TColumnShard::FillColumnTableStats(
         statsBuilder.FillColumnTableStats(Stats.GetColumnTableCounters().GetPathIdCounter(pathId));
         statsBuilder.FillTabletStats(Stats.GetTabletCounters());
         statsBuilder.FillBackgroundControllerStats(Stats.GetBackgroundControllerCounters(), pathId);
+        statsBuilder.FillScanCountersStats(Stats.GetScanCounters());
         statsBuilder.FillExecutorStats(*Executor());
-        statsBuilder.FillTxCompleteLag(GetTxCompleteLag());
         if (TablesManager.HasPrimaryIndex()) {
             auto columnEngineStats = TablesManager.GetPrimaryIndexSafe().GetStats().FindPtr(pathId);
             if (columnEngineStats && *columnEngineStats) {

ydb/core/tx/columnshard/columnshard_private_events.h

@@ -141,13 +141,13 @@ struct TEvPrivate {
     };
 
     struct TEvReadFinished : public TEventLocal<TEvReadFinished, EvReadFinished> {
-        explicit TEvReadFinished(ui64 requestCookie, ui64 txId, bool success)
-            : RequestCookie(requestCookie), TxId(txId), Success(success)
-        {}
+        explicit TEvReadFinished(ui64 requestCookie, ui64 txId)
+            : RequestCookie(requestCookie)
+            , TxId(txId) {
+        }
 
         ui64 RequestCookie;
         ui64 TxId;
-        bool Success;
     };
 
     struct TEvPeriodicWakeup : public TEventLocal<TEvPeriodicWakeup, EvPeriodicWakeup> {

ydb/core/tx/columnshard/counters/aggregation/table_stats.cpp

@@ -22,15 +22,15 @@ void TTableStatsBuilder::FillBackgroundControllerStats(const TBackgroundControll
     stats.FillTotalStats(TableStats);
 }
 
+void TTableStatsBuilder::FillScanCountersStats(const TScanCounters& stats) {
+    stats.FillStats(TableStats);
+}
+
 void TTableStatsBuilder::FillExecutorStats(const NTabletFlatExecutor::NFlatExecutorSetup::IExecutor& executor) {
     TableStats.SetInFlightTxCount(executor.GetStats().TxInFly);
     TableStats.SetHasLoanedParts(executor.HasLoanedParts());
 }
 
-void TTableStatsBuilder::FillTxCompleteLag(TDuration txCompleteLag) {
-    TableStats.SetTxCompleteLagMsec(txCompleteLag.MilliSeconds());
-}
-
 void TTableStatsBuilder::FillColumnEngineStats(const NOlap::TColumnEngineStats& stats) {
     auto activeStats = stats.Active(); // data stats excluding inactive and evicted
     TableStats.SetRowCount(activeStats.Rows);

ydb/core/tx/columnshard/counters/aggregation/table_stats.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <ydb/core/tx/columnshard/counters/scan.h>
 #include <ydb/core/tablet_flat/tablet_flat_executor.h>
 #include <ydb/core/tx/columnshard/counters/column_tables.h>
 #include <ydb/core/tx/columnshard/counters/tablet_counters.h>
@@ -26,9 +27,9 @@ class TTableStatsBuilder {
     void FillBackgroundControllerStats(const TBackgroundControllerCounters& stats, ui64 pathId);
     void FillBackgroundControllerStats(const TBackgroundControllerCounters& stats);
 
-    void FillExecutorStats(const NTabletFlatExecutor::NFlatExecutorSetup::IExecutor& executor);
+    void FillScanCountersStats(const TScanCounters& stats);
 
-    void FillTxCompleteLag(TDuration txCompleteLag);
+    void FillExecutorStats(const NTabletFlatExecutor::NFlatExecutorSetup::IExecutor& executor);
 
     void FillColumnEngineStats(const NOlap::TColumnEngineStats& stats);
 };

ydb/core/tx/columnshard/counters/scan.cpp

@@ -88,12 +88,14 @@ TScanCounters::TScanCounters(const TString& module)
     ScanIntervalState = std::make_shared<TScanIntervalState>(*this);
     ResourcesSubscriberCounters = std::make_shared<NOlap::NResourceBroker::NSubscribe::TSubscriberCounters>();
     ScanDurationByStatus.resize((ui32)EStatusFinish::COUNT);
+    ScansFinishedByStatus.resize((ui32)EStatusFinish::COUNT);
     ui32 idx = 0;
     for (auto&& i : GetEnumAllValues<EStatusFinish>()) {
         if (i == EStatusFinish::COUNT) {
             continue;
         }
         ScanDurationByStatus[(ui32)i] = TBase::GetHistogram("ScanDuration/" + ::ToString(i) + "/Milliseconds", NMonitoring::ExponentialHistogram(18, 2, 1));
+        ScansFinishedByStatus[(ui32)i] = TBase::GetDeriviative("ScansFinised/" + ::ToString(i));
         AFL_VERIFY(idx == (ui32)i);
         ++idx;
     }
@@ -103,4 +105,8 @@ NKikimr::NColumnShard::TScanAggregations TScanCounters::BuildAggregations() {
     return TScanAggregations(GetModuleId());
 }
 
+void TScanCounters::FillStats(::NKikimrTableStats::TTableStats& output) const {
+    output.SetRangeReads(ScansFinishedByStatus[(ui32)EStatusFinish::Success]->Val());
+}
+
 }

ydb/core/tx/columnshard/counters/scan.h

@@ -1,6 +1,7 @@
 #pragma once
 #include "common/owner.h"
 #include "common/histogram.h"
+#include <ydb/core/protos/table_stats.pb.h>
 #include <ydb/core/tx/columnshard/resources/memory.h>
 #include <ydb/core/tx/columnshard/resource_subscriber/counters.h>
 #include <ydb/core/tx/columnshard/resource_subscriber/task.h>
@@ -127,6 +128,7 @@ class TScanCounters: public TCommonCountersOwner {
     NMonitoring::TDynamicCounters::TCounterPtr AckWaitingDuration;
 
     std::vector<NMonitoring::THistogramPtr> ScanDurationByStatus;
+    std::vector<NMonitoring::TDynamicCounters::TCounterPtr> ScansFinishedByStatus;
 
     NMonitoring::TDynamicCounters::TCounterPtr NoScanRecords;
     NMonitoring::TDynamicCounters::TCounterPtr NoScanIntervals;
@@ -212,9 +214,10 @@ class TScanCounters: public TCommonCountersOwner {
         LogScanIntervals->Add(1);
     }
 
-    void OnScanDuration(const EStatusFinish status, const TDuration d) const {
+    void OnScanFinished(const EStatusFinish status, const TDuration d) const {
         AFL_VERIFY((ui32)status < ScanDurationByStatus.size());
         ScanDurationByStatus[(ui32)status]->Collect(d.MilliSeconds());
+        ScansFinishedByStatus[(ui32)status]->Add(1);
     }
 
     void AckWaitingInfo(const TDuration d) const {
@@ -257,6 +260,8 @@ class TScanCounters: public TCommonCountersOwner {
     }
 
     TScanAggregations BuildAggregations();
+
+    void FillStats(::NKikimrTableStats::TTableStats& output) const;
 };
 
 class TCounterGuard: TNonCopyable {

ydb/core/tx/columnshard/counters/tablet_counters.h

@@ -72,13 +72,13 @@ class TTabletCountersHandle {
         output.SetRowUpdates(GetValue(COUNTER_WRITE_SUCCESS));
         output.SetRowDeletes(0); // manual deletes are not supported
         output.SetRowReads(0);   // all reads are range reads
-        output.SetRangeReads(GetValue(COUNTER_READ_SUCCESS));
         output.SetRangeReadRows(GetValue(COUNTER_READ_INDEX_ROWS));
 
         output.SetImmediateTxCompleted(GetValue(COUNTER_IMMEDIATE_TX_COMPLETED));
         output.SetTxRejectedByOverload(GetValue(COUNTER_WRITE_OVERLOAD));
         output.SetTxRejectedBySpace(GetValue(COUNTER_OUT_OF_SPACE));
         output.SetPlannedTxCompleted(GetValue(COUNTER_PLANNED_TX_COMPLETED));
+        output.SetTxCompleteLagMsec(GetValue(COUNTER_TX_COMPLETE_LAG));
     }
 };
 

ydb/core/tx/columnshard/engines/reader/actor/actor.cpp

@@ -400,10 +400,9 @@ void TColumnShardScan::Finish(const NColumnShard::TScanCounters::EStatusFinish s
     LOG_DEBUG_S(*TlsActivationContext, NKikimrServices::TX_COLUMNSHARD_SCAN,
         "Scan " << ScanActorId << " finished for tablet " << TabletId);
 
-    bool success = (status == NColumnShard::TScanCounters::EStatusFinish::Success);
-    Send(ColumnShardActorId, new NColumnShard::TEvPrivate::TEvReadFinished(RequestCookie, TxId, success));
+    Send(ColumnShardActorId, new NColumnShard::TEvPrivate::TEvReadFinished(RequestCookie, TxId));
     AFL_VERIFY(StartInstant);
-    ScanCountersPool.OnScanDuration(status, TMonotonic::Now() - *StartInstant);
+    ScanCountersPool.OnScanFinished(status, TMonotonic::Now() - *StartInstant);
     ReportStats();
     PassAway();
 }

ydb/core/tx/columnshard/engines/reader/transaction/tx_scan.cpp

@@ -226,7 +226,7 @@ void TTxScan::Complete(const TActorContext& ctx) {
         auto issue = NYql::YqlIssue({}, NYql::TIssuesIds::KIKIMR_TEMPORARILY_UNAVAILABLE, TStringBuilder()
             << "Table " << table << " (shard " << Self->TabletID() << ") scan failed, reason: " << requestCookie.GetErrorMessage());
         NYql::IssueToMessage(issue, ev->Record.MutableIssues()->Add());
-        Self->Stats.GetScanCounters().OnScanDuration(NColumnShard::TScanCounters::EStatusFinish::CannotAddInFlight, TDuration::Zero());
+        Self->Stats.GetScanCounters().OnScanFinished(NColumnShard::TScanCounters::EStatusFinish::CannotAddInFlight, TDuration::Zero());
         ctx.Send(scanComputeActor, ev.Release());
         return;
     }