Fix FQ Ingress + Input Rows hint (#14822)

Author: Hor911

ydb/public/lib/ydb_cli/common/plan2svg.cpp

@@ -1011,6 +1011,7 @@ void TPlan::LoadStage(std::shared_ptr<TStage> stage, const NJson::TJsonValue& no
                         ythrow yexception() << "Plan stage already has Ingress [" << stage->IngressName << "]";
                     }
                     stage->IngressName = subNodeType;
+                    stage->BuiltInIngress = true;
 
                     const NJson::TJsonValue* ingressRowsNode = nullptr;
                     if (stage->StatsNode) {
@@ -1185,7 +1186,7 @@ void TPlan::MarkStageIndent(ui32 indent, ui32& offsetY, std::shared_ptr<TStage>
 
     stage->OffsetY = offsetY;
     ui32 height = std::max<ui32>(
-        (stage->Connections.size() + 3) * (INTERNAL_HEIGHT + INTERNAL_GAP_Y) + INTERNAL_GAP_Y,
+        (3 /* Output, MEM, CPU*/ + stage->Connections.size() + stage->BuiltInIngress) * (INTERNAL_HEIGHT + INTERNAL_GAP_Y) + INTERNAL_GAP_Y,
         stage->Operators.size() * (INTERNAL_TEXT_HEIGHT + INTERNAL_GAP_Y) * 2 - INTERNAL_GAP_Y + (INTERNAL_HEIGHT - INTERNAL_TEXT_HEIGHT));
 
     stage->Height = height;
@@ -1591,7 +1592,7 @@ void TPlan::PrintSvg(ui64 maxTime, ui32& offsetY, TStringBuilder& background, TS
             if (d) {
                 title << " " << FormatBytes(s->OutputBytes->Details.Sum * 1000 / d) << "/s";
                 if (s->OutputRows) {
-                    title << ", Rows " << FormatIntegerValue(s->OutputRows->Details.Sum * 1000 / d) << "/s";
+                    title << ", Rows " << FormatInteger(s->OutputRows->Details.Sum * 1000 / d) << "/s";
                 }
             }
             PrintTimeline(background, canvas, title, s->OutputBytes->FirstMessage, s->OutputBytes->LastMessage, px, y0, pw, INTERNAL_HEIGHT, Config.Palette.OutputMedium);
@@ -1796,7 +1797,7 @@ void TPlan::PrintSvg(ui64 maxTime, ui32& offsetY, TStringBuilder& background, TS
                     if (d) {
                         title << " " << FormatBytes(c->CteOutputBytes->Details.Sum * 1000 / d) << "/s";
                         if (c->CteOutputRows) {
-                            title << ", Rows " << FormatIntegerValue(c->CteOutputRows->Details.Sum * 1000 / d) << "/s";
+                            title << ", Rows " << FormatInteger(c->CteOutputRows->Details.Sum * 1000 / d) << "/s";
                         }
                     }
                     PrintTimeline(background, canvas, title, c->CteOutputBytes->FirstMessage, c->CteOutputBytes->LastMessage, px, y + INTERNAL_GAP_Y, pw, INTERNAL_HEIGHT, Config.Palette.OutputMedium);
@@ -1870,7 +1871,7 @@ void TPlan::PrintSvg(ui64 maxTime, ui32& offsetY, TStringBuilder& background, TS
                 TStringBuilder tooltip;
                 auto textSum = FormatTooltip(tooltip, "Input", c->InputBytes.get(), FormatBytes);
                 if (c->InputRows) {
-                    FormatTooltip(tooltip, ", Rows", c->InputBytes.get(), FormatInteger);
+                    FormatTooltip(tooltip, ", Rows", c->InputRows.get(), FormatInteger);
                     if (c->InputRows->Details.Sum) {
                         tooltip << ", Width " << FormatBytes(c->InputBytes->Details.Sum / c->InputRows->Details.Sum);
                     }
@@ -1883,7 +1884,7 @@ void TPlan::PrintSvg(ui64 maxTime, ui32& offsetY, TStringBuilder& background, TS
                 if (d) {
                     title << " " << FormatBytes(c->InputBytes->Details.Sum * 1000 / d) << "/s";
                     if (c->InputRows) {
-                        title << ", Rows " << FormatIntegerValue(c->InputRows->Details.Sum * 1000 / d) << "/s";
+                        title << ", Rows " << FormatInteger(c->InputRows->Details.Sum * 1000 / d) << "/s";
                     }
                 }
                 PrintTimeline(background, canvas, title, c->InputBytes->FirstMessage, c->InputBytes->LastMessage, px, y0, pw, INTERNAL_HEIGHT, Config.Palette.InputMedium);
@@ -1917,7 +1918,7 @@ void TPlan::PrintSvg(ui64 maxTime, ui32& offsetY, TStringBuilder& background, TS
             if (d) {
                 title << " " << FormatBytes(s->IngressBytes->Details.Sum * 1000 / d) << "/s";
                 if (s->IngressRows) {
-                    title << ", Rows " << FormatIntegerValue(s->IngressRows->Details.Sum / d) << "/s";
+                    title << ", Rows " << FormatInteger(s->IngressRows->Details.Sum / d) << "/s";
                 }
             }
             PrintTimeline(background, canvas, title, s->IngressBytes->FirstMessage, s->IngressBytes->LastMessage, px, y0, pw, INTERNAL_HEIGHT, Config.Palette.IngressMedium);

ydb/public/lib/ydb_cli/common/plan2svg.h

@@ -147,6 +147,7 @@ class TStage {
     std::shared_ptr<TSingleMetric> SpillingChannelTime;
     std::shared_ptr<TSingleMetric> SpillingChannelBytes;
     TString IngressName;
+    bool BuiltInIngress = false;
     std::shared_ptr<TSingleMetric> IngressBytes;
     std::shared_ptr<TSingleMetric> IngressRows;
     std::vector<TOperatorInfo> Operators;