Statistics: status for TEvAnalyzeResponse (#8404)

ydb-platform · Aug 29, 2024 · 724e14e · 724e14e
1 parent 0e3255d
commit 724e14e
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 2 deletions.
diff --git a/ydb/core/protos/out/out.cpp b/ydb/core/protos/out/out.cpp
@@ -240,6 +240,10 @@ Y_DECLARE_OUT_SPEC(, NKikimrDataEvents::TEvWrite::ETxMode, stream, value) {
     stream << NKikimrDataEvents::TEvWrite::ETxMode_Name(value);
 }
 
+Y_DECLARE_OUT_SPEC(, NKikimrStat::TEvAnalyzeResponse_EStatus, stream, value) {
+    stream << NKikimrStat::TEvAnalyzeResponse_EStatus_Name(value);
+}
+
 Y_DECLARE_OUT_SPEC(, NKikimrStat::TEvAnalyzeStatusResponse_EStatus, stream, value) {
     stream << NKikimrStat::TEvAnalyzeStatusResponse_EStatus_Name(value);
 }

diff --git a/ydb/core/protos/statistics.proto b/ydb/core/protos/statistics.proto
@@ -89,6 +89,13 @@ message TEvAnalyze {
 // SA -> KQP
 message TEvAnalyzeResponse {
     optional bytes OperationId = 1;
+
+    enum EStatus {
+        STATUS_UNSPECIFIED = 0;
+        STATUS_SUCCESS = 1;
+        STATUS_ERROR = 2;
+    }
+    optional EStatus Status = 2;    
 }
 
 // KQP -> SA

diff --git a/ydb/core/statistics/aggregator/tx_analyze_deadline.cpp b/ydb/core/statistics/aggregator/tx_analyze_deadline.cpp
@@ -46,6 +46,7 @@ struct TStatisticsAggregator::TTxAnalyzeDeadline : public TTxBase {
                     "Send TEvAnalyzeResponse for deleted operation, OperationId=" << OperationId << ", ActorId=" << ReplyToActorId);
                 auto response = std::make_unique<TEvStatistics::TEvAnalyzeResponse>();
                 response->Record.SetOperationId(OperationId);
+                response->Record.SetStatus(NKikimrStat::TEvAnalyzeResponse::STATUS_ERROR);
                 ctx.Send(ReplyToActorId, response.release());
             } else {
                 SA_LOG_D("[" << Self->TabletID() << "] TTxAnalyzeDeadline::Complete. No ActorId to send reply. OperationId=" << OperationId);

diff --git a/ydb/core/statistics/aggregator/tx_finish_trasersal.cpp b/ydb/core/statistics/aggregator/tx_finish_trasersal.cpp
@@ -50,6 +50,7 @@ struct TStatisticsAggregator::TTxFinishTraversal : public TTxBase {
                 "Send TEvAnalyzeResponse, OperationId=" << OperationId << ", ActorId=" << ReplyToActorId);
             auto response = std::make_unique<TEvStatistics::TEvAnalyzeResponse>();
             response->Record.SetOperationId(OperationId);
+            response->Record.SetStatus(NKikimrStat::TEvAnalyzeResponse::STATUS_SUCCESS);
             ctx.Send(ReplyToActorId, response.release());
         }
     }

diff --git a/ydb/core/statistics/aggregator/ut/ut_analyze_columnshard.cpp b/ydb/core/statistics/aggregator/ut/ut_analyze_columnshard.cpp
@@ -313,7 +313,10 @@ Y_UNIT_TEST_SUITE(AnalyzeColumnshard) {
         runtime.WaitFor("TEvAnalyzeTableResponse", [&]{ return block.size(); });
         runtime.AdvanceCurrentTime(TDuration::Days(2));
 
-        runtime.GrabEdgeEventRethrow<TEvStatistics::TEvAnalyzeResponse>(sender);
+        auto analyzeResponse = runtime.GrabEdgeEventRethrow<TEvStatistics::TEvAnalyzeResponse>(sender);
+        const auto& record = analyzeResponse->Get()->Record;
+        UNIT_ASSERT_VALUES_EQUAL(record.GetOperationId(), "operationId");
+        UNIT_ASSERT_VALUES_EQUAL(record.GetStatus(), NKikimrStat::TEvAnalyzeResponse::STATUS_ERROR);
     }    
 }
 

diff --git a/ydb/core/statistics/ut_common/ut_common.cpp b/ydb/core/statistics/ut_common/ut_common.cpp
@@ -408,7 +408,9 @@ void Analyze(TTestActorRuntime& runtime, ui64 saTabletId, const std::vector<TAna
     runtime.SendToPipe(saTabletId, sender, ev.release());
     auto evResponse = runtime.GrabEdgeEventRethrow<TEvStatistics::TEvAnalyzeResponse>(sender);
 
-    UNIT_ASSERT_VALUES_EQUAL(evResponse->Get()->Record.GetOperationId(), operationId);
+    const auto& record = evResponse->Get()->Record;
+    UNIT_ASSERT_VALUES_EQUAL(record.GetOperationId(), operationId);
+    UNIT_ASSERT_VALUES_EQUAL(record.GetStatus(), NKikimrStat::TEvAnalyzeResponse::STATUS_SUCCESS);
 }
 
 void AnalyzeTable(TTestActorRuntime& runtime, ui64 shardTabletId, const TAnalyzedTable& table) {