Correct v1/v2 totals

2 files changed, 19 insertions, 13 deletions

diff --git a/ydb/core/fq/libs/compute/common/utils.cpp b/ydb/core/fq/libs/compute/common/utils.cpp
index 0972b74970..d5f22b664f 100644
--- a/ydb/core/fq/libs/compute/common/utils.cpp
+++ b/ydb/core/fq/libs/compute/common/utils.cpp
@@ -71,6 +71,7 @@ struct TTotalStatistics {
     TAggregate IngressRows;
     TAggregate EgressBytes;
     TAggregate EgressRows;
+    TAggregate Tasks;
     TAggregates Aggregates;
 };
 
@@ -149,6 +150,8 @@ void WriteNamedNode(NYson::TYsonWriter& writer, NJson::TJsonValue& node, const T
                     totals.OutputRows.Add(sum);
                 } else if (name == "TotalOutputBytes") {
                     totals.OutputBytes.Add(sum);
+                } else if (name == "Tasks") {
+                    totals.Tasks.Add(sum);
                 }
                 writer.OnKeyedItem(name);
                 writer.OnBeginMap();
@@ -208,6 +211,8 @@ void WriteNamedNode(NYson::TYsonWriter& writer, NJson::TJsonValue& node, const T
                         totals.CpuTimeUs.Add(*sum);
                     } else if (name == "SourceCpuTimeUs") {
                         totals.SourceCpuTimeUs.Add(*sum);
+                    } else if (name == "Tasks") {
+                        totals.Tasks.Add(*sum);
                     }
                 }
             }
@@ -363,6 +368,7 @@ TString GetV1StatFromV2Plan(const TString& plan) {
                         totals.IngressRows.Write(writer, "IngressRows");
                         totals.EgressBytes.Write(writer, "EgressBytes");
                         totals.EgressRows.Write(writer, "EgressRows");
+                        totals.Tasks.Write(writer, "Tasks");
                         writer.OnEndMap();
                     }
                 }
diff --git a/ydb/core/fq/libs/control_plane_storage/internal/utils.cpp b/ydb/core/fq/libs/control_plane_storage/internal/utils.cpp
index 780d9bc2c1..aee6c9a4a7 100644
--- a/ydb/core/fq/libs/control_plane_storage/internal/utils.cpp
+++ b/ydb/core/fq/libs/control_plane_storage/internal/utils.cpp
@@ -263,18 +263,18 @@ TString GetPrettyStatistics(const TString& statistics) {
             if (p.first.StartsWith("Graph=") || p.first.StartsWith("Precompute=")) {
                 writer.OnKeyedItem(p.first);
                 writer.OnBeginMap();
-                    RemapNode(writer, p.second, "StagesCount", "StagesCount");
-                    RemapNode(writer, p.second, "TaskRunner.Stage=Total.TasksCount", "TasksCount");
-                    RemapNode(writer, p.second, "TaskRunner.Stage=Total.BuildCpuTimeUs", "BuildCpuTimeUs");
-                    RemapNode(writer, p.second, "TaskRunner.Stage=Total.ComputeCpuTimeUs", "ComputeCpuTimeUs");
+                    RemapNode(writer, p.second, "TaskRunner.Stage=Total.Tasks", "Tasks");
                     RemapNode(writer, p.second, "TaskRunner.Stage=Total.CpuTimeUs", "CpuTimeUs");
-                    RemapNode(writer, p.second, "TaskRunner.Stage=Total.SourceCpuTimeUs", "SourceCpuTimeUs");
-                    RemapNode(writer, p.second, "TaskRunner.Stage=Total.IngressS3SourceBytes", "IngressObjectStorageBytes");
-                    RemapNode(writer, p.second, "TaskRunner.Stage=Total.EgressS3SinkBytes", "EgressObjectStorageBytes");
-                    RemapNode(writer, p.second, "TaskRunner.Stage=Total.IngressPqSourceBytes", "IngressStreamBytes");
-                    RemapNode(writer, p.second, "TaskRunner.Stage=Total.EgressPqSinkBytes", "EgressStreamBytes");
-                    RemapNode(writer, p.second, "IngressBytes", "IngressBytes");
-                    RemapNode(writer, p.second, "EgressBytes", "EgressBytes");
+                    RemapNode(writer, p.second, "TaskRunner.Stage=Total.IngressBytes", "IngressBytes");
+                    RemapNode(writer, p.second, "TaskRunner.Stage=Total.IngressRows", "IngressRows");
+                    RemapNode(writer, p.second, "TaskRunner.Stage=Total.InputBytes", "InputBytes");
+                    RemapNode(writer, p.second, "TaskRunner.Stage=Total.InputRows", "InputRows");
+                    RemapNode(writer, p.second, "TaskRunner.Stage=Total.OutputBytes", "OutputBytes");
+                    RemapNode(writer, p.second, "TaskRunner.Stage=Total.OutputRows", "OutputRows");
+                    RemapNode(writer, p.second, "TaskRunner.Stage=Total.ResultBytes", "ResultBytes");
+                    RemapNode(writer, p.second, "TaskRunner.Stage=Total.ResultRows", "ResultRows");
+                    RemapNode(writer, p.second, "TaskRunner.Stage=Total.EgressBytes", "EgressBytes");
+                    RemapNode(writer, p.second, "TaskRunner.Stage=Total.EgressRows", "EgressRows");
                 writer.OnEndMap();
             }
             // YQv2
@@ -282,8 +282,8 @@ TString GetPrettyStatistics(const TString& statistics) {
             else {
                 writer.OnKeyedItem(p.first);
                 writer.OnBeginMap();
-                    AggregateNode(writer, p.second, "Tasks", "Tasks");
-                    AggregateNode(writer, p.second, "CpuTimeUs", "CpuTimeUs");
+                    RemapNode(writer, p.second, "Tasks", "Tasks");
+                    RemapNode(writer, p.second, "CpuTimeUs", "CpuTimeUs");
                     RemapNode(writer, p.second, "IngressBytes", "IngressBytes");
                     RemapNode(writer, p.second, "IngressRows", "IngressRows");
                     RemapNode(writer, p.second, "InputBytes", "InputBytes");