Revert back some changes regarding proto

Author: abyss7

ydb/core/kqp/executer_actor/kqp_executer_impl.h

@@ -402,7 +402,7 @@ class TKqpExecuterBase : public TActorBootstrapped<TDerived> {
                 for (ui32 txId = 0; txId < Request.Transactions.size(); ++txId) {
                     const auto& tx = Request.Transactions[txId].Body;
                     auto planWithStats = AddExecStatsToTxPlan(tx->GetPlan(), execStats);
-                    (*execStats.MutableTxPlansWithStats())[txId] = planWithStats;
+                    execStats.AddTxPlansWithStats(planWithStats);
                 }
                 this->Send(Target, progress.Release());
                 LastProgressStats = now;
@@ -1737,32 +1737,6 @@ class TKqpExecuterBase : public TActorBootstrapped<TDerived> {
         this->Shutdown();
     }
 
-    void FillResponseStats() {
-        auto& response = *ResponseEv->Record.MutableResponse();
-
-        YQL_ENSURE(Stats);
-
-        ReportEventElapsedTime();
-
-        Stats->FinishTs = TInstant::Now();
-        Stats->Finish();
-
-        if (Stats->CollectStatsByLongTasks || CollectFullStats(Request.StatsMode)) {
-            for (ui32 txId = 0; txId < Request.Transactions.size(); ++txId) {
-                const auto& tx = Request.Transactions[txId].Body;
-                auto planWithStats = AddExecStatsToTxPlan(tx->GetPlan(), response.GetResult().GetStats());
-                (*response.MutableResult()->MutableStats()->MutableTxPlansWithStats())[txId] = planWithStats;
-            }
-        }
-
-        if (Stats->CollectStatsByLongTasks) {
-            const auto& txPlansWithStats = response.GetResult().GetStats().GetTxPlansWithStats();
-            if (!txPlansWithStats.empty()) {
-                LOG_N("Full stats: " << response.GetResult().GetStats());
-            }
-        }
-    }
-
     virtual void ReplyErrorAndDie(Ydb::StatusIds::StatusCode status,
         google::protobuf::RepeatedPtrField<Ydb::Issue::IssueMessage>* issues)
     {
@@ -1871,7 +1845,35 @@ class TKqpExecuterBase : public TActorBootstrapped<TDerived> {
 
     void PassAway() override {
         YQL_ENSURE(AlreadyReplied && ResponseEv);
-        FillResponseStats();
+
+        // Fill response stats
+        {
+            auto& response = *ResponseEv->Record.MutableResponse();
+
+            YQL_ENSURE(Stats);
+
+            ReportEventElapsedTime();
+
+            Stats->FinishTs = TInstant::Now();
+            Stats->Finish();
+
+            if (Stats->CollectStatsByLongTasks || CollectFullStats(Request.StatsMode)) {
+                response.MutableResult()->MutableStats()->ClearTxPlansWithStats();
+                for (ui32 txId = 0; txId < Request.Transactions.size(); ++txId) {
+                    const auto& tx = Request.Transactions[txId].Body;
+                    auto planWithStats = AddExecStatsToTxPlan(tx->GetPlan(), response.GetResult().GetStats());
+                    response.MutableResult()->MutableStats()->AddTxPlansWithStats(planWithStats);
+                }
+            }
+
+            if (Stats->CollectStatsByLongTasks) {
+                const auto& txPlansWithStats = response.GetResult().GetStats().GetTxPlansWithStats();
+                if (!txPlansWithStats.empty()) {
+                    LOG_N("Full stats: " << response.GetResult().GetStats());
+                }
+            }
+        }
+
         Request.Transactions.crop(0);
         this->Send(Target, ResponseEv.release());
 

ydb/core/kqp/executer_actor/kqp_literal_executer.cpp

@@ -264,7 +264,7 @@ class TKqpLiteralExecuter {
                 for (ui32 txId = 0; txId < Request.Transactions.size(); ++txId) {
                     const auto& tx = Request.Transactions[txId].Body;
                     auto planWithStats = AddExecStatsToTxPlan(tx->GetPlan(), response.GetResult().GetStats());
-                    (*response.MutableResult()->MutableStats()->MutableTxPlansWithStats())[txId] = planWithStats;
+                    response.MutableResult()->MutableStats()->AddTxPlansWithStats(planWithStats);
                 }
             }
         }

ydb/core/kqp/opt/kqp_query_plan.cpp

@@ -2817,7 +2817,7 @@ TString AddExecStatsToTxPlan(const TString& txPlanJson, const NYql::NDqProto::TD
 TString SerializeAnalyzePlan(const NKqpProto::TKqpStatsQuery& queryStats, const TString& poolId) {
     TVector<const TString> txPlans;
     for (const auto& execStats: queryStats.GetExecutions()) {
-        for (const auto& [txId, txPlan]: execStats.GetTxPlansWithStats()) {
+        for (const auto& txPlan: execStats.GetTxPlansWithStats()) {
             txPlans.push_back(txPlan);
         }
     }

ydb/library/yql/dq/actors/protos/dq_stats.proto

@@ -390,8 +390,7 @@ message TDqExecutionStats {
     uint64 FirstRowTimeMs = 13;    // first result row timestamp, milliseconds
 
     repeated TDqStageStats Stages = 14;
-    reserved 15; // repeated string TxPlansWithStats = 15;
-    map<uint32, string> TxPlansWithStats = 16;
+    repeated string TxPlansWithStats = 15;
 
     google.protobuf.Any Extra = 100;
 }