diff options
author | ingv0rr <ingv0rr@yandex-team.com> | 2023-11-20 12:03:01 +0300 |
---|---|---|
committer | ingv0rr <ingv0rr@yandex-team.com> | 2023-11-20 12:23:40 +0300 |
commit | b045573f5ad2232841962bcefeeb0726cceb228a (patch) | |
tree | dffcfb970140730f4929e19572c21d5bc5d0715f | |
parent | 64d1b59148b5cebbd00dadb728a5a26f14e82775 (diff) | |
download | ydb-b045573f5ad2232841962bcefeeb0726cceb228a.tar.gz |
add function and fix bug with max width of column
22 files changed, 128 insertions, 116 deletions
diff --git a/ydb/public/lib/ydb_cli/common/pretty_table.cpp b/ydb/public/lib/ydb_cli/common/pretty_table.cpp index e368e1745f..6af8836d5b 100644 --- a/ydb/public/lib/ydb_cli/common/pretty_table.cpp +++ b/ydb/public/lib/ydb_cli/common/pretty_table.cpp @@ -15,12 +15,37 @@ TPrettyTable::TRow::TRow(size_t nColumns) { } +size_t TPrettyTable::TRow::ExtraBytes(TStringBuf data) const { + // counter of previously uncounted bytes + size_t extraBytes = 0; + for (char ch : data) { + size_t n = 0; + // if the first bit of the character is not 0, we met a multibyte + // counting the number of single bits at the beginning of a byte + while ((ch & 0x80) != 0) { + n++; + ch <<= 1; + } + // update counter + if (n != 0) { + extraBytes += n - 1; + } + } + + return extraBytes; +} + size_t TPrettyTable::TRow::ColumnWidth(size_t columnIndex) const { Y_ABORT_UNLESS(columnIndex < Columns.size()); size_t width = 0; + TStringBuf data; for (const auto& line : Columns.at(columnIndex)) { - width = Max(width, line.size()); + data = line; + + size_t extraBytes = ExtraBytes(data); + + width = Max(width, line.size() - extraBytes); } return width; @@ -49,21 +74,7 @@ bool TPrettyTable::TRow::PrintColumns(IOutputStream& o, const TVector<size_t>& w } } - // counter of previously uncounted bytes - size_t extraBytes = 0; - for (char ch : data) { - size_t n = 0; - // if the first bit of the character is not 0, we met a multibyte - // counting the number of single bits at the beginning of a byte - while ((ch & 0x80) != 0) { - n++; - ch <<= 1; - } - // update counter - if (n != 0) { - extraBytes += n - 1; - } - } + size_t extraBytes = ExtraBytes(data); if (data) { o << RightPad(data.SubStr(0, width + extraBytes), width + extraBytes); diff --git a/ydb/public/lib/ydb_cli/common/pretty_table.h b/ydb/public/lib/ydb_cli/common/pretty_table.h index 1271d91f9f..4637e7f13e 100644 --- a/ydb/public/lib/ydb_cli/common/pretty_table.h +++ b/ydb/public/lib/ydb_cli/common/pretty_table.h @@ -75,6 +75,7 @@ public: private: size_t ColumnWidth(size_t columnIndex) const; + size_t ExtraBytes(TStringBuf data) const; bool PrintColumns(IOutputStream& o, const TVector<size_t>& widths, size_t lineNumber) const; bool HasFreeText() const; void PrintFreeText(IOutputStream& o, size_t width) const; diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromJson.test_multiple_files/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromJson.test_multiple_files/result.output index ae89fde6f9..4db39649d7 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromJson.test_multiple_files/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromJson.test_multiple_files/result.output @@ -1,5 +1,5 @@ -┌──────────────────┬──────┬──────────────┐ -│ str │ num │ date │ -├──────────────────┼──────┼──────────────┤ -│ "Строчка" │ 1542 │ "2011-11-11" │ -└──────────────────┴──────┴──────────────┘ +┌───────────┬──────┬──────────────┐ +│ str │ num │ date │ +├───────────┼──────┼──────────────┤ +│ "Строчка" │ 1542 │ "2011-11-11" │ +└───────────┴──────┴──────────────┘ diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromJson.test_stream_multiple_files/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromJson.test_stream_multiple_files/result.output index ae89fde6f9..4db39649d7 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromJson.test_stream_multiple_files/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromJson.test_stream_multiple_files/result.output @@ -1,5 +1,5 @@ -┌──────────────────┬──────┬──────────────┐ -│ str │ num │ date │ -├──────────────────┼──────┼──────────────┤ -│ "Строчка" │ 1542 │ "2011-11-11" │ -└──────────────────┴──────┴──────────────┘ +┌───────────┬──────┬──────────────┐ +│ str │ num │ date │ +├───────────┼──────┼──────────────┤ +│ "Строчка" │ 1542 │ "2011-11-11" │ +└───────────┴──────┴──────────────┘ diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_different_sources_json_scripting_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_different_sources_json_scripting_/result.output index d7d2f9e47e..f482d8fd14 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_different_sources_json_scripting_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_different_sources_json_scripting_/result.output @@ -1,5 +1,5 @@ -┌──────────────────────┬──────────────┬─────┐ -│ s │ date │ val │ -├──────────────────────┼──────────────┼─────┤ -│ "Строка utf-8" │ "2000-09-01" │ 100 │ -└──────────────────────┴──────────────┴─────┘ +┌────────────────┬──────────────┬─────┐ +│ s │ date │ val │ +├────────────────┼──────────────┼─────┤ +│ "Строка utf-8" │ "2000-09-01" │ 100 │ +└────────────────┴──────────────┴─────┘ diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_different_sources_json_stream_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_different_sources_json_stream_/result.output index d7d2f9e47e..f482d8fd14 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_different_sources_json_stream_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_different_sources_json_stream_/result.output @@ -1,5 +1,5 @@ -┌──────────────────────┬──────────────┬─────┐ -│ s │ date │ val │ -├──────────────────────┼──────────────┼─────┤ -│ "Строка utf-8" │ "2000-09-01" │ 100 │ -└──────────────────────┴──────────────┴─────┘ +┌────────────────┬──────────────┬─────┐ +│ s │ date │ val │ +├────────────────┼──────────────┼─────┤ +│ "Строка utf-8" │ "2000-09-01" │ 100 │ +└────────────────┴──────────────┴─────┘ diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_csv_scripting_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_csv_scripting_/result.output index 00de7b726c..d10b1e31be 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_csv_scripting_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_csv_scripting_/result.output @@ -3,11 +3,11 @@ ├─────────────┼─────┤ │ "Some text" │ 1 │ └─────────────┴─────┘ -┌─────────────────────────────────┬─────┐ -│ s │ num │ -├─────────────────────────────────┼─────┤ -│ "Строка 1\nСтрока2" │ 2 │ -└─────────────────────────────────┴─────┘ +┌─────────────────────┬─────┐ +│ s │ num │ +├─────────────────────┼─────┤ +│ "Строка 1\nСтрока2" │ 2 │ +└─────────────────────┴─────┘ ┌───────────┬─────┐ │ s │ num │ ├───────────┼─────┤ diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_csv_stream_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_csv_stream_/result.output index 00de7b726c..d10b1e31be 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_csv_stream_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_csv_stream_/result.output @@ -3,11 +3,11 @@ ├─────────────┼─────┤ │ "Some text" │ 1 │ └─────────────┴─────┘ -┌─────────────────────────────────┬─────┐ -│ s │ num │ -├─────────────────────────────────┼─────┤ -│ "Строка 1\nСтрока2" │ 2 │ -└─────────────────────────────────┴─────┘ +┌─────────────────────┬─────┐ +│ s │ num │ +├─────────────────────┼─────┤ +│ "Строка 1\nСтрока2" │ 2 │ +└─────────────────────┴─────┘ ┌───────────┬─────┐ │ s │ num │ ├───────────┼─────┤ diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_json_scripting_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_json_scripting_/result.output index 00de7b726c..d10b1e31be 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_json_scripting_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_json_scripting_/result.output @@ -3,11 +3,11 @@ ├─────────────┼─────┤ │ "Some text" │ 1 │ └─────────────┴─────┘ -┌─────────────────────────────────┬─────┐ -│ s │ num │ -├─────────────────────────────────┼─────┤ -│ "Строка 1\nСтрока2" │ 2 │ -└─────────────────────────────────┴─────┘ +┌─────────────────────┬─────┐ +│ s │ num │ +├─────────────────────┼─────┤ +│ "Строка 1\nСтрока2" │ 2 │ +└─────────────────────┴─────┘ ┌───────────┬─────┐ │ s │ num │ ├───────────┼─────┤ diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_json_stream_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_json_stream_/result.output index 00de7b726c..d10b1e31be 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_json_stream_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_json_stream_/result.output @@ -3,11 +3,11 @@ ├─────────────┼─────┤ │ "Some text" │ 1 │ └─────────────┴─────┘ -┌─────────────────────────────────┬─────┐ -│ s │ num │ -├─────────────────────────────────┼─────┤ -│ "Строка 1\nСтрока2" │ 2 │ -└─────────────────────────────────┴─────┘ +┌─────────────────────┬─────┐ +│ s │ num │ +├─────────────────────┼─────┤ +│ "Строка 1\nСтрока2" │ 2 │ +└─────────────────────┴─────┘ ┌───────────┬─────┐ │ s │ num │ ├───────────┼─────┤ diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_tsv_scripting_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_tsv_scripting_/result.output index 00de7b726c..d10b1e31be 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_tsv_scripting_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_tsv_scripting_/result.output @@ -3,11 +3,11 @@ ├─────────────┼─────┤ │ "Some text" │ 1 │ └─────────────┴─────┘ -┌─────────────────────────────────┬─────┐ -│ s │ num │ -├─────────────────────────────────┼─────┤ -│ "Строка 1\nСтрока2" │ 2 │ -└─────────────────────────────────┴─────┘ +┌─────────────────────┬─────┐ +│ s │ num │ +├─────────────────────┼─────┤ +│ "Строка 1\nСтрока2" │ 2 │ +└─────────────────────┴─────┘ ┌───────────┬─────┐ │ s │ num │ ├───────────┼─────┤ diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_tsv_stream_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_tsv_stream_/result.output index 00de7b726c..d10b1e31be 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_tsv_stream_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_scripting.TestExecuteScriptWithParamsFromStdin.test_framing_newline_delimited_tsv_stream_/result.output @@ -3,11 +3,11 @@ ├─────────────┼─────┤ │ "Some text" │ 1 │ └─────────────┴─────┘ -┌─────────────────────────────────┬─────┐ -│ s │ num │ -├─────────────────────────────────┼─────┤ -│ "Строка 1\nСтрока2" │ 2 │ -└─────────────────────────────────┴─────┘ +┌─────────────────────┬─────┐ +│ s │ num │ +├─────────────────────┼─────┤ +│ "Строка 1\nСтрока2" │ 2 │ +└─────────────────────┴─────┘ ┌───────────┬─────┐ │ s │ num │ ├───────────┼─────┤ diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromJson.test_multiple_files_data_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromJson.test_multiple_files_data_/result.output index ae89fde6f9..4db39649d7 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromJson.test_multiple_files_data_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromJson.test_multiple_files_data_/result.output @@ -1,5 +1,5 @@ -┌──────────────────┬──────┬──────────────┐ -│ str │ num │ date │ -├──────────────────┼──────┼──────────────┤ -│ "Строчка" │ 1542 │ "2011-11-11" │ -└──────────────────┴──────┴──────────────┘ +┌───────────┬──────┬──────────────┐ +│ str │ num │ date │ +├───────────┼──────┼──────────────┤ +│ "Строчка" │ 1542 │ "2011-11-11" │ +└───────────┴──────┴──────────────┘ diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromJson.test_multiple_files_scan_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromJson.test_multiple_files_scan_/result.output index ae89fde6f9..4db39649d7 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromJson.test_multiple_files_scan_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromJson.test_multiple_files_scan_/result.output @@ -1,5 +1,5 @@ -┌──────────────────┬──────┬──────────────┐ -│ str │ num │ date │ -├──────────────────┼──────┼──────────────┤ -│ "Строчка" │ 1542 │ "2011-11-11" │ -└──────────────────┴──────┴──────────────┘ +┌───────────┬──────┬──────────────┐ +│ str │ num │ date │ +├───────────┼──────┼──────────────┤ +│ "Строчка" │ 1542 │ "2011-11-11" │ +└───────────┴──────┴──────────────┘ diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_different_sources_json_data_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_different_sources_json_data_/result.output index d7d2f9e47e..f482d8fd14 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_different_sources_json_data_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_different_sources_json_data_/result.output @@ -1,5 +1,5 @@ -┌──────────────────────┬──────────────┬─────┐ -│ s │ date │ val │ -├──────────────────────┼──────────────┼─────┤ -│ "Строка utf-8" │ "2000-09-01" │ 100 │ -└──────────────────────┴──────────────┴─────┘ +┌────────────────┬──────────────┬─────┐ +│ s │ date │ val │ +├────────────────┼──────────────┼─────┤ +│ "Строка utf-8" │ "2000-09-01" │ 100 │ +└────────────────┴──────────────┴─────┘ diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_different_sources_json_scan_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_different_sources_json_scan_/result.output index d7d2f9e47e..f482d8fd14 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_different_sources_json_scan_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_different_sources_json_scan_/result.output @@ -1,5 +1,5 @@ -┌──────────────────────┬──────────────┬─────┐ -│ s │ date │ val │ -├──────────────────────┼──────────────┼─────┤ -│ "Строка utf-8" │ "2000-09-01" │ 100 │ -└──────────────────────┴──────────────┴─────┘ +┌────────────────┬──────────────┬─────┐ +│ s │ date │ val │ +├────────────────┼──────────────┼─────┤ +│ "Строка utf-8" │ "2000-09-01" │ 100 │ +└────────────────┴──────────────┴─────┘ diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_csv_data_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_csv_data_/result.output index 00de7b726c..d10b1e31be 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_csv_data_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_csv_data_/result.output @@ -3,11 +3,11 @@ ├─────────────┼─────┤ │ "Some text" │ 1 │ └─────────────┴─────┘ -┌─────────────────────────────────┬─────┐ -│ s │ num │ -├─────────────────────────────────┼─────┤ -│ "Строка 1\nСтрока2" │ 2 │ -└─────────────────────────────────┴─────┘ +┌─────────────────────┬─────┐ +│ s │ num │ +├─────────────────────┼─────┤ +│ "Строка 1\nСтрока2" │ 2 │ +└─────────────────────┴─────┘ ┌───────────┬─────┐ │ s │ num │ ├───────────┼─────┤ diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_csv_scan_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_csv_scan_/result.output index 00de7b726c..d10b1e31be 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_csv_scan_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_csv_scan_/result.output @@ -3,11 +3,11 @@ ├─────────────┼─────┤ │ "Some text" │ 1 │ └─────────────┴─────┘ -┌─────────────────────────────────┬─────┐ -│ s │ num │ -├─────────────────────────────────┼─────┤ -│ "Строка 1\nСтрока2" │ 2 │ -└─────────────────────────────────┴─────┘ +┌─────────────────────┬─────┐ +│ s │ num │ +├─────────────────────┼─────┤ +│ "Строка 1\nСтрока2" │ 2 │ +└─────────────────────┴─────┘ ┌───────────┬─────┐ │ s │ num │ ├───────────┼─────┤ diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_json_data_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_json_data_/result.output index 00de7b726c..d10b1e31be 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_json_data_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_json_data_/result.output @@ -3,11 +3,11 @@ ├─────────────┼─────┤ │ "Some text" │ 1 │ └─────────────┴─────┘ -┌─────────────────────────────────┬─────┐ -│ s │ num │ -├─────────────────────────────────┼─────┤ -│ "Строка 1\nСтрока2" │ 2 │ -└─────────────────────────────────┴─────┘ +┌─────────────────────┬─────┐ +│ s │ num │ +├─────────────────────┼─────┤ +│ "Строка 1\nСтрока2" │ 2 │ +└─────────────────────┴─────┘ ┌───────────┬─────┐ │ s │ num │ ├───────────┼─────┤ diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_json_scan_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_json_scan_/result.output index 00de7b726c..d10b1e31be 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_json_scan_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_json_scan_/result.output @@ -3,11 +3,11 @@ ├─────────────┼─────┤ │ "Some text" │ 1 │ └─────────────┴─────┘ -┌─────────────────────────────────┬─────┐ -│ s │ num │ -├─────────────────────────────────┼─────┤ -│ "Строка 1\nСтрока2" │ 2 │ -└─────────────────────────────────┴─────┘ +┌─────────────────────┬─────┐ +│ s │ num │ +├─────────────────────┼─────┤ +│ "Строка 1\nСтрока2" │ 2 │ +└─────────────────────┴─────┘ ┌───────────┬─────┐ │ s │ num │ ├───────────┼─────┤ diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_tsv_data_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_tsv_data_/result.output index 00de7b726c..d10b1e31be 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_tsv_data_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_tsv_data_/result.output @@ -3,11 +3,11 @@ ├─────────────┼─────┤ │ "Some text" │ 1 │ └─────────────┴─────┘ -┌─────────────────────────────────┬─────┐ -│ s │ num │ -├─────────────────────────────────┼─────┤ -│ "Строка 1\nСтрока2" │ 2 │ -└─────────────────────────────────┴─────┘ +┌─────────────────────┬─────┐ +│ s │ num │ +├─────────────────────┼─────┤ +│ "Строка 1\nСтрока2" │ 2 │ +└─────────────────────┴─────┘ ┌───────────┬─────┐ │ s │ num │ ├───────────┼─────┤ diff --git a/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_tsv_scan_/result.output b/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_tsv_scan_/result.output index 00de7b726c..d10b1e31be 100644 --- a/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_tsv_scan_/result.output +++ b/ydb/tests/functional/ydb_cli/canondata/test_ydb_table.TestExecuteQueryWithParamsFromStdin.test_framing_newline_delimited_tsv_scan_/result.output @@ -3,11 +3,11 @@ ├─────────────┼─────┤ │ "Some text" │ 1 │ └─────────────┴─────┘ -┌─────────────────────────────────┬─────┐ -│ s │ num │ -├─────────────────────────────────┼─────┤ -│ "Строка 1\nСтрока2" │ 2 │ -└─────────────────────────────────┴─────┘ +┌─────────────────────┬─────┐ +│ s │ num │ +├─────────────────────┼─────┤ +│ "Строка 1\nСтрока2" │ 2 │ +└─────────────────────┴─────┘ ┌───────────┬─────┐ │ s │ num │ ├───────────┼─────┤ |