(refactoring) Basic ISubOperationState, ISubOperationBase -> ISubOperation

ydb/core/tx/schemeshard/schemeshard__init.cpp

@@ -3426,7 +3426,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> {
 
                 TOperation::TPtr operation = Self->Operations.at(operationId.GetTxId());
                 Y_VERIFY(operationId.GetSubTxId() == operation->Parts.size());
-                ISubOperationBase::TPtr part = operation->RestorePart(txState.TxType, txState.State);
+                ISubOperation::TPtr part = operation->RestorePart(txState.TxType, txState.State);
                 operation->AddPart(part);
 
                 if (!txInFlightRowset.Next())

ydb/core/tx/schemeshard/schemeshard__operation.cpp

@@ -97,7 +97,7 @@ struct TSchemeShard::TTxOperationProposeCancelTx: public NTabletFlatExecutor::TT
 
         txc.DB.NoMoreReadsForTx();
 
-        ISubOperationBase::TPtr part = CreateTxCancelTx(Ev);
+        ISubOperation::TPtr part = CreateTxCancelTx(Ev);
         TOperationContext context{Self, txc, ctx, OnComplete, MemChanges, DbChanges};
         auto fakeResponse = part->Propose(TString(), context);
         Y_UNUSED(fakeResponse);
@@ -360,7 +360,7 @@ struct TSchemeShard::TTxOperationProgress: public NTabletFlatExecutor::TTransact
             return true;
         }
 
-        ISubOperationBase::TPtr part = operation->Parts.at(ui64(OpId.GetSubTxId()));
+        ISubOperation::TPtr part = operation->Parts.at(ui64(OpId.GetSubTxId()));
 
         TOperationContext context{Self, txc, ctx, OnComplete, MemChanges, DbChanges};
 
@@ -405,7 +405,7 @@ struct TSchemeShard::TTxOperationReply {};
                         "TTxOperationReply<" #TEvType "> execute " \
                             << ", operationId: " << OperationId \
                             << ", at schemeshard: " << Self->TabletID() \
-                            << ", message: " << IOperationBase::DebugReply(EvReply)); \
+                            << ", message: " << ISubOperationState::DebugReply(EvReply)); \
             if (!Self->Operations.contains(OperationId.GetTxId())) { \
                 return true; \
             } \
@@ -418,7 +418,7 @@ struct TSchemeShard::TTxOperationReply {};
                                << ", at schemeshard: " << Self->TabletID()); \
                 return true; \
             } \
-            ISubOperationBase::TPtr part = operation->Parts.at(ui64(OperationId.GetSubTxId())); \
+            ISubOperation::TPtr part = operation->Parts.at(ui64(OperationId.GetSubTxId())); \
             TOperationContext context{Self, txc, ctx, OnComplete, MemChanges, DbChanges}; \
             Y_VERIFY(EvReply); \
             part->HandleReply(EvReply, context); \
@@ -842,7 +842,7 @@ TOperation::TSplitTransactionsResult TOperation::SplitIntoTransactions(const TTx
     return result;
 }
 
