@@ -498,10 +498,11 @@ class TKqpDataExecuter : public TKqpExecuterBase<TKqpDataExecuter, EExecType::Da
498
498
Counters->TxProxyMon ->TxResultAborted ->Inc ();
499
499
LocksBroken = true ;
500
500
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
+ }
505
506
ReplyErrorAndDie (Ydb::StatusIds::ABORTED, {});
506
507
}
507
508
default :
@@ -1193,11 +1194,14 @@ class TKqpDataExecuter : public TKqpExecuterBase<TKqpDataExecuter, EExecType::Da
1193
1194
shardState->State = TShardState::EState::Finished;
1194
1195
Counters->TxProxyMon ->TxResultAborted ->Inc ();
1195
1196
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 ;
1201
1205
}
1202
1206
default :
1203
1207
{
0 commit comments