corrections

ydb-platform · Jan 9, 2025 · 3976f9e · 3976f9e
1 parent 4d7b1ff
commit 3976f9e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/ydb/core/tx/columnshard/columnshard__write.cpp b/ydb/core/tx/columnshard/columnshard__write.cpp
@@ -320,17 +320,14 @@ class TCommitOperation {
             return TConclusionStatus::Fail("incorrect synchronization data (send/receiving lists)");
         }
         if (ReceivingShards.size() && SendingShards.size()) {
+            if (!ReceivingShards.contains(TabletId) && !SendingShards.contains(TabletId)) {
+                return TConclusionStatus::Fail("shard is incorrect for sending/receiving lists");
+            }
             if (!locks.HasArbiterColumnShard()) {
                 ArbiterColumnShard = *ReceivingShards.begin();
-                if (!ReceivingShards.contains(TabletId) && !SendingShards.contains(TabletId)) {
-                    return TConclusionStatus::Fail("shard is incorrect for sending/receiving lists");
-                }
             } else {
                 ArbiterColumnShard = locks.GetArbiterColumnShard();
                 AFL_VERIFY(ArbiterColumnShard);
-                if (!ReceivingShards.contains(TabletId) && !SendingShards.contains(TabletId)) {
-                    return TConclusionStatus::Fail("shard is incorrect for sending/receiving lists");
-                }
             }
         }
 

diff --git a/ydb/core/tx/columnshard/transactions/operators/ev_write/primary.h b/ydb/core/tx/columnshard/transactions/operators/ev_write/primary.h
@@ -159,7 +159,8 @@ class TEvWriteCommitPrimaryTransactionOperator: public TEvWriteCommitSyncTransac
     };
 
     virtual bool IsTxBroken() const override {
-        return TxBroken.value_or(false);
+        AFL_VERIFY(TxBroken);
+        return *TxBroken;
     }
 
     void InitializeRequests(TColumnShard& owner) {