Skip to content

Commit d2b8ff8

Browse files
zverevgenynikvas0
authored andcommitted
Fix tx tests (#8945) (#9284)
Co-authored-by: Nikita Vasilev <[email protected]>
1 parent 12b1d9b commit d2b8ff8

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

ydb/core/kqp/executer_actor/kqp_data_executer.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -535,10 +535,11 @@ class TKqpDataExecuter : public TKqpExecuterBase<TKqpDataExecuter, EExecType::Da
535535
Counters->TxProxyMon->TxResultAborted->Inc();
536536
LocksBroken = true;
537537

538-
YQL_ENSURE(!res->Record.GetTxLocks().empty());
539-
ResponseEv->BrokenLockPathId = NYql::TKikimrPathId(
540-
res->Record.GetTxLocks(0).GetSchemeShard(),
541-
res->Record.GetTxLocks(0).GetPathId());
538+
if (!res->Record.GetTxLocks().empty()) {
539+
ResponseEv->BrokenLockPathId = NYql::TKikimrPathId(
540+
res->Record.GetTxLocks(0).GetSchemeShard(),
541+
res->Record.GetTxLocks(0).GetPathId());
542+
}
542543
ReplyErrorAndDie(Ydb::StatusIds::ABORTED, {});
543544
}
544545
default:
@@ -1230,9 +1231,8 @@ class TKqpDataExecuter : public TKqpExecuterBase<TKqpDataExecuter, EExecType::Da
12301231
ResponseEv->BrokenLockPathId = NYql::TKikimrPathId(
12311232
res->Record.GetTxLocks(0).GetSchemeShard(),
12321233
res->Record.GetTxLocks(0).GetPathId());
1233-
return ReplyErrorAndDie(Ydb::StatusIds::ABORTED, {});
1234+
ReplyErrorAndDie(Ydb::StatusIds::ABORTED, {});
12341235
}
1235-
12361236
CheckExecutionComplete();
12371237
return;
12381238
}

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)