Skip to content

Commit 7a742cd

Browse files
authored
Fix test & Sink (#8386)
1 parent 1500574 commit 7a742cd

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

ydb/core/kqp/runtime/kqp_write_actor.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,13 @@ class TKqpDirectWriteActor : public TActorBootstrapped<TKqpDirectWriteActor>, pu
447447
<< " Ignored this error."
448448
<< getIssues().ToOneLineString());
449449
// TODO: support waiting
450+
if (!InconsistentTx) {
451+
RuntimeError(
452+
TStringBuilder() << "Got OVERLOADED for table `"
453+
<< SchemeEntry->TableId.PathId.ToString() << "`.",
454+
NYql::NDqProto::StatusIds::OVERLOADED,
455+
getIssues());
456+
}
450457
return;
451458
}
452459
case NKikimrDataEvents::TEvWriteResult::STATUS_CANCELLED: {

ydb/core/kqp/ut/service/kqp_qs_queries_ut.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3896,7 +3896,7 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
38963896

38973897
{
38983898
auto it = client.StreamExecuteQuery(R"sql(
3899-
SELECT * FROM `/Root/ColumnShard`;
3899+
SELECT * FROM `/Root/ColumnShard` ORDER BY Col1;
39003900
)sql", NYdb::NQuery::TTxControl::BeginTx().CommitTx()).ExtractValueSync();
39013901
UNIT_ASSERT_VALUES_EQUAL_C(it.GetStatus(), EStatus::SUCCESS, it.GetIssues().ToString());
39023902
TString output = StreamResultToYson(it);
@@ -3909,7 +3909,8 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
39093909
auto it = client.StreamExecuteQuery(R"sql(
39103910
SELECT * FROM `/Root/DataShard`
39113911
UNION ALL
3912-
SELECT * FROM `/Root/ColumnShard`;
3912+
SELECT * FROM `/Root/ColumnShard`
3913+
ORDER BY Col1;
39133914
)sql", NYdb::NQuery::TTxControl::BeginTx().CommitTx()).ExtractValueSync();
39143915
UNIT_ASSERT_VALUES_EQUAL_C(it.GetStatus(), EStatus::SUCCESS, it.GetIssues().ToString());
39153916
TString output = StreamResultToYson(it);
@@ -3920,8 +3921,9 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
39203921

39213922
{
39223923
auto it = client.StreamExecuteQuery(R"sql(
3923-
SELECT r.Col3, c.Col3 FROM `/Root/DataShard` AS r
3924-
JOIN `/Root/ColumnShard` AS c ON r.Col1 + 1 = c.Col1;
3924+
SELECT r.Col3 AS a, c.Col3 AS b FROM `/Root/DataShard` AS r
3925+
JOIN `/Root/ColumnShard` AS c ON r.Col1 + 1 = c.Col1
3926+
ORDER BY a;
39253927
)sql", NYdb::NQuery::TTxControl::BeginTx().CommitTx()).ExtractValueSync();
39263928
UNIT_ASSERT_VALUES_EQUAL_C(it.GetStatus(), EStatus::SUCCESS, it.GetIssues().ToString());
39273929
TString output = StreamResultToYson(it);

0 commit comments

Comments
 (0)