Skip to content

Commit b9760d3

Browse files
authored
Fix tx tests (#8945)
1 parent 33c7713 commit b9760d3

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

ydb/core/kqp/executer_actor/kqp_data_executer.cpp

+13-9
Original file line numberDiff line numberDiff line change
@@ -498,10 +498,11 @@ class TKqpDataExecuter : public TKqpExecuterBase<TKqpDataExecuter, EExecType::Da
498498
Counters->TxProxyMon->TxResultAborted->Inc();
499499
LocksBroken = true;
500500

501-
YQL_ENSURE(!res->Record.GetTxLocks().empty());
502-
ResponseEv->BrokenLockPathId = NYql::TKikimrPathId(
503-
res->Record.GetTxLocks(0).GetSchemeShard(),
504-
res->Record.GetTxLocks(0).GetPathId());
501+
if (!res->Record.GetTxLocks().empty()) {
502+
ResponseEv->BrokenLockPathId = NYql::TKikimrPathId(
503+
res->Record.GetTxLocks(0).GetSchemeShard(),
504+
res->Record.GetTxLocks(0).GetPathId());
505+
}
505506
ReplyErrorAndDie(Ydb::StatusIds::ABORTED, {});
506507
}
507508
default:
@@ -1193,11 +1194,14 @@ class TKqpDataExecuter : public TKqpExecuterBase<TKqpDataExecuter, EExecType::Da
11931194
shardState->State = TShardState::EState::Finished;
11941195
Counters->TxProxyMon->TxResultAborted->Inc();
11951196
LocksBroken = true;
1196-
YQL_ENSURE(!res->Record.GetTxLocks().empty());
1197-
ResponseEv->BrokenLockPathId = NYql::TKikimrPathId(
1198-
res->Record.GetTxLocks(0).GetSchemeShard(),
1199-
res->Record.GetTxLocks(0).GetPathId());
1200-
ReplyErrorAndDie(Ydb::StatusIds::ABORTED, {});
1197+
if (!res->Record.GetTxLocks().empty()) {
1198+
ResponseEv->BrokenLockPathId = NYql::TKikimrPathId(
1199+
res->Record.GetTxLocks(0).GetSchemeShard(),
1200+
res->Record.GetTxLocks(0).GetPathId());
1201+
ReplyErrorAndDie(Ydb::StatusIds::ABORTED, {});
1202+
}
1203+
CheckExecutionComplete();
1204+
return;
12011205
}
12021206
default:
12031207
{

ydb/core/kqp/ut/tx/kqp_sink_locks_ut.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ Y_UNIT_TEST_SUITE(KqpSinkLocks) {
9898
auto commitResult = tx1->Commit().GetValueSync();
9999
UNIT_ASSERT_VALUES_EQUAL_C(commitResult.GetStatus(), EStatus::ABORTED, commitResult.GetIssues().ToString());
100100
commitResult.GetIssues().PrintTo(Cerr);
101-
UNIT_ASSERT_C(commitResult.GetIssues().Size() != 0, commitResult.GetIssues().ToString());
102101
if (!GetIsOlap()) {
103102
UNIT_ASSERT_C(HasIssue(commitResult.GetIssues(), NYql::TIssuesIds::KIKIMR_LOCKS_INVALIDATED,
104103
[] (const NYql::TIssue& issue) {

0 commit comments

Comments
 (0)