Browse Source

Remove TCoordinatorInfo::TabletId

azevaykin 1 year ago
parent
commit
292449001f
2 changed files with 4 additions and 6 deletions
  1. 2 2
      ydb/core/tx/columnshard/tx_controller.cpp
  2. 2 4
      ydb/core/tx/data_events/events.h

+ 2 - 2
ydb/core/tx/columnshard/tx_controller.cpp

@@ -174,9 +174,9 @@ NEvents::TDataEvents::TCoordinatorInfo TTxController::GetCoordinatorInfo(const u
     auto txInfo = BasicTxInfo.FindPtr(txId);
     Y_ABORT_UNLESS(txInfo);
     if (Owner.ProcessingParams) {
-        return NEvents::TDataEvents::TCoordinatorInfo(Owner.TabletID(), txInfo->MinStep, txInfo->MaxStep, Owner.ProcessingParams->GetCoordinators());
+        return NEvents::TDataEvents::TCoordinatorInfo(txInfo->MinStep, txInfo->MaxStep, Owner.ProcessingParams->GetCoordinators());
     }
-    return NEvents::TDataEvents::TCoordinatorInfo(Owner.TabletID(), txInfo->MinStep, txInfo->MaxStep, {});
+    return NEvents::TDataEvents::TCoordinatorInfo(txInfo->MinStep, txInfo->MaxStep, {});
 }
 
 size_t TTxController::CleanExpiredTxs(NTabletFlatExecutor::TTransactionContext& txc) {

+ 2 - 4
ydb/core/tx/data_events/events.h

@@ -16,15 +16,13 @@ namespace NKikimr::NEvents {
 struct TDataEvents {
 
     class TCoordinatorInfo {
-        YDB_READONLY_DEF(ui64, TabletId);
         YDB_READONLY(ui64, MinStep, 0);
         YDB_READONLY(ui64, MaxStep, 0);
         YDB_READONLY_DEF(google::protobuf::RepeatedField<ui64>, DomainCoordinators);
 
     public:
-        TCoordinatorInfo(const ui64 tabletId, const ui64 minStep, const ui64 maxStep, const google::protobuf::RepeatedField<ui64>& coordinators)
-            : TabletId(tabletId)
-            , MinStep(minStep)
+        TCoordinatorInfo(const ui64 minStep, const ui64 maxStep, const google::protobuf::RepeatedField<ui64>& coordinators)
+            : MinStep(minStep)
             , MaxStep(maxStep)
             , DomainCoordinators(coordinators) {}
     };