From 5edc1521952b97e0040bc81ec907369dc2d010ab Mon Sep 17 00:00:00 2001
From: Nikita Vasilev <ns-vasilev@ydb.tech>
Date: Mon, 9 Sep 2024 16:33:37 +0300
Subject: [PATCH] Fix tx tests (#8945)

---
 ydb/core/kqp/executer_actor/kqp_data_executer.cpp | 12 ++++++------
 ydb/core/kqp/ut/tx/kqp_sink_locks_ut.cpp          |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ydb/core/kqp/executer_actor/kqp_data_executer.cpp b/ydb/core/kqp/executer_actor/kqp_data_executer.cpp
index c139976ed896..59646449a255 100644
--- a/ydb/core/kqp/executer_actor/kqp_data_executer.cpp
+++ b/ydb/core/kqp/executer_actor/kqp_data_executer.cpp
@@ -535,10 +535,11 @@ class TKqpDataExecuter : public TKqpExecuterBase<TKqpDataExecuter, EExecType::Da
                 Counters->TxProxyMon->TxResultAborted->Inc();
                 LocksBroken = true;
 
-                YQL_ENSURE(!res->Record.GetTxLocks().empty());
-                ResponseEv->BrokenLockPathId = NYql::TKikimrPathId(
-                    res->Record.GetTxLocks(0).GetSchemeShard(),
-                    res->Record.GetTxLocks(0).GetPathId());
+                if (!res->Record.GetTxLocks().empty()) {
+                    ResponseEv->BrokenLockPathId = NYql::TKikimrPathId(
+                        res->Record.GetTxLocks(0).GetSchemeShard(),
+                        res->Record.GetTxLocks(0).GetPathId());
+                }
                 ReplyErrorAndDie(Ydb::StatusIds::ABORTED, {});
             }
             default:
@@ -1230,9 +1231,8 @@ class TKqpDataExecuter : public TKqpExecuterBase<TKqpDataExecuter, EExecType::Da
                     ResponseEv->BrokenLockPathId = NYql::TKikimrPathId(
                         res->Record.GetTxLocks(0).GetSchemeShard(),
                         res->Record.GetTxLocks(0).GetPathId());
-                    return ReplyErrorAndDie(Ydb::StatusIds::ABORTED, {});
+                    ReplyErrorAndDie(Ydb::StatusIds::ABORTED, {});
                 }
-
                 CheckExecutionComplete();
                 return;
             }
diff --git a/ydb/core/kqp/ut/tx/kqp_sink_locks_ut.cpp b/ydb/core/kqp/ut/tx/kqp_sink_locks_ut.cpp
index e95f91df791a..45428d86c8a7 100644
--- a/ydb/core/kqp/ut/tx/kqp_sink_locks_ut.cpp
+++ b/ydb/core/kqp/ut/tx/kqp_sink_locks_ut.cpp
@@ -98,7 +98,6 @@ Y_UNIT_TEST_SUITE(KqpSinkLocks) {
             auto commitResult = tx1->Commit().GetValueSync();
             UNIT_ASSERT_VALUES_EQUAL_C(commitResult.GetStatus(), EStatus::ABORTED, commitResult.GetIssues().ToString());
             commitResult.GetIssues().PrintTo(Cerr);
-            UNIT_ASSERT_C(commitResult.GetIssues().Size() != 0, commitResult.GetIssues().ToString());
             if (!GetIsOlap()) {
                 UNIT_ASSERT_C(HasIssue(commitResult.GetIssues(), NYql::TIssuesIds::KIKIMR_LOCKS_INVALIDATED,
                     [] (const NYql::TIssue& issue) {