From 53173aafd5197e6d3c7a98b9d051bb07bec756c8 Mon Sep 17 00:00:00 2001 From: Nikolay Shumkov Date: Wed, 29 Jan 2025 12:59:56 +0300 Subject: [PATCH 01/10] Initial commit --- .../s3/kqp_federated_query_ut.cpp | 16 ++++- .../lib/ydb_cli/commands/benchmark_utils.cpp | 7 +- ydb/public/lib/ydb_cli/commands/ydb_sql.cpp | 65 ++++++++++++++----- ydb/public/lib/ydb_cli/commands/ydb_sql.h | 1 + .../ydb_cli/common/progress_indication.cpp | 40 +++++++----- .../lib/ydb_cli/common/progress_indication.h | 9 +-- 6 files changed, 96 insertions(+), 42 deletions(-) diff --git a/ydb/core/kqp/ut/federated_query/s3/kqp_federated_query_ut.cpp b/ydb/core/kqp/ut/federated_query/s3/kqp_federated_query_ut.cpp index 026e9bda4cad..63ca755ddbbf 100644 --- a/ydb/core/kqp/ut/federated_query/s3/kqp_federated_query_ut.cpp +++ b/ydb/core/kqp/ut/federated_query/s3/kqp_federated_query_ut.cpp @@ -121,7 +121,12 @@ Y_UNIT_TEST_SUITE(KqpFederatedQuery) { )", "external_table"_a=externalTableName); auto db = kikimr->GetQueryClient(); - auto executeQueryIterator = db.StreamExecuteQuery(sql, NYdb::NQuery::TTxControl::BeginTx().CommitTx()).ExtractValueSync(); + + NYdb::NQuery::TExecuteQuerySettings execSettings; + execSettings.StatsMode(NYdb::NQuery::EStatsMode::Full); + // execSettings.StatsCollectPeriod(std::chrono::milliseconds(50)); + + auto executeQueryIterator = db.StreamExecuteQuery(sql, NYdb::NQuery::TTxControl::BeginTx().CommitTx(), execSettings).ExtractValueSync(); size_t currentRow = 0; while (true) { @@ -131,6 +136,15 @@ Y_UNIT_TEST_SUITE(KqpFederatedQuery) { break; } + if (part.HasStats()) { + auto execStats = part.ExtractStats(); + UNIT_ASSERT_C(false, execStats.ToString()); + const auto& protoStats = TProtoAccessor::GetProto(execStats); + UNIT_ASSERT(protoStats.total_read_rows() == 0 || protoStats.total_read_rows() == 1); + UNIT_ASSERT(protoStats.total_read_bytes() == 0 || protoStats.total_read_bytes() == 1); + UNIT_ASSERT(protoStats.total_duration_us()); + } + if (!part.HasResultSet()) { continue; } diff --git a/ydb/public/lib/ydb_cli/commands/benchmark_utils.cpp b/ydb/public/lib/ydb_cli/commands/benchmark_utils.cpp index 689d1c8b2fca..c920c13dfa06 100644 --- a/ydb/public/lib/ydb_cli/commands/benchmark_utils.cpp +++ b/ydb/public/lib/ydb_cli/commands/benchmark_utils.cpp @@ -169,7 +169,7 @@ class TQueryResultScanner { template TStatus Scan(TIterator& it, std::optional planFileName = std::nullopt) { - TProgressIndication progressIndication(true); + TProgressIndication progressIndication; TMaybe execStats; TString currentPlanFileNameStats; @@ -222,11 +222,10 @@ class TQueryResultScanner { const auto& protoStats = TProtoAccessor::GetProto(execStats.GetRef()); for (const auto& queryPhase : protoStats.query_phases()) { for (const auto& tableAccessStats : queryPhase.table_access()) { - progressIndication.UpdateProgress({tableAccessStats.reads().rows(), tableAccessStats.reads().bytes(), - tableAccessStats.updates().rows(), tableAccessStats.updates().bytes(), - tableAccessStats.deletes().rows(), tableAccessStats.deletes().bytes()}); + progressIndication.UpdateProgress({tableAccessStats.reads().rows(), tableAccessStats.reads().bytes()}); } } + progressIndication.SetDurationUs(protoStats.total_duration_us()); progressIndication.Render(); } diff --git a/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp b/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp index aafef6cd5ede..9f7b32e897a0 100644 --- a/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp +++ b/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp @@ -6,8 +6,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -43,6 +45,18 @@ void TCommandSql::Config(TConfig& config) { .StoreTrue(&ExplainAnalyzeMode); config.Opts->AddLongOption("stats", "Execution statistics collection mode [none, basic, full, profile]") .RequiredArgument("[String]").StoreResult(&CollectStatsMode); + + NColorizer::TColors colors = NColorizer::AutoColors(Cout); + TStringStream description; + description << "Print progress of query execution. Requires non-none statistics collection mode. Available options: "; + description << "\n " << colors.BoldColor() << "tty" << colors.OldColor() + << "\n " << "Print progress to the terminal"; + description << "\n " << colors.BoldColor() << "none" << colors.OldColor() + << "\n " << "Disables progress printing"; + description << "\nDefault: " << colors.CyanColor() << "\"tty\"" << colors.OldColor() << "."; + + config.Opts->AddLongOption("progress", description.Str()) + .RequiredArgument("[String]").StoreResult(&Progress); config.Opts->AddLongOption("diagnostics-file", "Path to file where the diagnostics will be saved.") .RequiredArgument("[String]").StoreResult(&DiagnosticsFile); config.Opts->AddLongOption("syntax", "Query syntax [yql, pg]") @@ -143,8 +157,16 @@ int TCommandSql::RunCommand(TConfig& config) { } else { // Execute query settings.ExecMode(NQuery::EExecMode::Execute); - auto defaultStatsMode = ExplainAnalyzeMode ? NQuery::EStatsMode::Full : NQuery::EStatsMode::None; - settings.StatsMode(ParseQueryStatsModeOrThrow(CollectStatsMode, defaultStatsMode)); + auto defaultStatsMode = ExplainAnalyzeMode ? NQuery::EStatsMode::Full : NQuery::EStatsMode::Basic; + auto statsMode = ParseQueryStatsModeOrThrow(CollectStatsMode, defaultStatsMode); + settings.StatsMode(statsMode); + if (Progress == "tty") { + if (statsMode >= NQuery::EStatsMode::Full) { + settings.StatsCollectPeriod(std::chrono::milliseconds(3000)); + } else { + settings.StatsCollectPeriod(std::chrono::milliseconds(500)); + } + } } settings.Syntax(SyntaxType); @@ -190,28 +212,41 @@ int TCommandSql::PrintResponse(NQuery::TExecuteQueryIterator& result) { { TResultSetPrinter printer(OutputFormat, &IsInterrupted); + TProgressIndication progressIndication; + TMaybe execStats; + while (!IsInterrupted()) { - auto streamPart = result.ReadNext().GetValueSync(); + auto streamPart = result.ReadNext().ExtractValueSync(); if (ThrowOnErrorAndCheckEOS(streamPart)) { break; } + if (streamPart.HasStats()) { + execStats = streamPart.ExtractStats(); + + const auto& protoStats = TProtoAccessor::GetProto(execStats.GetRef()); + for (const auto& queryPhase : protoStats.query_phases()) { + for (const auto& tableAccessStats : queryPhase.table_access()) { + progressIndication.UpdateProgress({tableAccessStats.reads().rows(), tableAccessStats.reads().bytes()}); + } + } + progressIndication.SetDurationUs(protoStats.total_duration_us()); + + + progressIndication.Render(); + } + if (streamPart.HasResultSet() && !ExplainAnalyzeMode) { + progressIndication.Finish(); printer.Print(streamPart.GetResultSet()); } + } - if (streamPart.GetStats().has_value()) { - const auto& queryStats = *streamPart.GetStats(); - stats = queryStats.ToString(); - ast = queryStats.GetAst(); - - if (queryStats.GetPlan()) { - plan = queryStats.GetPlan(); - } - if (queryStats.GetMeta()) { - meta = queryStats.GetMeta(); - } - } + if (execStats) { + stats = execStats->ToString(); + plan = execStats->GetPlan(); + ast = execStats->GetAst(); + meta = execStats->GetMeta(); } } // TResultSetPrinter destructor should be called before printing stats diff --git a/ydb/public/lib/ydb_cli/commands/ydb_sql.h b/ydb/public/lib/ydb_cli/commands/ydb_sql.h index a623f8a31161..d96972842c5f 100644 --- a/ydb/public/lib/ydb_cli/commands/ydb_sql.h +++ b/ydb/public/lib/ydb_cli/commands/ydb_sql.h @@ -34,6 +34,7 @@ class TCommandSql : public TYdbCommand, public TCommandWithOutput, public TComma bool ExplainMode = false; bool ExplainAnalyzeMode = false; bool ExplainAst = false; + TString Progress; }; } diff --git a/ydb/public/lib/ydb_cli/common/progress_indication.cpp b/ydb/public/lib/ydb_cli/common/progress_indication.cpp index 7654b4cf1e34..4e0ddd4932ff 100644 --- a/ydb/public/lib/ydb_cli/common/progress_indication.cpp +++ b/ydb/public/lib/ydb_cli/common/progress_indication.cpp @@ -1,21 +1,22 @@ #include "print_utils.h" #include "progress_indication.h" +#include +#include + namespace NYdb { namespace NConsoleClient { -TProgressIndication::TProgressIndication(bool onlyReadStats) - : OnlyReadStats(onlyReadStats) { +TProgressIndication::TProgressIndication() { } void TProgressIndication::UpdateProgress(const TCurrentStats& stats) { - CurrentStats.ReadRows += stats.ReadRows; - CurrentStats.ReadBytes += stats.ReadBytes; - CurrentStats.UpdateRows += stats.UpdateRows; - CurrentStats.UpdateBytes += stats.UpdateBytes; - CurrentStats.DeleteRows += stats.DeleteRows; - CurrentStats.DeleteBytes += stats.DeleteBytes; + CurrentStats = stats; +} + +void TProgressIndication::SetDurationUs(ui64 durationUs) { + DurationUs = durationUs; } TProgressIndication::~TProgressIndication() { @@ -31,24 +32,31 @@ void TProgressIndication::Finish() { void TProgressIndication::Render() { + if (!GetTerminalWidth()) + return; + + NColorizer::TColors colors = NColorizer::AutoColors(Cout); + Cerr << "\r" "\033[K"; + Cerr << colors.LightGreen(); switch (RendersCount % 4) { case 0: Cerr << "|"; break; case 1: Cerr << "/"; break; case 2: Cerr << "-"; break; case 3: Cerr << "\\"; break; } - Cerr << "Progress: "; - - Cerr << PrettyNumber(CurrentStats.ReadRows) << " rows read, " << PrettySize(CurrentStats.ReadBytes) << " read"; + Cerr << colors.Default() << "Progress: " << colors.Default(); - if (OnlyReadStats) { - Cerr << "."; - } else { - Cerr << ", " << PrettyNumber(CurrentStats.UpdateRows) << " rows updated, " << PrettySize(CurrentStats.UpdateBytes) << " updated, " << - PrettyNumber(CurrentStats.DeleteRows) << " rows deleted, " << PrettySize(CurrentStats.DeleteBytes) << " deleted."; + Cerr << colors.Default() << PrettyNumber(CurrentStats.ReadRows) << " rows read, " << PrettySize(CurrentStats.ReadBytes) << " read"; + if (DurationUs) { + Cerr << colors.Default() << " (" << PrettyNumber(CurrentStats.ReadRows * 1000000.0 / DurationUs) << "/s" << ", " << + PrettySize(CurrentStats.ReadBytes * 1000000.0 / DurationUs) << "/s" << ")"; } + Cerr << colors.Default() << "."; + + Cerr.Flush(); + RendersCount++; CurrentStats = TCurrentStats(); diff --git a/ydb/public/lib/ydb_cli/common/progress_indication.h b/ydb/public/lib/ydb_cli/common/progress_indication.h index e6d253a88c72..d6663618b917 100644 --- a/ydb/public/lib/ydb_cli/common/progress_indication.h +++ b/ydb/public/lib/ydb_cli/common/progress_indication.h @@ -11,16 +11,13 @@ class TProgressIndication { struct TCurrentStats { ui64 ReadRows = 0; ui64 ReadBytes = 0; - ui64 UpdateRows = 0; - ui64 UpdateBytes = 0; - ui64 DeleteRows = 0; - ui64 DeleteBytes = 0; }; - explicit TProgressIndication(bool onlyReadStats = false); + explicit TProgressIndication(); ~TProgressIndication(); void UpdateProgress(const TCurrentStats& stats); + void SetDurationUs(ui64 durationUs); void Render(); void Finish(); @@ -29,7 +26,7 @@ class TProgressIndication { TCurrentStats CurrentStats; bool Finished = false; ui32 RendersCount = 0; - bool OnlyReadStats = false; + ui64 DurationUs = 0; }; } // namespace NConsoleClient From 516b2429c426ae1062b6a533de8561809d827b67 Mon Sep 17 00:00:00 2001 From: Nikolay Shumkov Date: Fri, 28 Mar 2025 16:23:53 +0300 Subject: [PATCH 02/10] Fixes --- ydb/public/lib/ydb_cli/commands/ydb_sql.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp b/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp index 9f7b32e897a0..5a3196a1f652 100644 --- a/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp +++ b/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp @@ -136,6 +136,9 @@ void TCommandSql::Parse(TConfig& config) { << "nor path to file with script text (\"--file\", \"-f\") were provided." << Endl; config.PrintHelpAndExit(); } + if (Progress && Progress != "tty" && Progress != "none") { + throw TMisuseException() << "Unknow progress option \"" << Progress << "\"."; + } // Should be called after setting ReadingSomethingFromStdin ParseParameters(config); } @@ -161,6 +164,9 @@ int TCommandSql::RunCommand(TConfig& config) { auto statsMode = ParseQueryStatsModeOrThrow(CollectStatsMode, defaultStatsMode); settings.StatsMode(statsMode); if (Progress == "tty") { + if (statsMode == NQuery::EStatsMode::None) { + throw TMisuseException() << "Non-none statistics collection mode are required to print progress."; + } if (statsMode >= NQuery::EStatsMode::Full) { settings.StatsCollectPeriod(std::chrono::milliseconds(3000)); } else { From bf8d91b75576ab37cbf4330f450cbfbf34400488 Mon Sep 17 00:00:00 2001 From: Nikolay Shumkov Date: Fri, 28 Mar 2025 16:33:11 +0300 Subject: [PATCH 03/10] Fixes --- .../s3/kqp_federated_query_ut.cpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/ydb/core/kqp/ut/federated_query/s3/kqp_federated_query_ut.cpp b/ydb/core/kqp/ut/federated_query/s3/kqp_federated_query_ut.cpp index 63ca755ddbbf..026e9bda4cad 100644 --- a/ydb/core/kqp/ut/federated_query/s3/kqp_federated_query_ut.cpp +++ b/ydb/core/kqp/ut/federated_query/s3/kqp_federated_query_ut.cpp @@ -121,12 +121,7 @@ Y_UNIT_TEST_SUITE(KqpFederatedQuery) { )", "external_table"_a=externalTableName); auto db = kikimr->GetQueryClient(); - - NYdb::NQuery::TExecuteQuerySettings execSettings; - execSettings.StatsMode(NYdb::NQuery::EStatsMode::Full); - // execSettings.StatsCollectPeriod(std::chrono::milliseconds(50)); - - auto executeQueryIterator = db.StreamExecuteQuery(sql, NYdb::NQuery::TTxControl::BeginTx().CommitTx(), execSettings).ExtractValueSync(); + auto executeQueryIterator = db.StreamExecuteQuery(sql, NYdb::NQuery::TTxControl::BeginTx().CommitTx()).ExtractValueSync(); size_t currentRow = 0; while (true) { @@ -136,15 +131,6 @@ Y_UNIT_TEST_SUITE(KqpFederatedQuery) { break; } - if (part.HasStats()) { - auto execStats = part.ExtractStats(); - UNIT_ASSERT_C(false, execStats.ToString()); - const auto& protoStats = TProtoAccessor::GetProto(execStats); - UNIT_ASSERT(protoStats.total_read_rows() == 0 || protoStats.total_read_rows() == 1); - UNIT_ASSERT(protoStats.total_read_bytes() == 0 || protoStats.total_read_bytes() == 1); - UNIT_ASSERT(protoStats.total_duration_us()); - } - if (!part.HasResultSet()) { continue; } From 6abaa2105fc9d59c989933e32524c12534b304eb Mon Sep 17 00:00:00 2001 From: Nikolay Shumkov Date: Mon, 31 Mar 2025 14:33:26 +0300 Subject: [PATCH 04/10] Fixes --- ydb/public/lib/ydb_cli/commands/ydb_sql.cpp | 2 +- ydb/public/lib/ydb_cli/common/print_utils.cpp | 2 +- ydb/public/lib/ydb_cli/common/progress_indication.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp b/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp index 5a3196a1f652..b5739d4e95e1 100644 --- a/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp +++ b/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp @@ -56,7 +56,7 @@ void TCommandSql::Config(TConfig& config) { description << "\nDefault: " << colors.CyanColor() << "\"tty\"" << colors.OldColor() << "."; config.Opts->AddLongOption("progress", description.Str()) - .RequiredArgument("[String]").StoreResult(&Progress); + .RequiredArgument("[String]").DefaultValue("tty").StoreResult(&Progress); config.Opts->AddLongOption("diagnostics-file", "Path to file where the diagnostics will be saved.") .RequiredArgument("[String]").StoreResult(&DiagnosticsFile); config.Opts->AddLongOption("syntax", "Query syntax [yql, pg]") diff --git a/ydb/public/lib/ydb_cli/common/print_utils.cpp b/ydb/public/lib/ydb_cli/common/print_utils.cpp index 3bf11c12af2b..1bbf789204ed 100644 --- a/ydb/public/lib/ydb_cli/common/print_utils.cpp +++ b/ydb/public/lib/ydb_cli/common/print_utils.cpp @@ -54,7 +54,7 @@ void PrintSchemeEntry(IOutputStream& o, const NScheme::TSchemeEntry& entry, NCol TString PrettySize(ui64 size) { double sizeFormat = size; - return ToString(HumanReadableSize(sizeFormat, ESizeFormat::SF_QUANTITY)) + " B"; + return ToString(HumanReadableSize(sizeFormat, ESizeFormat::SF_QUANTITY)) + "B"; } TString PrettyNumber(ui64 number) { diff --git a/ydb/public/lib/ydb_cli/common/progress_indication.cpp b/ydb/public/lib/ydb_cli/common/progress_indication.cpp index 4e0ddd4932ff..62bd8866139c 100644 --- a/ydb/public/lib/ydb_cli/common/progress_indication.cpp +++ b/ydb/public/lib/ydb_cli/common/progress_indication.cpp @@ -12,7 +12,8 @@ TProgressIndication::TProgressIndication() { void TProgressIndication::UpdateProgress(const TCurrentStats& stats) { - CurrentStats = stats; + CurrentStats.ReadRows += stats.ReadRows; + CurrentStats.ReadBytes += stats.ReadBytes; } void TProgressIndication::SetDurationUs(ui64 durationUs) { From 889c9bd98b75d36d9fa96bb9d629d4948e6afd66 Mon Sep 17 00:00:00 2001 From: Nikolay Shumkov Date: Mon, 31 Mar 2025 15:24:26 +0300 Subject: [PATCH 05/10] Fixes --- .../result.output | 18 +++++++++ .../result.output | 13 +++++++ .../result.output | 13 +++++++ .../result.output | 22 +++++++++++ .../result.output | 22 +++++++++++ .../result.output | 13 +++++++ .../result.output | 36 ++++++++++++++++++ .../result.output | 36 ++++++++++++++++++ .../result.output | 36 ++++++++++++++++++ .../result.output | 36 ++++++++++++++++++ .../result.output | 12 ++++++ .../result.output | 13 +++++++ .../result.output | 13 +++++++ .../result.output | 12 ++++++ .../result.output | 37 +++++++++++++++++++ .../result.output | 36 ++++++++++++++++++ .../result.output | 36 ++++++++++++++++++ .../result.output | 36 ++++++++++++++++++ .../result.output | 36 ++++++++++++++++++ .../result.output | 37 +++++++++++++++++++ .../result.output | 36 ++++++++++++++++++ .../result.output | 36 ++++++++++++++++++ .../result.output | 12 ++++++ .../result.output | 13 +++++++ .../result.output | 12 ++++++ .../result.output | 12 ++++++ .../result.output | 13 +++++++ .../result.output | 12 ++++++ .../result.output | 36 ++++++++++++++++++ .../result.output | 36 ++++++++++++++++++ .../result.output | 13 +++++++ .../result.output | 13 +++++++ .../result.output | 13 +++++++ .../result.output | 12 ++++++ 34 files changed, 782 insertions(+) diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlFromStdinWithWideOutput.test_wide_table/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlFromStdinWithWideOutput.test_wide_table/result.output index 36bbdf13246b..f68ff39d1355 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlFromStdinWithWideOutput.test_wide_table/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlFromStdinWithWideOutput.test_wide_table/result.output @@ -2,3 +2,21 @@ │ box │ container_id │ context │ host │ log_level │ log_level_int │ logger_name │ message │ node_fqdn │ pod │ pod_persistent_fqdn │ pod_transient_fqdn │ request_id │ saved_at │ seq │ stack_trace │ thread_name │ timestamp │ user_id │ version │ workload │ ├─────┼──────────────┼─────────┼──────┼───────────┼───────────────┼─────────────┼─────────┼───────────┼─────┼─────────────────────┼────────────────────┼────────────┼──────────┼─────┼─────────────┼─────────────┼───────────┼─────────┼─────────┼──────────┤ └─────┴──────────────┴─────────┴──────┴───────────┴───────────────┴─────────────┴─────────┴───────────┴─────┴─────────────────────┴────────────────────┴────────────┴──────────┴─────┴─────────────┴─────────────┴───────────┴─────────┴─────────┴──────────┘ + +Statistics: +query_phases { + duration_us: 9505 + table_access { + name: "/Root/test_wide_table0" + partitions_count: 1 + } + cpu_time_us: 10341 + affected_shards: 1 +} +compilation { + duration_us: 95886 + cpu_time_us: 91195 +} +process_cpu_time_us: 452 +total_duration_us: 109834 +total_cpu_time_us: 101988 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_list/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_list/result.output index 97875fb3960b..e8249c460566 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_list/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_list/result.output @@ -3,3 +3,16 @@ ├─────────┤ │ [1,2,3] │ └─────────┘ + +Statistics: +query_phases { + duration_us: 2163 + cpu_time_us: 1985 +} +compilation { + duration_us: 58302 + cpu_time_us: 55688 +} +process_cpu_time_us: 442 +total_duration_us: 63521 +total_cpu_time_us: 58115 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_struct/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_struct/result.output index 0ed57334ae07..d22978ad50df 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_struct/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_struct/result.output @@ -5,3 +5,16 @@ ├─────┼───────┤ │ 2 │ "two" │ └─────┴───────┘ + +Statistics: +query_phases { + duration_us: 2139 + cpu_time_us: 1946 +} +compilation { + duration_us: 80703 + cpu_time_us: 78581 +} +process_cpu_time_us: 419 +total_duration_us: 86190 +total_cpu_time_us: 80946 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_uint32/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_uint32/result.output index 6c13a7ac4525..115d90106a0c 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_uint32/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_uint32/result.output @@ -3,3 +3,25 @@ ├──────┼─────┼───────┤ │ 1111 │ 1 │ "one" │ └──────┴─────┴───────┘ + +Statistics: +query_phases { + duration_us: 3362 + table_access { + name: "/Root/test_uint320" + reads { + rows: 1 + bytes: 15 + } + partitions_count: 1 + } + cpu_time_us: 2548 + affected_shards: 1 +} +compilation { + duration_us: 85265 + cpu_time_us: 81840 +} +process_cpu_time_us: 510 +total_duration_us: 92049 +total_cpu_time_us: 84898 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_uint64_and_string/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_uint64_and_string/result.output index b1f9f9786544..c2a9e4a02f0b 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_uint64_and_string/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_uint64_and_string/result.output @@ -5,3 +5,25 @@ ├──────┼─────┼─────────┤ │ 7777 │ 7 │ "seven" │ └──────┴─────┴─────────┘ + +Statistics: +query_phases { + duration_us: 6623 + table_access { + name: "/Root/test_uint64_and_string0" + reads { + rows: 5 + bytes: 80 + } + partitions_count: 1 + } + cpu_time_us: 4538 + affected_shards: 1 +} +compilation { + duration_us: 121480 + cpu_time_us: 117896 +} +process_cpu_time_us: 578 +total_duration_us: 130235 +total_cpu_time_us: 123012 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromJson.test_script_from_file/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromJson.test_script_from_file/result.output index def6611f5890..368d5d219c5b 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromJson.test_script_from_file/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromJson.test_script_from_file/result.output @@ -3,3 +3,16 @@ ├───┤ │ 3 │ └───┘ + +Statistics: +query_phases { + duration_us: 2617 + cpu_time_us: 2351 +} +compilation { + duration_us: 53887 + cpu_time_us: 51604 +} +process_cpu_time_us: 353 +total_duration_us: 59651 +total_cpu_time_us: 54308 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_csv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_csv_sql_/result.output index c25ecea1647e..dc8aec012ddb 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_csv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_csv_sql_/result.output @@ -3,13 +3,49 @@ ├──────────────────────────────────────────────────────────────────┤ │ [{"id":1,"s":"Line1"},{"id":2,"s":"Line2"},{"id":3,"s":"Line3"}] │ └──────────────────────────────────────────────────────────────────┘ + +Statistics: +query_phases { + duration_us: 1848 + cpu_time_us: 1671 +} +compilation { + from_cache: true +} +process_cpu_time_us: 261 +total_duration_us: 3760 +total_cpu_time_us: 1932 ┌──────────────────────────────────────────────────────────────────┐ │ arr │ ├──────────────────────────────────────────────────────────────────┤ │ [{"id":4,"s":"Line4"},{"id":5,"s":"Line5"},{"id":6,"s":"Line6"}] │ └──────────────────────────────────────────────────────────────────┘ + +Statistics: +query_phases { + duration_us: 1797 + cpu_time_us: 1633 +} +compilation { + from_cache: true +} +process_cpu_time_us: 184 +total_duration_us: 3613 +total_cpu_time_us: 1817 ┌──────────────────────────────────────────────────────────────────┐ │ arr │ ├──────────────────────────────────────────────────────────────────┤ │ [{"id":7,"s":"Line7"},{"id":8,"s":"Line8"},{"id":9,"s":"Line9"}] │ └──────────────────────────────────────────────────────────────────┘ + +Statistics: +query_phases { + duration_us: 1571 + cpu_time_us: 1431 +} +compilation { + from_cache: true +} +process_cpu_time_us: 152 +total_duration_us: 3204 +total_cpu_time_us: 1583 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_json_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_json_sql_/result.output index c25ecea1647e..fd37b7574f08 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_json_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_json_sql_/result.output @@ -3,13 +3,49 @@ ├──────────────────────────────────────────────────────────────────┤ │ [{"id":1,"s":"Line1"},{"id":2,"s":"Line2"},{"id":3,"s":"Line3"}] │ └──────────────────────────────────────────────────────────────────┘ + +Statistics: +query_phases { + duration_us: 2043 + cpu_time_us: 1869 +} +compilation { + from_cache: true +} +process_cpu_time_us: 199 +total_duration_us: 4079 +total_cpu_time_us: 2068 ┌──────────────────────────────────────────────────────────────────┐ │ arr │ ├──────────────────────────────────────────────────────────────────┤ │ [{"id":4,"s":"Line4"},{"id":5,"s":"Line5"},{"id":6,"s":"Line6"}] │ └──────────────────────────────────────────────────────────────────┘ + +Statistics: +query_phases { + duration_us: 1818 + cpu_time_us: 1661 +} +compilation { + from_cache: true +} +process_cpu_time_us: 200 +total_duration_us: 3619 +total_cpu_time_us: 1861 ┌──────────────────────────────────────────────────────────────────┐ │ arr │ ├──────────────────────────────────────────────────────────────────┤ │ [{"id":7,"s":"Line7"},{"id":8,"s":"Line8"},{"id":9,"s":"Line9"}] │ └──────────────────────────────────────────────────────────────────┘ + +Statistics: +query_phases { + duration_us: 1943 + cpu_time_us: 1799 +} +compilation { + from_cache: true +} +process_cpu_time_us: 178 +total_duration_us: 3730 +total_cpu_time_us: 1977 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_raw_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_raw_sql_/result.output index 8a47cb4d6f9c..88fd3bfe6595 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_raw_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_raw_sql_/result.output @@ -3,13 +3,49 @@ ├───────────────────────────┤ │ ["Line1","Line2","Line3"] │ └───────────────────────────┘ + +Statistics: +query_phases { + duration_us: 2127 + cpu_time_us: 1941 +} +compilation { + from_cache: true +} +process_cpu_time_us: 163 +total_duration_us: 4035 +total_cpu_time_us: 2104 ┌───────────────────────────┐ │ s │ ├───────────────────────────┤ │ ["Line4","Line5","Line6"] │ └───────────────────────────┘ + +Statistics: +query_phases { + duration_us: 1636 + cpu_time_us: 1463 +} +compilation { + from_cache: true +} +process_cpu_time_us: 141 +total_duration_us: 3393 +total_cpu_time_us: 1604 ┌───────────────────────────┐ │ s │ ├───────────────────────────┤ │ ["Line7","Line8","Line9"] │ └───────────────────────────┘ + +Statistics: +query_phases { + duration_us: 1848 + cpu_time_us: 1696 +} +compilation { + from_cache: true +} +process_cpu_time_us: 155 +total_duration_us: 3749 +total_cpu_time_us: 1851 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_tsv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_tsv_sql_/result.output index c25ecea1647e..a34a2c0b38e3 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_tsv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_tsv_sql_/result.output @@ -3,13 +3,49 @@ ├──────────────────────────────────────────────────────────────────┤ │ [{"id":1,"s":"Line1"},{"id":2,"s":"Line2"},{"id":3,"s":"Line3"}] │ └──────────────────────────────────────────────────────────────────┘ + +Statistics: +query_phases { + duration_us: 1854 + cpu_time_us: 1689 +} +compilation { + from_cache: true +} +process_cpu_time_us: 198 +total_duration_us: 3601 +total_cpu_time_us: 1887 ┌──────────────────────────────────────────────────────────────────┐ │ arr │ ├──────────────────────────────────────────────────────────────────┤ │ [{"id":4,"s":"Line4"},{"id":5,"s":"Line5"},{"id":6,"s":"Line6"}] │ └──────────────────────────────────────────────────────────────────┘ + +Statistics: +query_phases { + duration_us: 1674 + cpu_time_us: 1547 +} +compilation { + from_cache: true +} +process_cpu_time_us: 189 +total_duration_us: 3462 +total_cpu_time_us: 1736 ┌──────────────────────────────────────────────────────────────────┐ │ arr │ ├──────────────────────────────────────────────────────────────────┤ │ [{"id":7,"s":"Line7"},{"id":8,"s":"Line8"},{"id":9,"s":"Line9"}] │ └──────────────────────────────────────────────────────────────────┘ + +Statistics: +query_phases { + duration_us: 1742 + cpu_time_us: 1579 +} +compilation { + from_cache: true +} +process_cpu_time_us: 187 +total_duration_us: 3486 +total_cpu_time_us: 1766 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_csv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_csv_sql_/result.output index 5681171a943f..6d08bed65c53 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_csv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_csv_sql_/result.output @@ -3,3 +3,15 @@ ├────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤ │ [{"id":1,"s":"Line1"},{"id":2,"s":"Line2"},{"id":3,"s":"Line3"},{"id":4,"s":"Line4"},{"id":5,"s":"Line5"},{"id":6,"s":"Line6"},{"id":7,"s":"Line7"},{"id":8,"s":"Line8"},{"id":9,"s":"Line9"}] │ └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ + +Statistics: +query_phases { + duration_us: 1991 + cpu_time_us: 1777 +} +compilation { + from_cache: true +} +process_cpu_time_us: 226 +total_duration_us: 4080 +total_cpu_time_us: 2003 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_json_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_json_sql_/result.output index 5681171a943f..67df6c2fc04a 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_json_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_json_sql_/result.output @@ -3,3 +3,16 @@ ├────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤ │ [{"id":1,"s":"Line1"},{"id":2,"s":"Line2"},{"id":3,"s":"Line3"},{"id":4,"s":"Line4"},{"id":5,"s":"Line5"},{"id":6,"s":"Line6"},{"id":7,"s":"Line7"},{"id":8,"s":"Line8"},{"id":9,"s":"Line9"}] │ └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ + +Statistics: +query_phases { + duration_us: 2188 + cpu_time_us: 1990 +} +compilation { + duration_us: 61179 + cpu_time_us: 58698 +} +process_cpu_time_us: 515 +total_duration_us: 66660 +total_cpu_time_us: 61203 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_raw_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_raw_sql_/result.output index 288994848ab7..d58a19702cbe 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_raw_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_raw_sql_/result.output @@ -3,3 +3,16 @@ ├───────────────────────────┤ │ ["Line1","Line2","Line3"] │ └───────────────────────────┘ + +Statistics: +query_phases { + duration_us: 3438 + cpu_time_us: 3169 +} +compilation { + duration_us: 53925 + cpu_time_us: 51626 +} +process_cpu_time_us: 397 +total_duration_us: 60404 +total_cpu_time_us: 55192 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_tsv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_tsv_sql_/result.output index 5681171a943f..6ab4e5d4ae9b 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_tsv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_tsv_sql_/result.output @@ -3,3 +3,15 @@ ├────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤ │ [{"id":1,"s":"Line1"},{"id":2,"s":"Line2"},{"id":3,"s":"Line3"},{"id":4,"s":"Line4"},{"id":5,"s":"Line5"},{"id":6,"s":"Line6"},{"id":7,"s":"Line7"},{"id":8,"s":"Line8"},{"id":9,"s":"Line9"}] │ └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ + +Statistics: +query_phases { + duration_us: 2091 + cpu_time_us: 1894 +} +compilation { + from_cache: true +} +process_cpu_time_us: 207 +total_duration_us: 4195 +total_cpu_time_us: 2101 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_bad_header_csv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_bad_header_csv_sql_/result.output index a069d456de48..14775fc9352a 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_bad_header_csv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_bad_header_csv_sql_/result.output @@ -3,13 +3,50 @@ ├───┼───┤ │ 1 │ 1 │ └───┴───┘ + +Statistics: +query_phases { + duration_us: 2238 + cpu_time_us: 2013 +} +compilation { + duration_us: 55383 + cpu_time_us: 53421 +} +process_cpu_time_us: 413 +total_duration_us: 60509 +total_cpu_time_us: 55847 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 2 │ 2 │ └───┴───┘ + +Statistics: +query_phases { + duration_us: 1703 + cpu_time_us: 1539 +} +compilation { + from_cache: true +} +process_cpu_time_us: 137 +total_duration_us: 3454 +total_cpu_time_us: 1676 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 3 │ 3 │ └───┴───┘ + +Statistics: +query_phases { + duration_us: 1965 + cpu_time_us: 1784 +} +compilation { + from_cache: true +} +process_cpu_time_us: 166 +total_duration_us: 3686 +total_cpu_time_us: 1950 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_bad_header_tsv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_bad_header_tsv_sql_/result.output index a069d456de48..aafb6cdeaf98 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_bad_header_tsv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_bad_header_tsv_sql_/result.output @@ -3,13 +3,49 @@ ├───┼───┤ │ 1 │ 1 │ └───┴───┘ + +Statistics: +query_phases { + duration_us: 1680 + cpu_time_us: 1525 +} +compilation { + from_cache: true +} +process_cpu_time_us: 131 +total_duration_us: 3390 +total_cpu_time_us: 1656 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 2 │ 2 │ └───┴───┘ + +Statistics: +query_phases { + duration_us: 1725 + cpu_time_us: 1590 +} +compilation { + from_cache: true +} +process_cpu_time_us: 122 +total_duration_us: 3390 +total_cpu_time_us: 1712 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 3 │ 3 │ └───┴───┘ + +Statistics: +query_phases { + duration_us: 2183 + cpu_time_us: 2071 +} +compilation { + from_cache: true +} +process_cpu_time_us: 169 +total_duration_us: 4331 +total_cpu_time_us: 2240 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_no_header_csv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_no_header_csv_sql_/result.output index a069d456de48..ec4b29c3b691 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_no_header_csv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_no_header_csv_sql_/result.output @@ -3,13 +3,49 @@ ├───┼───┤ │ 1 │ 1 │ └───┴───┘ + +Statistics: +query_phases { + duration_us: 1866 + cpu_time_us: 1669 +} +compilation { + from_cache: true +} +process_cpu_time_us: 167 +total_duration_us: 3693 +total_cpu_time_us: 1836 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 2 │ 2 │ └───┴───┘ + +Statistics: +query_phases { + duration_us: 1539 + cpu_time_us: 1375 +} +compilation { + from_cache: true +} +process_cpu_time_us: 149 +total_duration_us: 3366 +total_cpu_time_us: 1524 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 3 │ 3 │ └───┴───┘ + +Statistics: +query_phases { + duration_us: 1473 + cpu_time_us: 1337 +} +compilation { + from_cache: true +} +process_cpu_time_us: 111 +total_duration_us: 3128 +total_cpu_time_us: 1448 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_no_header_tsv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_no_header_tsv_sql_/result.output index a069d456de48..cf9d1c318c5a 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_no_header_tsv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_no_header_tsv_sql_/result.output @@ -3,13 +3,49 @@ ├───┼───┤ │ 1 │ 1 │ └───┴───┘ + +Statistics: +query_phases { + duration_us: 1696 + cpu_time_us: 1521 +} +compilation { + from_cache: true +} +process_cpu_time_us: 160 +total_duration_us: 3384 +total_cpu_time_us: 1681 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 2 │ 2 │ └───┴───┘ + +Statistics: +query_phases { + duration_us: 1621 + cpu_time_us: 1481 +} +compilation { + from_cache: true +} +process_cpu_time_us: 160 +total_duration_us: 3306 +total_cpu_time_us: 1641 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 3 │ 3 │ └───┴───┘ + +Statistics: +query_phases { + duration_us: 1454 + cpu_time_us: 1324 +} +compilation { + from_cache: true +} +process_cpu_time_us: 129 +total_duration_us: 2970 +total_cpu_time_us: 1453 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_csv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_csv_sql_/result.output index d10b1e31be72..915ebe71e759 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_csv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_csv_sql_/result.output @@ -3,13 +3,49 @@ ├─────────────┼─────┤ │ "Some text" │ 1 │ └─────────────┴─────┘ + +Statistics: +query_phases { + duration_us: 1760 + cpu_time_us: 1577 +} +compilation { + from_cache: true +} +process_cpu_time_us: 152 +total_duration_us: 3574 +total_cpu_time_us: 1729 ┌─────────────────────┬─────┐ │ s │ num │ ├─────────────────────┼─────┤ │ "Строка 1\nСтрока2" │ 2 │ └─────────────────────┴─────┘ + +Statistics: +query_phases { + duration_us: 1905 + cpu_time_us: 1728 +} +compilation { + from_cache: true +} +process_cpu_time_us: 179 +total_duration_us: 3807 +total_cpu_time_us: 1907 ┌───────────┬─────┐ │ s │ num │ ├───────────┼─────┤ │ "Abacaba" │ 3 │ └───────────┴─────┘ + +Statistics: +query_phases { + duration_us: 1610 + cpu_time_us: 1501 +} +compilation { + from_cache: true +} +process_cpu_time_us: 146 +total_duration_us: 3428 +total_cpu_time_us: 1647 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_json_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_json_sql_/result.output index d10b1e31be72..a6d273b551f9 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_json_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_json_sql_/result.output @@ -3,13 +3,50 @@ ├─────────────┼─────┤ │ "Some text" │ 1 │ └─────────────┴─────┘ + +Statistics: +query_phases { + duration_us: 2582 + cpu_time_us: 2399 +} +compilation { + duration_us: 59323 + cpu_time_us: 57046 +} +process_cpu_time_us: 359 +total_duration_us: 64675 +total_cpu_time_us: 59804 ┌─────────────────────┬─────┐ │ s │ num │ ├─────────────────────┼─────┤ │ "Строка 1\nСтрока2" │ 2 │ └─────────────────────┴─────┘ + +Statistics: +query_phases { + duration_us: 1820 + cpu_time_us: 1624 +} +compilation { + from_cache: true +} +process_cpu_time_us: 147 +total_duration_us: 3471 +total_cpu_time_us: 1771 ┌───────────┬─────┐ │ s │ num │ ├───────────┼─────┤ │ "Abacaba" │ 3 │ └───────────┴─────┘ + +Statistics: +query_phases { + duration_us: 1776 + cpu_time_us: 1608 +} +compilation { + from_cache: true +} +process_cpu_time_us: 167 +total_duration_us: 3648 +total_cpu_time_us: 1775 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_raw_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_raw_sql_/result.output index 8200beba35a1..6d451c05af13 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_raw_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_raw_sql_/result.output @@ -3,13 +3,49 @@ ├─────────┤ │ "Line1" │ └─────────┘ + +Statistics: +query_phases { + duration_us: 2073 + cpu_time_us: 1873 +} +compilation { + from_cache: true +} +process_cpu_time_us: 131 +total_duration_us: 4058 +total_cpu_time_us: 2004 ┌─────────┐ │ s │ ├─────────┤ │ "Line2" │ └─────────┘ + +Statistics: +query_phases { + duration_us: 1595 + cpu_time_us: 1399 +} +compilation { + from_cache: true +} +process_cpu_time_us: 119 +total_duration_us: 3216 +total_cpu_time_us: 1518 ┌─────────┐ │ s │ ├─────────┤ │ "Line3" │ └─────────┘ + +Statistics: +query_phases { + duration_us: 1332 + cpu_time_us: 1186 +} +compilation { + from_cache: true +} +process_cpu_time_us: 103 +total_duration_us: 2907 +total_cpu_time_us: 1289 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_tsv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_tsv_sql_/result.output index d10b1e31be72..e7c0f6918974 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_tsv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_tsv_sql_/result.output @@ -3,13 +3,49 @@ ├─────────────┼─────┤ │ "Some text" │ 1 │ └─────────────┴─────┘ + +Statistics: +query_phases { + duration_us: 1722 + cpu_time_us: 1574 +} +compilation { + from_cache: true +} +process_cpu_time_us: 163 +total_duration_us: 3467 +total_cpu_time_us: 1737 ┌─────────────────────┬─────┐ │ s │ num │ ├─────────────────────┼─────┤ │ "Строка 1\nСтрока2" │ 2 │ └─────────────────────┴─────┘ + +Statistics: +query_phases { + duration_us: 1586 + cpu_time_us: 1430 +} +compilation { + from_cache: true +} +process_cpu_time_us: 145 +total_duration_us: 3349 +total_cpu_time_us: 1575 ┌───────────┬─────┐ │ s │ num │ ├───────────┼─────┤ │ "Abacaba" │ 3 │ └───────────┴─────┘ + +Statistics: +query_phases { + duration_us: 2006 + cpu_time_us: 1815 +} +compilation { + from_cache: true +} +process_cpu_time_us: 189 +total_duration_us: 4099 +total_cpu_time_us: 2004 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_csv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_csv_sql_/result.output index d53efa435f76..dee4cf31c696 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_csv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_csv_sql_/result.output @@ -3,3 +3,15 @@ ├────┤ │ 12 │ └────┘ + +Statistics: +query_phases { + duration_us: 2192 + cpu_time_us: 1918 +} +compilation { + from_cache: true +} +process_cpu_time_us: 168 +total_duration_us: 4219 +total_cpu_time_us: 2086 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_json_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_json_sql_/result.output index d53efa435f76..1e536ceef1c8 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_json_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_json_sql_/result.output @@ -3,3 +3,16 @@ ├────┤ │ 12 │ └────┘ + +Statistics: +query_phases { + duration_us: 2133 + cpu_time_us: 1930 +} +compilation { + duration_us: 51640 + cpu_time_us: 49440 +} +process_cpu_time_us: 346 +total_duration_us: 56670 +total_cpu_time_us: 51716 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_tsv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_tsv_sql_/result.output index d53efa435f76..daf593f16d27 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_tsv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_tsv_sql_/result.output @@ -3,3 +3,15 @@ ├────┤ │ 12 │ └────┘ + +Statistics: +query_phases { + duration_us: 1844 + cpu_time_us: 1693 +} +compilation { + from_cache: true +} +process_cpu_time_us: 159 +total_duration_us: 3673 +total_cpu_time_us: 1852 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_csv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_csv_sql_/result.output index 66645b3ade92..090c8821903b 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_csv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_csv_sql_/result.output @@ -3,3 +3,15 @@ ├────────────────┼─────┤ │ "Some_s,tring" │ 32 │ └────────────────┴─────┘ + +Statistics: +query_phases { + duration_us: 1655 + cpu_time_us: 1514 +} +compilation { + from_cache: true +} +process_cpu_time_us: 165 +total_duration_us: 3363 +total_cpu_time_us: 1679 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_json_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_json_sql_/result.output index 030b389b08e0..a0cf635e9f3a 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_json_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_json_sql_/result.output @@ -3,3 +3,16 @@ ├───────────────┼─────┤ │ "Some_string" │ 32 │ └───────────────┴─────┘ + +Statistics: +query_phases { + duration_us: 2761 + cpu_time_us: 2576 +} +compilation { + duration_us: 67210 + cpu_time_us: 64883 +} +process_cpu_time_us: 450 +total_duration_us: 72932 +total_cpu_time_us: 67909 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_tsv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_tsv_sql_/result.output index 703d6430f768..f3c067c4120e 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_tsv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_tsv_sql_/result.output @@ -3,3 +3,15 @@ ├─────────────────┼─────┤ │ "Some_s\ttring" │ 32 │ └─────────────────┴─────┘ + +Statistics: +query_phases { + duration_us: 2157 + cpu_time_us: 1963 +} +compilation { + from_cache: true +} +process_cpu_time_us: 237 +total_duration_us: 4123 +total_cpu_time_us: 2200 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_skip_rows_csv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_skip_rows_csv_sql_/result.output index a069d456de48..c482656d2074 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_skip_rows_csv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_skip_rows_csv_sql_/result.output @@ -3,13 +3,49 @@ ├───┼───┤ │ 1 │ 1 │ └───┴───┘ + +Statistics: +query_phases { + duration_us: 1913 + cpu_time_us: 1711 +} +compilation { + from_cache: true +} +process_cpu_time_us: 157 +total_duration_us: 4080 +total_cpu_time_us: 1868 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 2 │ 2 │ └───┴───┘ + +Statistics: +query_phases { + duration_us: 1957 + cpu_time_us: 1784 +} +compilation { + from_cache: true +} +process_cpu_time_us: 154 +total_duration_us: 4014 +total_cpu_time_us: 1938 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 3 │ 3 │ └───┴───┘ + +Statistics: +query_phases { + duration_us: 1673 + cpu_time_us: 1532 +} +compilation { + from_cache: true +} +process_cpu_time_us: 128 +total_duration_us: 3476 +total_cpu_time_us: 1660 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_skip_rows_tsv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_skip_rows_tsv_sql_/result.output index a069d456de48..ecb7a5e027fc 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_skip_rows_tsv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_skip_rows_tsv_sql_/result.output @@ -3,13 +3,49 @@ ├───┼───┤ │ 1 │ 1 │ └───┴───┘ + +Statistics: +query_phases { + duration_us: 1826 + cpu_time_us: 1660 +} +compilation { + from_cache: true +} +process_cpu_time_us: 182 +total_duration_us: 3590 +total_cpu_time_us: 1842 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 2 │ 2 │ └───┴───┘ + +Statistics: +query_phases { + duration_us: 1515 + cpu_time_us: 1356 +} +compilation { + from_cache: true +} +process_cpu_time_us: 134 +total_duration_us: 3145 +total_cpu_time_us: 1490 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 3 │ 3 │ └───┴───┘ + +Statistics: +query_phases { + duration_us: 1523 + cpu_time_us: 1383 +} +compilation { + from_cache: true +} +process_cpu_time_us: 114 +total_duration_us: 3071 +total_cpu_time_us: 1497 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_csv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_csv_sql_/result.output index 126ddd550f43..b0dd18cf5397 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_csv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_csv_sql_/result.output @@ -3,3 +3,16 @@ ├─────────────────────────┤ │ {"id":1,"value":"ab,a"} │ └─────────────────────────┘ + +Statistics: +query_phases { + duration_us: 2009 + cpu_time_us: 1863 +} +compilation { + duration_us: 58114 + cpu_time_us: 56033 +} +process_cpu_time_us: 431 +total_duration_us: 63038 +total_cpu_time_us: 58327 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_json_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_json_sql_/result.output index f544f872041b..da4130712ece 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_json_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_json_sql_/result.output @@ -3,3 +3,16 @@ ├───────────┤ │ [1,2,3,4] │ └───────────┘ + +Statistics: +query_phases { + duration_us: 2031 + cpu_time_us: 1863 +} +compilation { + duration_us: 53131 + cpu_time_us: 50878 +} +process_cpu_time_us: 343 +total_duration_us: 57731 +total_cpu_time_us: 53084 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_raw_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_raw_sql_/result.output index 8ec00b9d1a3a..3e8e075e89c5 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_raw_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_raw_sql_/result.output @@ -3,3 +3,16 @@ ├─────────────────────────┤ │ "Line1\nLine2\nLine3\n" │ └─────────────────────────┘ + +Statistics: +query_phases { + duration_us: 2324 + cpu_time_us: 2184 +} +compilation { + duration_us: 53663 + cpu_time_us: 51072 +} +process_cpu_time_us: 424 +total_duration_us: 59144 +total_cpu_time_us: 53680 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_tsv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_tsv_sql_/result.output index d808b68ece34..f516dadd31cd 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_tsv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_tsv_sql_/result.output @@ -3,3 +3,15 @@ ├──────────────────────────┤ │ {"id":1,"value":"ab\ta"} │ └──────────────────────────┘ + +Statistics: +query_phases { + duration_us: 1711 + cpu_time_us: 1561 +} +compilation { + from_cache: true +} +process_cpu_time_us: 205 +total_duration_us: 3592 +total_cpu_time_us: 1766 From ef0a782fa84a42026b6e152eb4c57f61505b6e99 Mon Sep 17 00:00:00 2001 From: Nikolay Shumkov Date: Mon, 31 Mar 2025 18:21:24 +0300 Subject: [PATCH 06/10] Fixes --- .../result.output | 18 ------- .../result.output | 13 ----- .../result.output | 13 ----- .../result.output | 22 -------- .../result.output | 22 -------- .../result.output | 13 ----- .../result.output | 36 ------------- .../result.output | 36 ------------- .../result.output | 36 ------------- .../result.output | 36 ------------- .../result.output | 12 ----- .../result.output | 13 ----- .../result.output | 13 ----- .../result.output | 12 ----- .../result.output | 37 ------------- .../result.output | 36 ------------- .../result.output | 36 ------------- .../result.output | 36 ------------- .../result.output | 36 ------------- .../result.output | 37 ------------- .../result.output | 36 ------------- .../result.output | 36 ------------- .../result.output | 12 ----- .../result.output | 13 ----- .../result.output | 12 ----- .../result.output | 12 ----- .../result.output | 13 ----- .../result.output | 12 ----- .../result.output | 36 ------------- .../result.output | 36 ------------- .../result.output | 13 ----- .../result.output | 13 ----- .../result.output | 13 ----- .../result.output | 12 ----- ydb/tests/functional/ydb_cli/test_ydb_sql.py | 52 +++++++++---------- 35 files changed, 26 insertions(+), 808 deletions(-) diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlFromStdinWithWideOutput.test_wide_table/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlFromStdinWithWideOutput.test_wide_table/result.output index f68ff39d1355..36bbdf13246b 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlFromStdinWithWideOutput.test_wide_table/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlFromStdinWithWideOutput.test_wide_table/result.output @@ -2,21 +2,3 @@ │ box │ container_id │ context │ host │ log_level │ log_level_int │ logger_name │ message │ node_fqdn │ pod │ pod_persistent_fqdn │ pod_transient_fqdn │ request_id │ saved_at │ seq │ stack_trace │ thread_name │ timestamp │ user_id │ version │ workload │ ├─────┼──────────────┼─────────┼──────┼───────────┼───────────────┼─────────────┼─────────┼───────────┼─────┼─────────────────────┼────────────────────┼────────────┼──────────┼─────┼─────────────┼─────────────┼───────────┼─────────┼─────────┼──────────┤ └─────┴──────────────┴─────────┴──────┴───────────┴───────────────┴─────────────┴─────────┴───────────┴─────┴─────────────────────┴────────────────────┴────────────┴──────────┴─────┴─────────────┴─────────────┴───────────┴─────────┴─────────┴──────────┘ - -Statistics: -query_phases { - duration_us: 9505 - table_access { - name: "/Root/test_wide_table0" - partitions_count: 1 - } - cpu_time_us: 10341 - affected_shards: 1 -} -compilation { - duration_us: 95886 - cpu_time_us: 91195 -} -process_cpu_time_us: 452 -total_duration_us: 109834 -total_cpu_time_us: 101988 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_list/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_list/result.output index e8249c460566..97875fb3960b 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_list/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_list/result.output @@ -3,16 +3,3 @@ ├─────────┤ │ [1,2,3] │ └─────────┘ - -Statistics: -query_phases { - duration_us: 2163 - cpu_time_us: 1985 -} -compilation { - duration_us: 58302 - cpu_time_us: 55688 -} -process_cpu_time_us: 442 -total_duration_us: 63521 -total_cpu_time_us: 58115 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_struct/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_struct/result.output index d22978ad50df..0ed57334ae07 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_struct/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_struct/result.output @@ -5,16 +5,3 @@ ├─────┼───────┤ │ 2 │ "two" │ └─────┴───────┘ - -Statistics: -query_phases { - duration_us: 2139 - cpu_time_us: 1946 -} -compilation { - duration_us: 80703 - cpu_time_us: 78581 -} -process_cpu_time_us: 419 -total_duration_us: 86190 -total_cpu_time_us: 80946 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_uint32/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_uint32/result.output index 115d90106a0c..6c13a7ac4525 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_uint32/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_uint32/result.output @@ -3,25 +3,3 @@ ├──────┼─────┼───────┤ │ 1111 │ 1 │ "one" │ └──────┴─────┴───────┘ - -Statistics: -query_phases { - duration_us: 3362 - table_access { - name: "/Root/test_uint320" - reads { - rows: 1 - bytes: 15 - } - partitions_count: 1 - } - cpu_time_us: 2548 - affected_shards: 1 -} -compilation { - duration_us: 85265 - cpu_time_us: 81840 -} -process_cpu_time_us: 510 -total_duration_us: 92049 -total_cpu_time_us: 84898 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_uint64_and_string/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_uint64_and_string/result.output index c2a9e4a02f0b..b1f9f9786544 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_uint64_and_string/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParams.test_uint64_and_string/result.output @@ -5,25 +5,3 @@ ├──────┼─────┼─────────┤ │ 7777 │ 7 │ "seven" │ └──────┴─────┴─────────┘ - -Statistics: -query_phases { - duration_us: 6623 - table_access { - name: "/Root/test_uint64_and_string0" - reads { - rows: 5 - bytes: 80 - } - partitions_count: 1 - } - cpu_time_us: 4538 - affected_shards: 1 -} -compilation { - duration_us: 121480 - cpu_time_us: 117896 -} -process_cpu_time_us: 578 -total_duration_us: 130235 -total_cpu_time_us: 123012 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromJson.test_script_from_file/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromJson.test_script_from_file/result.output index 368d5d219c5b..def6611f5890 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromJson.test_script_from_file/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromJson.test_script_from_file/result.output @@ -3,16 +3,3 @@ ├───┤ │ 3 │ └───┘ - -Statistics: -query_phases { - duration_us: 2617 - cpu_time_us: 2351 -} -compilation { - duration_us: 53887 - cpu_time_us: 51604 -} -process_cpu_time_us: 353 -total_duration_us: 59651 -total_cpu_time_us: 54308 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_csv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_csv_sql_/result.output index dc8aec012ddb..c25ecea1647e 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_csv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_csv_sql_/result.output @@ -3,49 +3,13 @@ ├──────────────────────────────────────────────────────────────────┤ │ [{"id":1,"s":"Line1"},{"id":2,"s":"Line2"},{"id":3,"s":"Line3"}] │ └──────────────────────────────────────────────────────────────────┘ - -Statistics: -query_phases { - duration_us: 1848 - cpu_time_us: 1671 -} -compilation { - from_cache: true -} -process_cpu_time_us: 261 -total_duration_us: 3760 -total_cpu_time_us: 1932 ┌──────────────────────────────────────────────────────────────────┐ │ arr │ ├──────────────────────────────────────────────────────────────────┤ │ [{"id":4,"s":"Line4"},{"id":5,"s":"Line5"},{"id":6,"s":"Line6"}] │ └──────────────────────────────────────────────────────────────────┘ - -Statistics: -query_phases { - duration_us: 1797 - cpu_time_us: 1633 -} -compilation { - from_cache: true -} -process_cpu_time_us: 184 -total_duration_us: 3613 -total_cpu_time_us: 1817 ┌──────────────────────────────────────────────────────────────────┐ │ arr │ ├──────────────────────────────────────────────────────────────────┤ │ [{"id":7,"s":"Line7"},{"id":8,"s":"Line8"},{"id":9,"s":"Line9"}] │ └──────────────────────────────────────────────────────────────────┘ - -Statistics: -query_phases { - duration_us: 1571 - cpu_time_us: 1431 -} -compilation { - from_cache: true -} -process_cpu_time_us: 152 -total_duration_us: 3204 -total_cpu_time_us: 1583 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_json_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_json_sql_/result.output index fd37b7574f08..c25ecea1647e 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_json_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_json_sql_/result.output @@ -3,49 +3,13 @@ ├──────────────────────────────────────────────────────────────────┤ │ [{"id":1,"s":"Line1"},{"id":2,"s":"Line2"},{"id":3,"s":"Line3"}] │ └──────────────────────────────────────────────────────────────────┘ - -Statistics: -query_phases { - duration_us: 2043 - cpu_time_us: 1869 -} -compilation { - from_cache: true -} -process_cpu_time_us: 199 -total_duration_us: 4079 -total_cpu_time_us: 2068 ┌──────────────────────────────────────────────────────────────────┐ │ arr │ ├──────────────────────────────────────────────────────────────────┤ │ [{"id":4,"s":"Line4"},{"id":5,"s":"Line5"},{"id":6,"s":"Line6"}] │ └──────────────────────────────────────────────────────────────────┘ - -Statistics: -query_phases { - duration_us: 1818 - cpu_time_us: 1661 -} -compilation { - from_cache: true -} -process_cpu_time_us: 200 -total_duration_us: 3619 -total_cpu_time_us: 1861 ┌──────────────────────────────────────────────────────────────────┐ │ arr │ ├──────────────────────────────────────────────────────────────────┤ │ [{"id":7,"s":"Line7"},{"id":8,"s":"Line8"},{"id":9,"s":"Line9"}] │ └──────────────────────────────────────────────────────────────────┘ - -Statistics: -query_phases { - duration_us: 1943 - cpu_time_us: 1799 -} -compilation { - from_cache: true -} -process_cpu_time_us: 178 -total_duration_us: 3730 -total_cpu_time_us: 1977 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_raw_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_raw_sql_/result.output index 88fd3bfe6595..8a47cb4d6f9c 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_raw_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_raw_sql_/result.output @@ -3,49 +3,13 @@ ├───────────────────────────┤ │ ["Line1","Line2","Line3"] │ └───────────────────────────┘ - -Statistics: -query_phases { - duration_us: 2127 - cpu_time_us: 1941 -} -compilation { - from_cache: true -} -process_cpu_time_us: 163 -total_duration_us: 4035 -total_cpu_time_us: 2104 ┌───────────────────────────┐ │ s │ ├───────────────────────────┤ │ ["Line4","Line5","Line6"] │ └───────────────────────────┘ - -Statistics: -query_phases { - duration_us: 1636 - cpu_time_us: 1463 -} -compilation { - from_cache: true -} -process_cpu_time_us: 141 -total_duration_us: 3393 -total_cpu_time_us: 1604 ┌───────────────────────────┐ │ s │ ├───────────────────────────┤ │ ["Line7","Line8","Line9"] │ └───────────────────────────┘ - -Statistics: -query_phases { - duration_us: 1848 - cpu_time_us: 1696 -} -compilation { - from_cache: true -} -process_cpu_time_us: 155 -total_duration_us: 3749 -total_cpu_time_us: 1851 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_tsv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_tsv_sql_/result.output index a34a2c0b38e3..c25ecea1647e 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_tsv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_adaptive_tsv_sql_/result.output @@ -3,49 +3,13 @@ ├──────────────────────────────────────────────────────────────────┤ │ [{"id":1,"s":"Line1"},{"id":2,"s":"Line2"},{"id":3,"s":"Line3"}] │ └──────────────────────────────────────────────────────────────────┘ - -Statistics: -query_phases { - duration_us: 1854 - cpu_time_us: 1689 -} -compilation { - from_cache: true -} -process_cpu_time_us: 198 -total_duration_us: 3601 -total_cpu_time_us: 1887 ┌──────────────────────────────────────────────────────────────────┐ │ arr │ ├──────────────────────────────────────────────────────────────────┤ │ [{"id":4,"s":"Line4"},{"id":5,"s":"Line5"},{"id":6,"s":"Line6"}] │ └──────────────────────────────────────────────────────────────────┘ - -Statistics: -query_phases { - duration_us: 1674 - cpu_time_us: 1547 -} -compilation { - from_cache: true -} -process_cpu_time_us: 189 -total_duration_us: 3462 -total_cpu_time_us: 1736 ┌──────────────────────────────────────────────────────────────────┐ │ arr │ ├──────────────────────────────────────────────────────────────────┤ │ [{"id":7,"s":"Line7"},{"id":8,"s":"Line8"},{"id":9,"s":"Line9"}] │ └──────────────────────────────────────────────────────────────────┘ - -Statistics: -query_phases { - duration_us: 1742 - cpu_time_us: 1579 -} -compilation { - from_cache: true -} -process_cpu_time_us: 187 -total_duration_us: 3486 -total_cpu_time_us: 1766 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_csv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_csv_sql_/result.output index 6d08bed65c53..5681171a943f 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_csv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_csv_sql_/result.output @@ -3,15 +3,3 @@ ├────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤ │ [{"id":1,"s":"Line1"},{"id":2,"s":"Line2"},{"id":3,"s":"Line3"},{"id":4,"s":"Line4"},{"id":5,"s":"Line5"},{"id":6,"s":"Line6"},{"id":7,"s":"Line7"},{"id":8,"s":"Line8"},{"id":9,"s":"Line9"}] │ └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - -Statistics: -query_phases { - duration_us: 1991 - cpu_time_us: 1777 -} -compilation { - from_cache: true -} -process_cpu_time_us: 226 -total_duration_us: 4080 -total_cpu_time_us: 2003 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_json_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_json_sql_/result.output index 67df6c2fc04a..5681171a943f 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_json_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_json_sql_/result.output @@ -3,16 +3,3 @@ ├────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤ │ [{"id":1,"s":"Line1"},{"id":2,"s":"Line2"},{"id":3,"s":"Line3"},{"id":4,"s":"Line4"},{"id":5,"s":"Line5"},{"id":6,"s":"Line6"},{"id":7,"s":"Line7"},{"id":8,"s":"Line8"},{"id":9,"s":"Line9"}] │ └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - -Statistics: -query_phases { - duration_us: 2188 - cpu_time_us: 1990 -} -compilation { - duration_us: 61179 - cpu_time_us: 58698 -} -process_cpu_time_us: 515 -total_duration_us: 66660 -total_cpu_time_us: 61203 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_raw_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_raw_sql_/result.output index d58a19702cbe..288994848ab7 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_raw_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_raw_sql_/result.output @@ -3,16 +3,3 @@ ├───────────────────────────┤ │ ["Line1","Line2","Line3"] │ └───────────────────────────┘ - -Statistics: -query_phases { - duration_us: 3438 - cpu_time_us: 3169 -} -compilation { - duration_us: 53925 - cpu_time_us: 51626 -} -process_cpu_time_us: 397 -total_duration_us: 60404 -total_cpu_time_us: 55192 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_tsv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_tsv_sql_/result.output index 6ab4e5d4ae9b..5681171a943f 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_tsv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_batching_full_tsv_sql_/result.output @@ -3,15 +3,3 @@ ├────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤ │ [{"id":1,"s":"Line1"},{"id":2,"s":"Line2"},{"id":3,"s":"Line3"},{"id":4,"s":"Line4"},{"id":5,"s":"Line5"},{"id":6,"s":"Line6"},{"id":7,"s":"Line7"},{"id":8,"s":"Line8"},{"id":9,"s":"Line9"}] │ └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ - -Statistics: -query_phases { - duration_us: 2091 - cpu_time_us: 1894 -} -compilation { - from_cache: true -} -process_cpu_time_us: 207 -total_duration_us: 4195 -total_cpu_time_us: 2101 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_bad_header_csv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_bad_header_csv_sql_/result.output index 14775fc9352a..a069d456de48 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_bad_header_csv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_bad_header_csv_sql_/result.output @@ -3,50 +3,13 @@ ├───┼───┤ │ 1 │ 1 │ └───┴───┘ - -Statistics: -query_phases { - duration_us: 2238 - cpu_time_us: 2013 -} -compilation { - duration_us: 55383 - cpu_time_us: 53421 -} -process_cpu_time_us: 413 -total_duration_us: 60509 -total_cpu_time_us: 55847 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 2 │ 2 │ └───┴───┘ - -Statistics: -query_phases { - duration_us: 1703 - cpu_time_us: 1539 -} -compilation { - from_cache: true -} -process_cpu_time_us: 137 -total_duration_us: 3454 -total_cpu_time_us: 1676 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 3 │ 3 │ └───┴───┘ - -Statistics: -query_phases { - duration_us: 1965 - cpu_time_us: 1784 -} -compilation { - from_cache: true -} -process_cpu_time_us: 166 -total_duration_us: 3686 -total_cpu_time_us: 1950 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_bad_header_tsv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_bad_header_tsv_sql_/result.output index aafb6cdeaf98..a069d456de48 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_bad_header_tsv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_bad_header_tsv_sql_/result.output @@ -3,49 +3,13 @@ ├───┼───┤ │ 1 │ 1 │ └───┴───┘ - -Statistics: -query_phases { - duration_us: 1680 - cpu_time_us: 1525 -} -compilation { - from_cache: true -} -process_cpu_time_us: 131 -total_duration_us: 3390 -total_cpu_time_us: 1656 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 2 │ 2 │ └───┴───┘ - -Statistics: -query_phases { - duration_us: 1725 - cpu_time_us: 1590 -} -compilation { - from_cache: true -} -process_cpu_time_us: 122 -total_duration_us: 3390 -total_cpu_time_us: 1712 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 3 │ 3 │ └───┴───┘ - -Statistics: -query_phases { - duration_us: 2183 - cpu_time_us: 2071 -} -compilation { - from_cache: true -} -process_cpu_time_us: 169 -total_duration_us: 4331 -total_cpu_time_us: 2240 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_no_header_csv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_no_header_csv_sql_/result.output index ec4b29c3b691..a069d456de48 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_no_header_csv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_no_header_csv_sql_/result.output @@ -3,49 +3,13 @@ ├───┼───┤ │ 1 │ 1 │ └───┴───┘ - -Statistics: -query_phases { - duration_us: 1866 - cpu_time_us: 1669 -} -compilation { - from_cache: true -} -process_cpu_time_us: 167 -total_duration_us: 3693 -total_cpu_time_us: 1836 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 2 │ 2 │ └───┴───┘ - -Statistics: -query_phases { - duration_us: 1539 - cpu_time_us: 1375 -} -compilation { - from_cache: true -} -process_cpu_time_us: 149 -total_duration_us: 3366 -total_cpu_time_us: 1524 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 3 │ 3 │ └───┴───┘ - -Statistics: -query_phases { - duration_us: 1473 - cpu_time_us: 1337 -} -compilation { - from_cache: true -} -process_cpu_time_us: 111 -total_duration_us: 3128 -total_cpu_time_us: 1448 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_no_header_tsv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_no_header_tsv_sql_/result.output index cf9d1c318c5a..a069d456de48 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_no_header_tsv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_columns_no_header_tsv_sql_/result.output @@ -3,49 +3,13 @@ ├───┼───┤ │ 1 │ 1 │ └───┴───┘ - -Statistics: -query_phases { - duration_us: 1696 - cpu_time_us: 1521 -} -compilation { - from_cache: true -} -process_cpu_time_us: 160 -total_duration_us: 3384 -total_cpu_time_us: 1681 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 2 │ 2 │ └───┴───┘ - -Statistics: -query_phases { - duration_us: 1621 - cpu_time_us: 1481 -} -compilation { - from_cache: true -} -process_cpu_time_us: 160 -total_duration_us: 3306 -total_cpu_time_us: 1641 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 3 │ 3 │ └───┴───┘ - -Statistics: -query_phases { - duration_us: 1454 - cpu_time_us: 1324 -} -compilation { - from_cache: true -} -process_cpu_time_us: 129 -total_duration_us: 2970 -total_cpu_time_us: 1453 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_csv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_csv_sql_/result.output index 915ebe71e759..d10b1e31be72 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_csv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_csv_sql_/result.output @@ -3,49 +3,13 @@ ├─────────────┼─────┤ │ "Some text" │ 1 │ └─────────────┴─────┘ - -Statistics: -query_phases { - duration_us: 1760 - cpu_time_us: 1577 -} -compilation { - from_cache: true -} -process_cpu_time_us: 152 -total_duration_us: 3574 -total_cpu_time_us: 1729 ┌─────────────────────┬─────┐ │ s │ num │ ├─────────────────────┼─────┤ │ "Строка 1\nСтрока2" │ 2 │ └─────────────────────┴─────┘ - -Statistics: -query_phases { - duration_us: 1905 - cpu_time_us: 1728 -} -compilation { - from_cache: true -} -process_cpu_time_us: 179 -total_duration_us: 3807 -total_cpu_time_us: 1907 ┌───────────┬─────┐ │ s │ num │ ├───────────┼─────┤ │ "Abacaba" │ 3 │ └───────────┴─────┘ - -Statistics: -query_phases { - duration_us: 1610 - cpu_time_us: 1501 -} -compilation { - from_cache: true -} -process_cpu_time_us: 146 -total_duration_us: 3428 -total_cpu_time_us: 1647 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_json_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_json_sql_/result.output index a6d273b551f9..d10b1e31be72 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_json_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_json_sql_/result.output @@ -3,50 +3,13 @@ ├─────────────┼─────┤ │ "Some text" │ 1 │ └─────────────┴─────┘ - -Statistics: -query_phases { - duration_us: 2582 - cpu_time_us: 2399 -} -compilation { - duration_us: 59323 - cpu_time_us: 57046 -} -process_cpu_time_us: 359 -total_duration_us: 64675 -total_cpu_time_us: 59804 ┌─────────────────────┬─────┐ │ s │ num │ ├─────────────────────┼─────┤ │ "Строка 1\nСтрока2" │ 2 │ └─────────────────────┴─────┘ - -Statistics: -query_phases { - duration_us: 1820 - cpu_time_us: 1624 -} -compilation { - from_cache: true -} -process_cpu_time_us: 147 -total_duration_us: 3471 -total_cpu_time_us: 1771 ┌───────────┬─────┐ │ s │ num │ ├───────────┼─────┤ │ "Abacaba" │ 3 │ └───────────┴─────┘ - -Statistics: -query_phases { - duration_us: 1776 - cpu_time_us: 1608 -} -compilation { - from_cache: true -} -process_cpu_time_us: 167 -total_duration_us: 3648 -total_cpu_time_us: 1775 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_raw_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_raw_sql_/result.output index 6d451c05af13..8200beba35a1 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_raw_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_raw_sql_/result.output @@ -3,49 +3,13 @@ ├─────────┤ │ "Line1" │ └─────────┘ - -Statistics: -query_phases { - duration_us: 2073 - cpu_time_us: 1873 -} -compilation { - from_cache: true -} -process_cpu_time_us: 131 -total_duration_us: 4058 -total_cpu_time_us: 2004 ┌─────────┐ │ s │ ├─────────┤ │ "Line2" │ └─────────┘ - -Statistics: -query_phases { - duration_us: 1595 - cpu_time_us: 1399 -} -compilation { - from_cache: true -} -process_cpu_time_us: 119 -total_duration_us: 3216 -total_cpu_time_us: 1518 ┌─────────┐ │ s │ ├─────────┤ │ "Line3" │ └─────────┘ - -Statistics: -query_phases { - duration_us: 1332 - cpu_time_us: 1186 -} -compilation { - from_cache: true -} -process_cpu_time_us: 103 -total_duration_us: 2907 -total_cpu_time_us: 1289 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_tsv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_tsv_sql_/result.output index e7c0f6918974..d10b1e31be72 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_tsv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_framing_newline_delimited_tsv_sql_/result.output @@ -3,49 +3,13 @@ ├─────────────┼─────┤ │ "Some text" │ 1 │ └─────────────┴─────┘ - -Statistics: -query_phases { - duration_us: 1722 - cpu_time_us: 1574 -} -compilation { - from_cache: true -} -process_cpu_time_us: 163 -total_duration_us: 3467 -total_cpu_time_us: 1737 ┌─────────────────────┬─────┐ │ s │ num │ ├─────────────────────┼─────┤ │ "Строка 1\nСтрока2" │ 2 │ └─────────────────────┴─────┘ - -Statistics: -query_phases { - duration_us: 1586 - cpu_time_us: 1430 -} -compilation { - from_cache: true -} -process_cpu_time_us: 145 -total_duration_us: 3349 -total_cpu_time_us: 1575 ┌───────────┬─────┐ │ s │ num │ ├───────────┼─────┤ │ "Abacaba" │ 3 │ └───────────┴─────┘ - -Statistics: -query_phases { - duration_us: 2006 - cpu_time_us: 1815 -} -compilation { - from_cache: true -} -process_cpu_time_us: 189 -total_duration_us: 4099 -total_cpu_time_us: 2004 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_csv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_csv_sql_/result.output index dee4cf31c696..d53efa435f76 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_csv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_csv_sql_/result.output @@ -3,15 +3,3 @@ ├────┤ │ 12 │ └────┘ - -Statistics: -query_phases { - duration_us: 2192 - cpu_time_us: 1918 -} -compilation { - from_cache: true -} -process_cpu_time_us: 168 -total_duration_us: 4219 -total_cpu_time_us: 2086 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_json_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_json_sql_/result.output index 1e536ceef1c8..d53efa435f76 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_json_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_json_sql_/result.output @@ -3,16 +3,3 @@ ├────┤ │ 12 │ └────┘ - -Statistics: -query_phases { - duration_us: 2133 - cpu_time_us: 1930 -} -compilation { - duration_us: 51640 - cpu_time_us: 49440 -} -process_cpu_time_us: 346 -total_duration_us: 56670 -total_cpu_time_us: 51716 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_tsv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_tsv_sql_/result.output index daf593f16d27..d53efa435f76 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_tsv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_ignore_excess_parameters_tsv_sql_/result.output @@ -3,15 +3,3 @@ ├────┤ │ 12 │ └────┘ - -Statistics: -query_phases { - duration_us: 1844 - cpu_time_us: 1693 -} -compilation { - from_cache: true -} -process_cpu_time_us: 159 -total_duration_us: 3673 -total_cpu_time_us: 1852 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_csv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_csv_sql_/result.output index 090c8821903b..66645b3ade92 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_csv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_csv_sql_/result.output @@ -3,15 +3,3 @@ ├────────────────┼─────┤ │ "Some_s,tring" │ 32 │ └────────────────┴─────┘ - -Statistics: -query_phases { - duration_us: 1655 - cpu_time_us: 1514 -} -compilation { - from_cache: true -} -process_cpu_time_us: 165 -total_duration_us: 3363 -total_cpu_time_us: 1679 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_json_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_json_sql_/result.output index a0cf635e9f3a..030b389b08e0 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_json_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_json_sql_/result.output @@ -3,16 +3,3 @@ ├───────────────┼─────┤ │ "Some_string" │ 32 │ └───────────────┴─────┘ - -Statistics: -query_phases { - duration_us: 2761 - cpu_time_us: 2576 -} -compilation { - duration_us: 67210 - cpu_time_us: 64883 -} -process_cpu_time_us: 450 -total_duration_us: 72932 -total_cpu_time_us: 67909 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_tsv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_tsv_sql_/result.output index f3c067c4120e..703d6430f768 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_tsv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_simple_tsv_sql_/result.output @@ -3,15 +3,3 @@ ├─────────────────┼─────┤ │ "Some_s\ttring" │ 32 │ └─────────────────┴─────┘ - -Statistics: -query_phases { - duration_us: 2157 - cpu_time_us: 1963 -} -compilation { - from_cache: true -} -process_cpu_time_us: 237 -total_duration_us: 4123 -total_cpu_time_us: 2200 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_skip_rows_csv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_skip_rows_csv_sql_/result.output index c482656d2074..a069d456de48 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_skip_rows_csv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_skip_rows_csv_sql_/result.output @@ -3,49 +3,13 @@ ├───┼───┤ │ 1 │ 1 │ └───┴───┘ - -Statistics: -query_phases { - duration_us: 1913 - cpu_time_us: 1711 -} -compilation { - from_cache: true -} -process_cpu_time_us: 157 -total_duration_us: 4080 -total_cpu_time_us: 1868 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 2 │ 2 │ └───┴───┘ - -Statistics: -query_phases { - duration_us: 1957 - cpu_time_us: 1784 -} -compilation { - from_cache: true -} -process_cpu_time_us: 154 -total_duration_us: 4014 -total_cpu_time_us: 1938 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 3 │ 3 │ └───┴───┘ - -Statistics: -query_phases { - duration_us: 1673 - cpu_time_us: 1532 -} -compilation { - from_cache: true -} -process_cpu_time_us: 128 -total_duration_us: 3476 -total_cpu_time_us: 1660 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_skip_rows_tsv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_skip_rows_tsv_sql_/result.output index ecb7a5e027fc..a069d456de48 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_skip_rows_tsv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_skip_rows_tsv_sql_/result.output @@ -3,49 +3,13 @@ ├───┼───┤ │ 1 │ 1 │ └───┴───┘ - -Statistics: -query_phases { - duration_us: 1826 - cpu_time_us: 1660 -} -compilation { - from_cache: true -} -process_cpu_time_us: 182 -total_duration_us: 3590 -total_cpu_time_us: 1842 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 2 │ 2 │ └───┴───┘ - -Statistics: -query_phases { - duration_us: 1515 - cpu_time_us: 1356 -} -compilation { - from_cache: true -} -process_cpu_time_us: 134 -total_duration_us: 3145 -total_cpu_time_us: 1490 ┌───┬───┐ │ a │ b │ ├───┼───┤ │ 3 │ 3 │ └───┴───┘ - -Statistics: -query_phases { - duration_us: 1523 - cpu_time_us: 1383 -} -compilation { - from_cache: true -} -process_cpu_time_us: 114 -total_duration_us: 3071 -total_cpu_time_us: 1497 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_csv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_csv_sql_/result.output index b0dd18cf5397..126ddd550f43 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_csv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_csv_sql_/result.output @@ -3,16 +3,3 @@ ├─────────────────────────┤ │ {"id":1,"value":"ab,a"} │ └─────────────────────────┘ - -Statistics: -query_phases { - duration_us: 2009 - cpu_time_us: 1863 -} -compilation { - duration_us: 58114 - cpu_time_us: 56033 -} -process_cpu_time_us: 431 -total_duration_us: 63038 -total_cpu_time_us: 58327 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_json_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_json_sql_/result.output index da4130712ece..f544f872041b 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_json_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_json_sql_/result.output @@ -3,16 +3,3 @@ ├───────────┤ │ [1,2,3,4] │ └───────────┘ - -Statistics: -query_phases { - duration_us: 2031 - cpu_time_us: 1863 -} -compilation { - duration_us: 53131 - cpu_time_us: 50878 -} -process_cpu_time_us: 343 -total_duration_us: 57731 -total_cpu_time_us: 53084 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_raw_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_raw_sql_/result.output index 3e8e075e89c5..8ec00b9d1a3a 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_raw_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_raw_sql_/result.output @@ -3,16 +3,3 @@ ├─────────────────────────┤ │ "Line1\nLine2\nLine3\n" │ └─────────────────────────┘ - -Statistics: -query_phases { - duration_us: 2324 - cpu_time_us: 2184 -} -compilation { - duration_us: 53663 - cpu_time_us: 51072 -} -process_cpu_time_us: 424 -total_duration_us: 59144 -total_cpu_time_us: 53680 diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_tsv_sql_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_tsv_sql_/result.output index f516dadd31cd..d808b68ece34 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_tsv_sql_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_sql.TestExecuteSqlWithParamsFromStdin.test_stdin_par_tsv_sql_/result.output @@ -3,15 +3,3 @@ ├──────────────────────────┤ │ {"id":1,"value":"ab\ta"} │ └──────────────────────────┘ - -Statistics: -query_phases { - duration_us: 1711 - cpu_time_us: 1561 -} -compilation { - from_cache: true -} -process_cpu_time_us: 205 -total_duration_us: 3592 -total_cpu_time_us: 1766 diff --git a/ydb/tests/functional/ydb_cli/test_ydb_sql.py b/ydb/tests/functional/ydb_cli/test_ydb_sql.py index 26d8e029dcd2..f20bf2f64b95 100644 --- a/ydb/tests/functional/ydb_cli/test_ydb_sql.py +++ b/ydb/tests/functional/ydb_cli/test_ydb_sql.py @@ -105,7 +105,7 @@ def init_test(self, tmp_path): def test_uint32(self): script = "DECLARE $par1 AS Uint32; SELECT * FROM `{}` WHERE key = $par1;".format(self.table_path) - output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--param", "$par1=1"]) + output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--progress=none", "--stats=none", "--param", "$par1=1"]) return self.canonical_result(output, self.tmp_path) def test_uint64_and_string(self): @@ -113,14 +113,14 @@ def test_uint64_and_string(self): "DECLARE $value AS String; "\ "SELECT * FROM `{}` WHERE id = $id OR value = $value;".format(self.table_path) output = self.execute_ydb_cli_command_with_db( - ["sql", "-s", script, "--param", "$id=2222", + ["sql", "-s", script, "--progress=none", "--stats=none", "--param", "$id=2222", "--param", "$value=\"seven\""] ) return self.canonical_result(output, self.tmp_path) def test_list(self): script = "DECLARE $values AS List; SELECT $values AS values;" - output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--param", "$values=[1,2,3]"]) + output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--progress=none", "--stats=none", "--param", "$values=[1,2,3]"]) return self.canonical_result(output, self.tmp_path) def test_struct(self): @@ -130,7 +130,7 @@ def test_struct(self): "Table.value AS value "\ "FROM (SELECT $values AS lst) FLATTEN BY lst AS Table;" output = self.execute_ydb_cli_command_with_db( - ["sql", "-s", script, "--param", + ["sql", "-s", script, "--progress=none", "--stats=none", "--param", "$values=[{\"key\":1,\"value\":\"one\"},{\"key\":2,\"value\":\"two\"}]"] ) return self.canonical_result(output, self.tmp_path) @@ -152,7 +152,7 @@ def execute_sql(self, format): script = "SELECT * FROM `{path}` WHERE key < 4;" \ "SELECT id FROM `{path}` WHERE key = 4;" \ "SELECT value FROM `{path}` WHERE key > 5".format(path=self.table_path) - output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--format", format]) + output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--progress=none", "--stats=none", "--format", format]) return self.canonical_result(output, self.tmp_path) def execute_sql_pretty(self): @@ -193,7 +193,7 @@ def test_script_from_file(self): "SELECT $a AS a; " self.write_data(script, str(self.tmp_path / "script.yql")) output = self.execute_ydb_cli_command_with_db( - ["sql", "-f", str(self.tmp_path / "script.yql"), "--param", "$a=3"] + ["sql", "-f", str(self.tmp_path / "script.yql"), "--progress=none", "--stats=none", "--param", "$a=3"] ) return self.canonical_result(output, self.tmp_path) @@ -246,7 +246,7 @@ def simple_json(self, command): "DECLARE $val AS Uint64; " \ "SELECT $s AS s, $val AS val; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--progress=none", "--stats=none"], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -258,7 +258,7 @@ def simple_csv_tsv(self, command, format): "DECLARE $val AS Uint64; " \ "SELECT $s AS s, $val AS val; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--input-format", format], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--progress=none", "--stats=none", "--input-format", format], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -269,7 +269,7 @@ def stdin_par_raw(self, command): script = "DECLARE $s AS Utf8; " \ "SELECT $s AS s; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--input-format", "raw", "--input-param-name", "s"], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--progress=none", "--stats=none", "--input-format", "raw", "--input-param-name", "s"], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -278,7 +278,7 @@ def stdin_par_json(self, command): script = "DECLARE $arr AS List; " \ "SELECT $arr AS arr; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--input-param-name", "arr"], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--progress=none", "--stats=none", "--input-param-name", "arr"], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -289,7 +289,7 @@ def stdin_par_csv_tsv(self, command, format): script = "DECLARE $s AS Struct; " \ "SELECT $s AS s; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--input-format", format, "--input-param-name", "s"], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--progress=none", "--stats=none", "--input-format", format, "--input-param-name", "s"], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -301,7 +301,7 @@ def framing_newline_delimited_json(self, command): "DECLARE $num AS Uint64; " \ "SELECT $s AS s, $num AS num; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--input-framing", "newline-delimited"], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--progress=none", "--stats=none", "--input-framing", "newline-delimited"], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -315,7 +315,7 @@ def framing_newline_delimited_csv_tsv(self, command, format): "DECLARE $num AS Uint64; " \ "SELECT $s AS s, $num AS num; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--input-format", format, "--input-framing", "newline-delimited"], + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--progress=none", "--stats=none", "--input-format", format, "--input-framing", "newline-delimited"], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -328,7 +328,7 @@ def framing_newline_delimited_raw(self, command): "SELECT $s AS s; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--input-format", "raw", "--input-param-name", "s", "--input-framing", "newline-delimited"], + command + ["-s", script, "--progress=none", "--stats=none", "--input-format", "raw", "--input-param-name", "s", "--input-framing", "newline-delimited"], self.get_stdin() ) self.close_stdin() @@ -342,7 +342,7 @@ def batching_full_raw(self, command): "SELECT $s AS s; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--input-format", "raw", "--input-param-name", "s", "--input-framing", "newline-delimited", "--input-batch", "full"], + command + ["-s", script, "--progress=none", "--stats=none", "--input-format", "raw", "--input-param-name", "s", "--input-framing", "newline-delimited", "--input-batch", "full"], self.get_stdin() ) self.close_stdin() @@ -362,7 +362,7 @@ def batching_full_json(self, command): "SELECT $arr as arr; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--input-param-name", "arr", "--input-framing", "newline-delimited", "--input-batch", "full"], + command + ["-s", script, "--progress=none", "--stats=none", "--input-param-name", "arr", "--input-framing", "newline-delimited", "--input-batch", "full"], self.get_stdin() ) self.close_stdin() @@ -384,7 +384,7 @@ def batching_full_csv_tsv(self, command, format): "SELECT $arr as arr; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--input-format", format, "--input-param-name", "arr", "--input-framing", "newline-delimited", "--input-batch", "full"], + command + ["-s", script, "--progress=none", "--stats=none", "--input-format", format, "--input-param-name", "arr", "--input-framing", "newline-delimited", "--input-batch", "full"], self.get_stdin() ) self.close_stdin() @@ -404,7 +404,7 @@ def batching_adaptive_raw(self, command): "SELECT $s AS s; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--input-format", "raw", "--input-param-name", "s", "--input-framing", + command + ["-s", script, "--progress=none", "--stats=none", "--input-format", "raw", "--input-param-name", "s", "--input-framing", "newline-delimited", "--input-batch", "adaptive", "--input-batch-max-delay", "0", "--input-batch-max-rows", "3"], self.get_stdin() @@ -426,7 +426,7 @@ def batching_adaptive_json(self, command): "SELECT $arr as arr; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--input-param-name", "arr", "--input-framing", "newline-delimited", + command + ["-s", script, "--progress=none", "--stats=none", "--input-param-name", "arr", "--input-framing", "newline-delimited", "--input-batch", "adaptive", "--input-batch-max-delay", "0", "--input-batch-max-rows", "3"], self.get_stdin() ) @@ -449,7 +449,7 @@ def batching_adaptive_csv_tsv(self, command, format): "SELECT $arr as arr; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--input-format", format, "--input-param-name", "arr", "--input-framing", "newline-delimited", + command + ["-s", script, "--progress=none", "--stats=none", "--input-format", format, "--input-param-name", "arr", "--input-framing", "newline-delimited", "--input-batch", "adaptive", "--input-batch-max-delay", "0", "--input-batch-max-rows", "3"], self.get_stdin() ) @@ -464,7 +464,7 @@ def ignore_excess_parameters_json(self, command): script = "DECLARE $a AS Uint64; " \ "SELECT $a AS a; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--progress=none", "--stats=none"], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -476,7 +476,7 @@ def ignore_excess_parameters_csv_tsv(self, command, format): script = "DECLARE $a AS Uint64; " \ "SELECT $a AS a; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--input-format", format], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--progress=none", "--stats=none", "--input-format", format], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -491,7 +491,7 @@ def columns_bad_header(self, command, format): "SELECT $a AS a, $b AS b; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--input-format", format, "--input-framing", "newline-delimited", + command + ["-s", script, "--progress=none", "--stats=none", "--input-format", format, "--input-framing", "newline-delimited", "--input-columns", "a{0}b".format(self.get_delim(format)), "--input-skip-rows", "1"], self.get_stdin() ) @@ -508,7 +508,7 @@ def columns_no_header(self, command, format): "SELECT $a AS a, $b AS b; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--input-format", format, "--input-framing", "newline-delimited", + command + ["-s", script, "--progress=none", "--stats=none", "--input-format", format, "--input-framing", "newline-delimited", "--input-columns", "a{0}b".format(self.get_delim(format))], self.get_stdin() ) @@ -529,7 +529,7 @@ def skip_rows(self, command, format): "SELECT $a AS a, $b AS b; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--input-format", format, "--input-framing", "newline-delimited", "--input-skip-rows", "3"], self.get_stdin() + command + ["-s", script, "--progress=none", "--stats=none", "--input-format", format, "--input-framing", "newline-delimited", "--input-skip-rows", "3"], self.get_stdin() ) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -662,7 +662,7 @@ def init_test(self, tmp_path): def test_wide_table(self): script = "SELECT * FROM `{}`;".format(self.table_path) - output = self.execute_ydb_cli_command_with_db(["sql", "-s", script]) + output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--progress=none", "--stats=none"]) return self.canonical_result(output, self.tmp_path) From 803333aebf1ecb98348625fcca21db9201d3857c Mon Sep 17 00:00:00 2001 From: Nikolay Shumkov Date: Tue, 6 May 2025 14:46:58 +0300 Subject: [PATCH 07/10] Fixes --- ydb/public/lib/ydb_cli/commands/ydb_sql.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp b/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp index b5739d4e95e1..17955c5b81c1 100644 --- a/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp +++ b/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp @@ -56,7 +56,7 @@ void TCommandSql::Config(TConfig& config) { description << "\nDefault: " << colors.CyanColor() << "\"tty\"" << colors.OldColor() << "."; config.Opts->AddLongOption("progress", description.Str()) - .RequiredArgument("[String]").DefaultValue("tty").StoreResult(&Progress); + .RequiredArgument("[String]").Hidden().DefaultValue("none").StoreResult(&Progress); config.Opts->AddLongOption("diagnostics-file", "Path to file where the diagnostics will be saved.") .RequiredArgument("[String]").StoreResult(&DiagnosticsFile); config.Opts->AddLongOption("syntax", "Query syntax [yql, pg]") From 9b4705c8cc19284d08d317191e33780a10179e1e Mon Sep 17 00:00:00 2001 From: Nikolay Shumkov Date: Tue, 6 May 2025 16:26:57 +0300 Subject: [PATCH 08/10] Fixes --- ydb/tests/functional/ydb_cli/test_ydb_sql.py | 52 ++++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/ydb/tests/functional/ydb_cli/test_ydb_sql.py b/ydb/tests/functional/ydb_cli/test_ydb_sql.py index f20bf2f64b95..35c0b19e11d3 100644 --- a/ydb/tests/functional/ydb_cli/test_ydb_sql.py +++ b/ydb/tests/functional/ydb_cli/test_ydb_sql.py @@ -105,7 +105,7 @@ def init_test(self, tmp_path): def test_uint32(self): script = "DECLARE $par1 AS Uint32; SELECT * FROM `{}` WHERE key = $par1;".format(self.table_path) - output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--progress=none", "--stats=none", "--param", "$par1=1"]) + output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--stats=none", "--param", "$par1=1"]) return self.canonical_result(output, self.tmp_path) def test_uint64_and_string(self): @@ -113,14 +113,14 @@ def test_uint64_and_string(self): "DECLARE $value AS String; "\ "SELECT * FROM `{}` WHERE id = $id OR value = $value;".format(self.table_path) output = self.execute_ydb_cli_command_with_db( - ["sql", "-s", script, "--progress=none", "--stats=none", "--param", "$id=2222", + ["sql", "-s", script, "--stats=none", "--param", "$id=2222", "--param", "$value=\"seven\""] ) return self.canonical_result(output, self.tmp_path) def test_list(self): script = "DECLARE $values AS List; SELECT $values AS values;" - output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--progress=none", "--stats=none", "--param", "$values=[1,2,3]"]) + output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--stats=none", "--param", "$values=[1,2,3]"]) return self.canonical_result(output, self.tmp_path) def test_struct(self): @@ -130,7 +130,7 @@ def test_struct(self): "Table.value AS value "\ "FROM (SELECT $values AS lst) FLATTEN BY lst AS Table;" output = self.execute_ydb_cli_command_with_db( - ["sql", "-s", script, "--progress=none", "--stats=none", "--param", + ["sql", "-s", script, "--stats=none", "--param", "$values=[{\"key\":1,\"value\":\"one\"},{\"key\":2,\"value\":\"two\"}]"] ) return self.canonical_result(output, self.tmp_path) @@ -152,7 +152,7 @@ def execute_sql(self, format): script = "SELECT * FROM `{path}` WHERE key < 4;" \ "SELECT id FROM `{path}` WHERE key = 4;" \ "SELECT value FROM `{path}` WHERE key > 5".format(path=self.table_path) - output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--progress=none", "--stats=none", "--format", format]) + output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--stats=none", "--format", format]) return self.canonical_result(output, self.tmp_path) def execute_sql_pretty(self): @@ -193,7 +193,7 @@ def test_script_from_file(self): "SELECT $a AS a; " self.write_data(script, str(self.tmp_path / "script.yql")) output = self.execute_ydb_cli_command_with_db( - ["sql", "-f", str(self.tmp_path / "script.yql"), "--progress=none", "--stats=none", "--param", "$a=3"] + ["sql", "-f", str(self.tmp_path / "script.yql"), "--stats=none", "--param", "$a=3"] ) return self.canonical_result(output, self.tmp_path) @@ -246,7 +246,7 @@ def simple_json(self, command): "DECLARE $val AS Uint64; " \ "SELECT $s AS s, $val AS val; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--progress=none", "--stats=none"], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--stats=none"], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -258,7 +258,7 @@ def simple_csv_tsv(self, command, format): "DECLARE $val AS Uint64; " \ "SELECT $s AS s, $val AS val; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--progress=none", "--stats=none", "--input-format", format], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--stats=none", "--input-format", format], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -269,7 +269,7 @@ def stdin_par_raw(self, command): script = "DECLARE $s AS Utf8; " \ "SELECT $s AS s; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--progress=none", "--stats=none", "--input-format", "raw", "--input-param-name", "s"], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--stats=none", "--input-format", "raw", "--input-param-name", "s"], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -278,7 +278,7 @@ def stdin_par_json(self, command): script = "DECLARE $arr AS List; " \ "SELECT $arr AS arr; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--progress=none", "--stats=none", "--input-param-name", "arr"], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--stats=none", "--input-param-name", "arr"], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -289,7 +289,7 @@ def stdin_par_csv_tsv(self, command, format): script = "DECLARE $s AS Struct; " \ "SELECT $s AS s; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--progress=none", "--stats=none", "--input-format", format, "--input-param-name", "s"], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--stats=none", "--input-format", format, "--input-param-name", "s"], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -301,7 +301,7 @@ def framing_newline_delimited_json(self, command): "DECLARE $num AS Uint64; " \ "SELECT $s AS s, $num AS num; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--progress=none", "--stats=none", "--input-framing", "newline-delimited"], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--stats=none", "--input-framing", "newline-delimited"], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -315,7 +315,7 @@ def framing_newline_delimited_csv_tsv(self, command, format): "DECLARE $num AS Uint64; " \ "SELECT $s AS s, $num AS num; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--progress=none", "--stats=none", "--input-format", format, "--input-framing", "newline-delimited"], + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--stats=none", "--input-format", format, "--input-framing", "newline-delimited"], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -328,7 +328,7 @@ def framing_newline_delimited_raw(self, command): "SELECT $s AS s; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--progress=none", "--stats=none", "--input-format", "raw", "--input-param-name", "s", "--input-framing", "newline-delimited"], + command + ["-s", script, "--stats=none", "--input-format", "raw", "--input-param-name", "s", "--input-framing", "newline-delimited"], self.get_stdin() ) self.close_stdin() @@ -342,7 +342,7 @@ def batching_full_raw(self, command): "SELECT $s AS s; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--progress=none", "--stats=none", "--input-format", "raw", "--input-param-name", "s", "--input-framing", "newline-delimited", "--input-batch", "full"], + command + ["-s", script, "--stats=none", "--input-format", "raw", "--input-param-name", "s", "--input-framing", "newline-delimited", "--input-batch", "full"], self.get_stdin() ) self.close_stdin() @@ -362,7 +362,7 @@ def batching_full_json(self, command): "SELECT $arr as arr; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--progress=none", "--stats=none", "--input-param-name", "arr", "--input-framing", "newline-delimited", "--input-batch", "full"], + command + ["-s", script, "--stats=none", "--input-param-name", "arr", "--input-framing", "newline-delimited", "--input-batch", "full"], self.get_stdin() ) self.close_stdin() @@ -384,7 +384,7 @@ def batching_full_csv_tsv(self, command, format): "SELECT $arr as arr; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--progress=none", "--stats=none", "--input-format", format, "--input-param-name", "arr", "--input-framing", "newline-delimited", "--input-batch", "full"], + command + ["-s", script, "--stats=none", "--input-format", format, "--input-param-name", "arr", "--input-framing", "newline-delimited", "--input-batch", "full"], self.get_stdin() ) self.close_stdin() @@ -404,7 +404,7 @@ def batching_adaptive_raw(self, command): "SELECT $s AS s; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--progress=none", "--stats=none", "--input-format", "raw", "--input-param-name", "s", "--input-framing", + command + ["-s", script, "--stats=none", "--input-format", "raw", "--input-param-name", "s", "--input-framing", "newline-delimited", "--input-batch", "adaptive", "--input-batch-max-delay", "0", "--input-batch-max-rows", "3"], self.get_stdin() @@ -426,7 +426,7 @@ def batching_adaptive_json(self, command): "SELECT $arr as arr; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--progress=none", "--stats=none", "--input-param-name", "arr", "--input-framing", "newline-delimited", + command + ["-s", script, "--stats=none", "--input-param-name", "arr", "--input-framing", "newline-delimited", "--input-batch", "adaptive", "--input-batch-max-delay", "0", "--input-batch-max-rows", "3"], self.get_stdin() ) @@ -449,7 +449,7 @@ def batching_adaptive_csv_tsv(self, command, format): "SELECT $arr as arr; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--progress=none", "--stats=none", "--input-format", format, "--input-param-name", "arr", "--input-framing", "newline-delimited", + command + ["-s", script, "--stats=none", "--input-format", format, "--input-param-name", "arr", "--input-framing", "newline-delimited", "--input-batch", "adaptive", "--input-batch-max-delay", "0", "--input-batch-max-rows", "3"], self.get_stdin() ) @@ -464,7 +464,7 @@ def ignore_excess_parameters_json(self, command): script = "DECLARE $a AS Uint64; " \ "SELECT $a AS a; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--progress=none", "--stats=none"], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--stats=none"], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -476,7 +476,7 @@ def ignore_excess_parameters_csv_tsv(self, command, format): script = "DECLARE $a AS Uint64; " \ "SELECT $a AS a; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--progress=none", "--stats=none", "--input-format", format], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--stats=none", "--input-format", format], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -491,7 +491,7 @@ def columns_bad_header(self, command, format): "SELECT $a AS a, $b AS b; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--progress=none", "--stats=none", "--input-format", format, "--input-framing", "newline-delimited", + command + ["-s", script, "--stats=none", "--input-format", format, "--input-framing", "newline-delimited", "--input-columns", "a{0}b".format(self.get_delim(format)), "--input-skip-rows", "1"], self.get_stdin() ) @@ -508,7 +508,7 @@ def columns_no_header(self, command, format): "SELECT $a AS a, $b AS b; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--progress=none", "--stats=none", "--input-format", format, "--input-framing", "newline-delimited", + command + ["-s", script, "--stats=none", "--input-format", format, "--input-framing", "newline-delimited", "--input-columns", "a{0}b".format(self.get_delim(format))], self.get_stdin() ) @@ -529,7 +529,7 @@ def skip_rows(self, command, format): "SELECT $a AS a, $b AS b; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--progress=none", "--stats=none", "--input-format", format, "--input-framing", "newline-delimited", "--input-skip-rows", "3"], self.get_stdin() + command + ["-s", script, "--stats=none", "--input-format", format, "--input-framing", "newline-delimited", "--input-skip-rows", "3"], self.get_stdin() ) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -662,7 +662,7 @@ def init_test(self, tmp_path): def test_wide_table(self): script = "SELECT * FROM `{}`;".format(self.table_path) - output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--progress=none", "--stats=none"]) + output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--stats=none"]) return self.canonical_result(output, self.tmp_path) From 760d4a5f2b76726fdce14932ffe029234d6debd6 Mon Sep 17 00:00:00 2001 From: Nikolay Shumkov Date: Tue, 6 May 2025 18:22:58 +0300 Subject: [PATCH 09/10] Fixes --- ydb/public/lib/ydb_cli/commands/ydb_sql.cpp | 2 +- ydb/tests/functional/ydb_cli/test_ydb_sql.py | 52 ++++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp b/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp index 17955c5b81c1..2a7456103dde 100644 --- a/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp +++ b/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp @@ -160,7 +160,7 @@ int TCommandSql::RunCommand(TConfig& config) { } else { // Execute query settings.ExecMode(NQuery::EExecMode::Execute); - auto defaultStatsMode = ExplainAnalyzeMode ? NQuery::EStatsMode::Full : NQuery::EStatsMode::Basic; + auto defaultStatsMode = ExplainAnalyzeMode ? NQuery::EStatsMode::Full : NQuery::EStatsMode::None; auto statsMode = ParseQueryStatsModeOrThrow(CollectStatsMode, defaultStatsMode); settings.StatsMode(statsMode); if (Progress == "tty") { diff --git a/ydb/tests/functional/ydb_cli/test_ydb_sql.py b/ydb/tests/functional/ydb_cli/test_ydb_sql.py index 35c0b19e11d3..26d8e029dcd2 100644 --- a/ydb/tests/functional/ydb_cli/test_ydb_sql.py +++ b/ydb/tests/functional/ydb_cli/test_ydb_sql.py @@ -105,7 +105,7 @@ def init_test(self, tmp_path): def test_uint32(self): script = "DECLARE $par1 AS Uint32; SELECT * FROM `{}` WHERE key = $par1;".format(self.table_path) - output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--stats=none", "--param", "$par1=1"]) + output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--param", "$par1=1"]) return self.canonical_result(output, self.tmp_path) def test_uint64_and_string(self): @@ -113,14 +113,14 @@ def test_uint64_and_string(self): "DECLARE $value AS String; "\ "SELECT * FROM `{}` WHERE id = $id OR value = $value;".format(self.table_path) output = self.execute_ydb_cli_command_with_db( - ["sql", "-s", script, "--stats=none", "--param", "$id=2222", + ["sql", "-s", script, "--param", "$id=2222", "--param", "$value=\"seven\""] ) return self.canonical_result(output, self.tmp_path) def test_list(self): script = "DECLARE $values AS List; SELECT $values AS values;" - output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--stats=none", "--param", "$values=[1,2,3]"]) + output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--param", "$values=[1,2,3]"]) return self.canonical_result(output, self.tmp_path) def test_struct(self): @@ -130,7 +130,7 @@ def test_struct(self): "Table.value AS value "\ "FROM (SELECT $values AS lst) FLATTEN BY lst AS Table;" output = self.execute_ydb_cli_command_with_db( - ["sql", "-s", script, "--stats=none", "--param", + ["sql", "-s", script, "--param", "$values=[{\"key\":1,\"value\":\"one\"},{\"key\":2,\"value\":\"two\"}]"] ) return self.canonical_result(output, self.tmp_path) @@ -152,7 +152,7 @@ def execute_sql(self, format): script = "SELECT * FROM `{path}` WHERE key < 4;" \ "SELECT id FROM `{path}` WHERE key = 4;" \ "SELECT value FROM `{path}` WHERE key > 5".format(path=self.table_path) - output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--stats=none", "--format", format]) + output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--format", format]) return self.canonical_result(output, self.tmp_path) def execute_sql_pretty(self): @@ -193,7 +193,7 @@ def test_script_from_file(self): "SELECT $a AS a; " self.write_data(script, str(self.tmp_path / "script.yql")) output = self.execute_ydb_cli_command_with_db( - ["sql", "-f", str(self.tmp_path / "script.yql"), "--stats=none", "--param", "$a=3"] + ["sql", "-f", str(self.tmp_path / "script.yql"), "--param", "$a=3"] ) return self.canonical_result(output, self.tmp_path) @@ -246,7 +246,7 @@ def simple_json(self, command): "DECLARE $val AS Uint64; " \ "SELECT $s AS s, $val AS val; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--stats=none"], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -258,7 +258,7 @@ def simple_csv_tsv(self, command, format): "DECLARE $val AS Uint64; " \ "SELECT $s AS s, $val AS val; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--stats=none", "--input-format", format], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--input-format", format], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -269,7 +269,7 @@ def stdin_par_raw(self, command): script = "DECLARE $s AS Utf8; " \ "SELECT $s AS s; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--stats=none", "--input-format", "raw", "--input-param-name", "s"], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--input-format", "raw", "--input-param-name", "s"], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -278,7 +278,7 @@ def stdin_par_json(self, command): script = "DECLARE $arr AS List; " \ "SELECT $arr AS arr; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--stats=none", "--input-param-name", "arr"], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--input-param-name", "arr"], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -289,7 +289,7 @@ def stdin_par_csv_tsv(self, command, format): script = "DECLARE $s AS Struct; " \ "SELECT $s AS s; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--stats=none", "--input-format", format, "--input-param-name", "s"], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--input-format", format, "--input-param-name", "s"], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -301,7 +301,7 @@ def framing_newline_delimited_json(self, command): "DECLARE $num AS Uint64; " \ "SELECT $s AS s, $num AS num; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--stats=none", "--input-framing", "newline-delimited"], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--input-framing", "newline-delimited"], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -315,7 +315,7 @@ def framing_newline_delimited_csv_tsv(self, command, format): "DECLARE $num AS Uint64; " \ "SELECT $s AS s, $num AS num; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--stats=none", "--input-format", format, "--input-framing", "newline-delimited"], + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--input-format", format, "--input-framing", "newline-delimited"], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -328,7 +328,7 @@ def framing_newline_delimited_raw(self, command): "SELECT $s AS s; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--stats=none", "--input-format", "raw", "--input-param-name", "s", "--input-framing", "newline-delimited"], + command + ["-s", script, "--input-format", "raw", "--input-param-name", "s", "--input-framing", "newline-delimited"], self.get_stdin() ) self.close_stdin() @@ -342,7 +342,7 @@ def batching_full_raw(self, command): "SELECT $s AS s; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--stats=none", "--input-format", "raw", "--input-param-name", "s", "--input-framing", "newline-delimited", "--input-batch", "full"], + command + ["-s", script, "--input-format", "raw", "--input-param-name", "s", "--input-framing", "newline-delimited", "--input-batch", "full"], self.get_stdin() ) self.close_stdin() @@ -362,7 +362,7 @@ def batching_full_json(self, command): "SELECT $arr as arr; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--stats=none", "--input-param-name", "arr", "--input-framing", "newline-delimited", "--input-batch", "full"], + command + ["-s", script, "--input-param-name", "arr", "--input-framing", "newline-delimited", "--input-batch", "full"], self.get_stdin() ) self.close_stdin() @@ -384,7 +384,7 @@ def batching_full_csv_tsv(self, command, format): "SELECT $arr as arr; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--stats=none", "--input-format", format, "--input-param-name", "arr", "--input-framing", "newline-delimited", "--input-batch", "full"], + command + ["-s", script, "--input-format", format, "--input-param-name", "arr", "--input-framing", "newline-delimited", "--input-batch", "full"], self.get_stdin() ) self.close_stdin() @@ -404,7 +404,7 @@ def batching_adaptive_raw(self, command): "SELECT $s AS s; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--stats=none", "--input-format", "raw", "--input-param-name", "s", "--input-framing", + command + ["-s", script, "--input-format", "raw", "--input-param-name", "s", "--input-framing", "newline-delimited", "--input-batch", "adaptive", "--input-batch-max-delay", "0", "--input-batch-max-rows", "3"], self.get_stdin() @@ -426,7 +426,7 @@ def batching_adaptive_json(self, command): "SELECT $arr as arr; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--stats=none", "--input-param-name", "arr", "--input-framing", "newline-delimited", + command + ["-s", script, "--input-param-name", "arr", "--input-framing", "newline-delimited", "--input-batch", "adaptive", "--input-batch-max-delay", "0", "--input-batch-max-rows", "3"], self.get_stdin() ) @@ -449,7 +449,7 @@ def batching_adaptive_csv_tsv(self, command, format): "SELECT $arr as arr; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--stats=none", "--input-format", format, "--input-param-name", "arr", "--input-framing", "newline-delimited", + command + ["-s", script, "--input-format", format, "--input-param-name", "arr", "--input-framing", "newline-delimited", "--input-batch", "adaptive", "--input-batch-max-delay", "0", "--input-batch-max-rows", "3"], self.get_stdin() ) @@ -464,7 +464,7 @@ def ignore_excess_parameters_json(self, command): script = "DECLARE $a AS Uint64; " \ "SELECT $a AS a; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--stats=none"], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -476,7 +476,7 @@ def ignore_excess_parameters_csv_tsv(self, command, format): script = "DECLARE $a AS Uint64; " \ "SELECT $a AS a; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) - output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--stats=none", "--input-format", format], self.get_stdin()) + output = self.execute_ydb_cli_command_with_db(command + ["-s", script, "--input-format", format], self.get_stdin()) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -491,7 +491,7 @@ def columns_bad_header(self, command, format): "SELECT $a AS a, $b AS b; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--stats=none", "--input-format", format, "--input-framing", "newline-delimited", + command + ["-s", script, "--input-format", format, "--input-framing", "newline-delimited", "--input-columns", "a{0}b".format(self.get_delim(format)), "--input-skip-rows", "1"], self.get_stdin() ) @@ -508,7 +508,7 @@ def columns_no_header(self, command, format): "SELECT $a AS a, $b AS b; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--stats=none", "--input-format", format, "--input-framing", "newline-delimited", + command + ["-s", script, "--input-format", format, "--input-framing", "newline-delimited", "--input-columns", "a{0}b".format(self.get_delim(format))], self.get_stdin() ) @@ -529,7 +529,7 @@ def skip_rows(self, command, format): "SELECT $a AS a, $b AS b; " self.write_data(param_data, str(self.tmp_path / "stdin.txt")) output = self.execute_ydb_cli_command_with_db( - command + ["-s", script, "--stats=none", "--input-format", format, "--input-framing", "newline-delimited", "--input-skip-rows", "3"], self.get_stdin() + command + ["-s", script, "--input-format", format, "--input-framing", "newline-delimited", "--input-skip-rows", "3"], self.get_stdin() ) self.close_stdin() return self.canonical_result(output, self.tmp_path) @@ -662,7 +662,7 @@ def init_test(self, tmp_path): def test_wide_table(self): script = "SELECT * FROM `{}`;".format(self.table_path) - output = self.execute_ydb_cli_command_with_db(["sql", "-s", script, "--stats=none"]) + output = self.execute_ydb_cli_command_with_db(["sql", "-s", script]) return self.canonical_result(output, self.tmp_path) From f758c26208f37f268fdbd99739f32dc3af7cb98c Mon Sep 17 00:00:00 2001 From: Nikolay Shumkov Date: Wed, 7 May 2025 11:40:26 +0300 Subject: [PATCH 10/10] Fixes --- ydb/public/lib/ydb_cli/commands/ydb_sql.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp b/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp index 2a7456103dde..06359832d58c 100644 --- a/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp +++ b/ydb/public/lib/ydb_cli/commands/ydb_sql.cpp @@ -53,7 +53,7 @@ void TCommandSql::Config(TConfig& config) { << "\n " << "Print progress to the terminal"; description << "\n " << colors.BoldColor() << "none" << colors.OldColor() << "\n " << "Disables progress printing"; - description << "\nDefault: " << colors.CyanColor() << "\"tty\"" << colors.OldColor() << "."; + description << "\nDefault: " << colors.CyanColor() << "\"none\"" << colors.OldColor() << "."; config.Opts->AddLongOption("progress", description.Str()) .RequiredArgument("[String]").Hidden().DefaultValue("none").StoreResult(&Progress);