diff options
| author | udovichenko-r <udovichenko-r@yandex-team.com> | 2025-04-22 14:58:48 +0300 |
|---|---|---|
| committer | udovichenko-r <udovichenko-r@yandex-team.com> | 2025-04-22 15:23:02 +0300 |
| commit | 5bd08bac300a4c0e79e4e99dd68ca9fd8e45a2d4 (patch) | |
| tree | ee269fb6a5ec08a106c38ee8f6fb3f2cefc4efb8 | |
| parent | cdfd20709351da8c71a6c295fd1b71ca10fad2cc (diff) | |
| download | ydb-5bd08bac300a4c0e79e4e99dd68ca9fd8e45a2d4.tar.gz | |
Allow column groups with single column
commit_hash:bc699799776c0e43669867c9ef261fb1e006efa4
4 files changed, 5 insertions, 17 deletions
diff --git a/yt/yql/providers/yt/provider/yql_yt_op_settings.cpp b/yt/yql/providers/yt/provider/yql_yt_op_settings.cpp index 929fbcc9287..19f0889a66e 100644 --- a/yt/yql/providers/yt/provider/yql_yt_op_settings.cpp +++ b/yt/yql/providers/yt/provider/yql_yt_op_settings.cpp @@ -854,9 +854,9 @@ bool ValidateSettings(const TExprNode& settingsNode, EYtSettingTypes accepted, T << "Expected list value, group: " << it->first.Quote())); return false; - } else if (it->second.AsList().size() < 2) { + } else if (it->second.AsList().empty()) { ctx.AddError(TIssue(ctx.GetPosition(setting->Tail().Pos()), TStringBuilder() - << "Expected list with at least two columns, group: " + << "Expected non empty column list, group: " << it->first.Quote())); return false; } else { @@ -904,7 +904,7 @@ bool ValidateSettings(const TExprNode& settingsNode, EYtSettingTypes accepted, T return false; } } - return true; + break; } case EYtSettingType::BlockOutputReady: { if (!EnsureTupleSize(*setting, 2, ctx)) { @@ -917,7 +917,7 @@ bool ValidateSettings(const TExprNode& settingsNode, EYtSettingTypes accepted, T << "Unsupported block output mode value " << TString{setting->Child(1)->Content()}.Quote())); return false; } - return true; + break; } case EYtSettingType::QLFilter: { if (!EnsureTupleSize(*setting, 2, ctx)) { diff --git a/yt/yql/tests/sql/suites/column_group/hint_empty_grp_fail.sql b/yt/yql/tests/sql/suites/column_group/hint_empty_grp_fail.sql index 521675ee5d7..15f6fc28d83 100644 --- a/yt/yql/tests/sql/suites/column_group/hint_empty_grp_fail.sql +++ b/yt/yql/tests/sql/suites/column_group/hint_empty_grp_fail.sql @@ -1,4 +1,4 @@ -/* custom error:Expected list with at least two columns, group: "g1"*/ +/* custom error: Expected non empty column list, group: "g1" */ USE plato; -- empty group diff --git a/yt/yql/tests/sql/suites/column_group/hint_short_grp_fail.cfg b/yt/yql/tests/sql/suites/column_group/hint_short_grp_fail.cfg deleted file mode 100644 index f5c8eefa7e9..00000000000 --- a/yt/yql/tests/sql/suites/column_group/hint_short_grp_fail.cfg +++ /dev/null @@ -1,5 +0,0 @@ -xfail -in Input input.txt -out Output output.txt -providers yt -pragma yt.ColumnGroupMode="perusage" diff --git a/yt/yql/tests/sql/suites/column_group/hint_short_grp_fail.sql b/yt/yql/tests/sql/suites/column_group/hint_short_grp_fail.sql deleted file mode 100644 index 895f4cbd612..00000000000 --- a/yt/yql/tests/sql/suites/column_group/hint_short_grp_fail.sql +++ /dev/null @@ -1,7 +0,0 @@ -/* custom error:Expected list with at least two columns, group: "g1"*/ -USE plato; - --- too short group -insert into Output -with column_groups="{g1=[a];def=#}" -select * from Input; |