Add comment to query in TPC-* benchmarks (#46740)

Co-authored-by: Oleg Geller <[email protected]>

3 files changed, 5 insertions, 4 deletions

diff --git a/ydb/library/workload/tpc_base/tpc_base.cpp b/ydb/library/workload/tpc_base/tpc_base.cpp
index d69fc402130..e4ce6d8e1b5 100644
--- a/ydb/library/workload/tpc_base/tpc_base.cpp
+++ b/ydb/library/workload/tpc_base/tpc_base.cpp
@@ -102,7 +102,7 @@ TQueryInfoList TTpcBaseWorkloadGenerator::GetWorkload(int type) {
         queries[num] = r.Data;
     }
     for (auto& query : queries) {
-        PatchQuery(query);
+        PatchQuery(query, &query - queries.cbegin());
         result.emplace_back();
         result.back().Query = query;
         if (Params.GetCheckCanonical()) {
@@ -117,7 +117,8 @@ TQueryInfoList TTpcBaseWorkloadGenerator::GetWorkload(int type) {
     return result;
 }
 
-void TTpcBaseWorkloadGenerator::PatchQuery(TString& query) const {
+void TTpcBaseWorkloadGenerator::PatchQuery(TString& query, size_t index) const {
+    query = (TStringBuilder() << "--# " << Params.GetWorkloadName() << " Scale " << Params.GetScale() << " Query " << index << Endl << Endl) + query;
     SubstGlobal(query, "{% include 'header.sql.jinja' %}", GetHeader(query));
     SubstGlobal(query, "{path}", Params.GetFullTableName(nullptr) + "/");
     const auto tableJson = GetTablesJson();
diff --git a/ydb/library/workload/tpc_base/tpc_base.h b/ydb/library/workload/tpc_base/tpc_base.h
index 6fa50dfcb64..cd4dcedc149 100644
--- a/ydb/library/workload/tpc_base/tpc_base.h
+++ b/ydb/library/workload/tpc_base/tpc_base.h
@@ -33,7 +33,7 @@ protected:
 
 private:
     const TTpcBaseWorkloadParams& Params;
-    void PatchQuery(TString& query) const;
+    void PatchQuery(TString& query, size_t index) const;
     void FilterHeader(IOutputStream& result, TStringBuf header, const TString& query) const;
     TString GetHeader(const TString& query) const;
     TTpcBaseWorkloadParams::EFloatMode DetectFloatMode() const;
diff --git a/ydb/public/lib/ydb_cli/commands/ydb_benchmark.cpp b/ydb/public/lib/ydb_cli/commands/ydb_benchmark.cpp
index d6f882ca5bd..f9897c09eaf 100644
--- a/ydb/public/lib/ydb_cli/commands/ydb_benchmark.cpp
+++ b/ydb/public/lib/ydb_cli/commands/ydb_benchmark.cpp
@@ -126,7 +126,7 @@ void TWorkloadCommandBenchmark::Config(TConfig& config) {
 TString TWorkloadCommandBenchmark::PatchQuery(const TStringBuf& original) const {
     std::vector<TStringBuf> lines;
     for (auto& line : StringSplitter(original).Split('\n').SkipEmpty()) {
-        if (line.StartsWith("--") && !line.StartsWith("--!")) {
+        if (line.StartsWith("--") && !line.StartsWith("--!") && !line.StartsWith("--#")) {
             continue;
         }