Skip to content

Commit 3976f9e

Browse files
corrections
1 parent 4d7b1ff commit 3976f9e

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

ydb/core/tx/columnshard/columnshard__write.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -320,17 +320,14 @@ class TCommitOperation {
320320
return TConclusionStatus::Fail("incorrect synchronization data (send/receiving lists)");
321321
}
322322
if (ReceivingShards.size() && SendingShards.size()) {
323+
if (!ReceivingShards.contains(TabletId) && !SendingShards.contains(TabletId)) {
324+
return TConclusionStatus::Fail("shard is incorrect for sending/receiving lists");
325+
}
323326
if (!locks.HasArbiterColumnShard()) {
324327
ArbiterColumnShard = *ReceivingShards.begin();
325-
if (!ReceivingShards.contains(TabletId) && !SendingShards.contains(TabletId)) {
326-
return TConclusionStatus::Fail("shard is incorrect for sending/receiving lists");
327-
}
328328
} else {
329329
ArbiterColumnShard = locks.GetArbiterColumnShard();
330330
AFL_VERIFY(ArbiterColumnShard);
331-
if (!ReceivingShards.contains(TabletId) && !SendingShards.contains(TabletId)) {
332-
return TConclusionStatus::Fail("shard is incorrect for sending/receiving lists");
333-
}
334331
}
335332
}
336333

ydb/core/tx/columnshard/transactions/operators/ev_write/primary.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@ class TEvWriteCommitPrimaryTransactionOperator: public TEvWriteCommitSyncTransac
159159
};
160160

161161
virtual bool IsTxBroken() const override {
162-
return TxBroken.value_or(false);
162+
AFL_VERIFY(TxBroken);
163+
return *TxBroken;
163164
}
164165

165166
void InitializeRequests(TColumnShard& owner) {

0 commit comments

Comments
 (0)