-ISubOperationBase::TPtr TOperation::RestorePart(TTxState::ETxType txType, TTxState::ETxState txState) const {
+ISubOperation::TPtr TOperation::RestorePart(TTxState::ETxType txType, TTxState::ETxState txState) const {
     switch (txType) {
     case TTxState::ETxType::TxMkDir:
         return CreateMkDir(NextPartId(), txState);
@@ -1026,7 +1026,7 @@ ISubOperationBase::TPtr TOperation::RestorePart(TTxState::ETxType txType, TTxSta
     Y_UNREACHABLE();
 }
 
-ISubOperationBase::TPtr TOperation::ConstructPart(NKikimrSchemeOp::EOperationType opType, const TTxTransaction& tx) const {
+ISubOperation::TPtr TOperation::ConstructPart(NKikimrSchemeOp::EOperationType opType, const TTxTransaction& tx) const {
     switch (opType) {
     case NKikimrSchemeOp::EOperationType::ESchemeOpMkDir:
         return CreateMkDir(NextPartId(), tx);
@@ -1232,7 +1232,7 @@ ISubOperationBase::TPtr TOperation::ConstructPart(NKikimrSchemeOp::EOperationTyp
     Y_UNREACHABLE();
 }
 
-TVector<ISubOperationBase::TPtr> TOperation::ConstructParts(const TTxTransaction& tx, TOperationContext& context) const {
+TVector<ISubOperation::TPtr> TOperation::ConstructParts(const TTxTransaction& tx, TOperationContext& context) const {
     const auto& opType = tx.GetOperationType();
 
     switch (opType) {
@@ -1278,7 +1278,7 @@ TVector<ISubOperationBase::TPtr> TOperation::ConstructParts(const TTxTransaction
     }
 }
 
-void TOperation::AddPart(ISubOperationBase::TPtr part) {
+void TOperation::AddPart(ISubOperation::TPtr part) {
     Parts.push_back(part);
 }
 

ydb/core/tx/schemeshard/schemeshard__operation.h

@@ -11,7 +11,7 @@ struct TOperation: TSimpleRefCount<TOperation> {
     using TPtr = TIntrusivePtr<TOperation>;
 
     const TTxId TxId;
-    TVector<ISubOperationBase::TPtr> Parts;
+    TVector<ISubOperation::TPtr> Parts;
 
     THashSet<TActorId> Subscribers;
     THashSet<TTxId> DependentOperations;
@@ -79,10 +79,10 @@ struct TOperation: TSimpleRefCount<TOperation> {
     static TConsumeQuotaResult ConsumeQuota(const TTxTransaction& tx, TOperationContext& context);
     static TSplitTransactionsResult SplitIntoTransactions(const TTxTransaction& tx, const TOperationContext& context);
 
-    ISubOperationBase::TPtr RestorePart(TTxState::ETxType opType, TTxState::ETxState opState) const;
-    ISubOperationBase::TPtr ConstructPart(NKikimrSchemeOp::EOperationType opType, const TTxTransaction& tx) const;
-    TVector<ISubOperationBase::TPtr> ConstructParts(const TTxTransaction& tx, TOperationContext& context) const;
-    void AddPart(ISubOperationBase::TPtr part);
+    ISubOperation::TPtr RestorePart(TTxState::ETxType opType, TTxState::ETxState opState) const;
+    ISubOperation::TPtr ConstructPart(NKikimrSchemeOp::EOperationType opType, const TTxTransaction& tx) const;
+    TVector<ISubOperation::TPtr> ConstructParts(const TTxTransaction& tx, TOperationContext& context) const;
+    void AddPart(ISubOperation::TPtr part);
 
     bool AddPublishingPath(TPathId pathId, ui64 version);
     bool IsPublished() const;
@@ -149,7 +149,7 @@ struct TOperation: TSimpleRefCount<TOperation> {
     }
 };
 
-inline TOperationId NextPartId(const TOperationId& opId, const TVector<ISubOperationBase::TPtr>& parts) {
+inline TOperationId NextPartId(const TOperationId& opId, const TVector<ISubOperation::TPtr>& parts) {
     return TOperationId(opId.GetTxId(), opId.GetSubTxId() + parts.size());
 }
 

ydb/core/tx/schemeshard/schemeshard__operation_allocate_pq.cpp

@@ -488,11 +488,11 @@ public:
 
 namespace NKikimr::NSchemeShard {
 
-ISubOperationBase::TPtr CreateAllocatePQ(TOperationId id, const TTxTransaction& tx) {
+ISubOperation::TPtr CreateAllocatePQ(TOperationId id, const TTxTransaction& tx) {
     return MakeSubOperation<TAllocatePQ>(id, tx);
 }
 
-ISubOperationBase::TPtr CreateAllocatePQ(TOperationId id, TTxState::ETxState state) {
+ISubOperation::TPtr CreateAllocatePQ(TOperationId id, TTxState::ETxState state) {
     Y_VERIFY(state != TTxState::Invalid);
     return MakeSubOperation<TAllocatePQ>(id, state);
 }

ydb/core/tx/schemeshard/schemeshard__operation_alter_bsv.cpp

@@ -635,11 +635,11 @@ public:
 
 namespace NKikimr::NSchemeShard {
 
-ISubOperationBase::TPtr CreateAlterBSV(TOperationId id, const TTxTransaction& tx) {
+ISubOperation::TPtr CreateAlterBSV(TOperationId id, const TTxTransaction& tx) {
     return MakeSubOperation<TAlterBlockStoreVolume>(id, tx);
 }
 
-ISubOperationBase::TPtr CreateAlterBSV(TOperationId id, TTxState::ETxState state) {
+ISubOperation::TPtr CreateAlterBSV(TOperationId id, TTxState::ETxState state) {
     Y_VERIFY(state != TTxState::Invalid);
     return MakeSubOperation<TAlterBlockStoreVolume>(id, state);
 }

ydb/core/tx/schemeshard/schemeshard__operation_alter_cdc_stream.cpp

@@ -469,23 +469,23 @@ private:
 
 } // anonymous
 
-ISubOperationBase::TPtr CreateAlterCdcStreamImpl(TOperationId id, const TTxTransaction& tx) {
+ISubOperation::TPtr CreateAlterCdcStreamImpl(TOperationId id, const TTxTransaction& tx) {
     return MakeSubOperation<TAlterCdcStream>(id, tx);
 }
 
-ISubOperationBase::TPtr CreateAlterCdcStreamImpl(TOperationId id, TTxState::ETxState state) {
+ISubOperation::TPtr CreateAlterCdcStreamImpl(TOperationId id, TTxState::ETxState state) {
     return MakeSubOperation<TAlterCdcStream>(id, state);
 }
 
-ISubOperationBase::TPtr CreateAlterCdcStreamAtTable(TOperationId id, const TTxTransaction& tx, bool dropSnapshot) {
+ISubOperation::TPtr CreateAlterCdcStreamAtTable(TOperationId id, const TTxTransaction& tx, bool dropSnapshot) {
     return MakeSubOperation<TAlterCdcStreamAtTable>(id, tx, dropSnapshot);
 }
 
-ISubOperationBase::TPtr CreateAlterCdcStreamAtTable(TOperationId id, TTxState::ETxState state, bool dropSnapshot) {
+ISubOperation::TPtr CreateAlterCdcStreamAtTable(TOperationId id, TTxState::ETxState state, bool dropSnapshot) {
     return MakeSubOperation<TAlterCdcStreamAtTable>(id, state, dropSnapshot);
 }
 
-TVector<ISubOperationBase::TPtr> CreateAlterCdcStream(TOperationId opId, const TTxTransaction& tx, TOperationContext& context) {
+TVector<ISubOperation::TPtr> CreateAlterCdcStream(TOperationId opId, const TTxTransaction& tx, TOperationContext& context) {
     Y_VERIFY(tx.GetOperationType() == NKikimrSchemeOp::EOperationType::ESchemeOpAlterCdcStream);
 
     LOG_D("CreateAlterCdcStream"
@@ -542,7 +542,7 @@ TVector<ISubOperationBase::TPtr> CreateAlterCdcStream(TOperationId opId, const T
         return {CreateReject(opId, NKikimrScheme::StatusMultipleModifications, errStr)};
     }
 
-    TVector<ISubOperationBase::TPtr> result;
+    TVector<ISubOperation::TPtr> result;
 
     {
         auto outTx = TransactionTemplate(tablePath.PathString(), NKikimrSchemeOp::EOperationType::ESchemeOpAlterCdcStreamImpl);

ydb/core/tx/schemeshard/schemeshard__operation_alter_extsubdomain.cpp

@@ -870,25 +870,25 @@ public:
 
 } // anonymous namespace
 
-ISubOperationBase::TPtr CreateAlterExtSubDomainCreateHive(TOperationId id, const TTxTransaction& tx) {
+ISubOperation::TPtr CreateAlterExtSubDomainCreateHive(TOperationId id, const TTxTransaction& tx) {
     return MakeSubOperation<TAlterExtSubDomainCreateHive>(id, tx);
 }
 
-ISubOperationBase::TPtr CreateAlterExtSubDomainCreateHive(TOperationId id, TTxState::ETxState state) {
+ISubOperation::TPtr CreateAlterExtSubDomainCreateHive(TOperationId id, TTxState::ETxState state) {
     Y_VERIFY(state != TTxState::Invalid);
     return MakeSubOperation<TAlterExtSubDomainCreateHive>(id, state);
 }
 
-ISubOperationBase::TPtr CreateAlterExtSubDomain(TOperationId id, const TTxTransaction& tx) {
+ISubOperation::TPtr CreateAlterExtSubDomain(TOperationId id, const TTxTransaction& tx) {
     return MakeSubOperation<TAlterExtSubDomain>(id, tx);
 }
 
-ISubOperationBase::TPtr CreateAlterExtSubDomain(TOperationId id, TTxState::ETxState state) {
+ISubOperation::TPtr CreateAlterExtSubDomain(TOperationId id, TTxState::ETxState state) {
     Y_VERIFY(state != TTxState::Invalid);
     return MakeSubOperation<TAlterExtSubDomain>(id, state);
 }
 
-TVector<ISubOperationBase::TPtr> CreateCompatibleAlterExtSubDomain(TOperationId id, const TTxTransaction& tx, TOperationContext& context) {
+TVector<ISubOperation::TPtr> CreateCompatibleAlterExtSubDomain(TOperationId id, const TTxTransaction& tx, TOperationContext& context) {
     Y_VERIFY(tx.GetOperationType() == NKikimrSchemeOp::ESchemeOpAlterExtSubDomain);
 
     LOG_I("CreateCompatibleAlterExtSubDomain, opId " << id
@@ -902,7 +902,7 @@ TVector<ISubOperationBase::TPtr> CreateCompatibleAlterExtSubDomain(TOperationId
 
     LOG_I("CreateCompatibleAlterExtSubDomain, opId " << id << ", path " << parentPathStr << "/" << name);
 
-    auto errorResult = [&id](NKikimrScheme::EStatus status, const TStringBuf& msg) -> TVector<ISubOperationBase::TPtr> {
+    auto errorResult = [&id](NKikimrScheme::EStatus status, const TStringBuf& msg) -> TVector<ISubOperation::TPtr> {
         return {CreateReject(id, status, TStringBuilder() << "Invalid AlterExtSubDomain request: " << msg)};
     };
 
@@ -963,7 +963,7 @@ TVector<ISubOperationBase::TPtr> CreateCompatibleAlterExtSubDomain(TOperationId
     }
 
     // create suboperations
-    TVector<ISubOperationBase::TPtr> result;
+    TVector<ISubOperation::TPtr> result;
 
     if (delta.AddExternalHive && context.SS->EnableAlterDatabaseCreateHiveFirst) {
         auto msg = TransactionTemplate(parentPathStr, NKikimrSchemeOp::ESchemeOpAlterExtSubDomainCreateHive);

ydb/core/tx/schemeshard/schemeshard__operation_alter_fs.cpp

@@ -533,11 +533,11 @@ void TAlterFileStore::ApplyChannelBindings(
 
 namespace NKikimr::NSchemeShard {
 
-ISubOperationBase::TPtr CreateAlterFileStore(TOperationId id, const TTxTransaction& tx) {
+ISubOperation::TPtr CreateAlterFileStore(TOperationId id, const TTxTransaction& tx) {
     return MakeSubOperation<TAlterFileStore>(id, tx);
 }
 
-ISubOperationBase::TPtr CreateAlterFileStore(TOperationId id, TTxState::ETxState state) {
+ISubOperation::TPtr CreateAlterFileStore(TOperationId id, TTxState::ETxState state) {
     Y_VERIFY(state != TTxState::Invalid);
     return MakeSubOperation<TAlterFileStore>(id, state);
 }

ydb/core/tx/schemeshard/schemeshard__operation_alter_index.cpp

@@ -229,11 +229,11 @@ public:
 
 namespace NKikimr::NSchemeShard {
 
-ISubOperationBase::TPtr CreateAlterTableIndex(TOperationId id, const TTxTransaction& tx) {
+ISubOperation::TPtr CreateAlterTableIndex(TOperationId id, const TTxTransaction& tx) {
     return MakeSubOperation<TAlterTableIndex>(id, tx);
 }
 
-ISubOperationBase::TPtr CreateAlterTableIndex(TOperationId id, TTxState::ETxState state) {
+ISubOperation::TPtr CreateAlterTableIndex(TOperationId id, TTxState::ETxState state) {
     return MakeSubOperation<TAlterTableIndex>(id, state);
 }
 

ydb/core/tx/schemeshard/schemeshard__operation_alter_kesus.cpp

@@ -362,11 +362,11 @@ public:
 
 namespace NKikimr::NSchemeShard {
 
-ISubOperationBase::TPtr CreateAlterKesus(TOperationId id, const TTxTransaction& tx) {
+ISubOperation::TPtr CreateAlterKesus(TOperationId id, const TTxTransaction& tx) {
     return MakeSubOperation<TAlterKesus>(id, tx);
 }
 
-ISubOperationBase::TPtr CreateAlterKesus(TOperationId id, TTxState::ETxState state) {
+ISubOperation::TPtr CreateAlterKesus(TOperationId id, TTxState::ETxState state) {
     Y_VERIFY(state != TTxState::Invalid);
     return MakeSubOperation<TAlterKesus>(id, state);
 }