rearrange for lesser diff

Author: Enjection

ydb/core/tx/schemeshard/schemeshard__operation_alter_cdc_stream.cpp

@@ -10,6 +10,8 @@
 
 namespace NKikimr::NSchemeShard {
 
+namespace NCdc {
+
 namespace {
 
 class TPropose: public TSubOperationState {
@@ -473,8 +475,6 @@ class TAlterCdcStreamAtTable: public TSubOperation {
 
 } // anonymous
 
-namespace NCdc {
-
 std::variant<TStreamPaths, ISubOperation::TPtr> DoAlterStreamPathChecks(
     const TOperationId& opId,
     const TPath& workingDirPath,
@@ -552,6 +552,8 @@ void DoAlterStream(
 
 } // namespace NCdc
 
+using namespace NCdc;
+
 ISubOperation::TPtr CreateAlterCdcStreamImpl(TOperationId id, const TTxTransaction& tx) {
     return MakeSubOperation<TAlterCdcStream>(id, tx);
 }
@@ -581,12 +583,12 @@ TVector<ISubOperation::TPtr> CreateAlterCdcStream(TOperationId opId, const TTxTr
 
     const auto workingDirPath = TPath::Resolve(tx.GetWorkingDir(), context.SS);
 
-    const auto checksResult = NCdc::DoAlterStreamPathChecks(opId, workingDirPath, tableName, streamName);
+    const auto checksResult = DoAlterStreamPathChecks(opId, workingDirPath, tableName, streamName);
     if (std::holds_alternative<ISubOperation::TPtr>(checksResult)) {
         return {std::get<ISubOperation::TPtr>(checksResult)};
     }
 
-    const auto [tablePath, streamPath] = std::get<NCdc::TStreamPaths>(checksResult);
+    const auto [tablePath, streamPath] = std::get<TStreamPaths>(checksResult);
 
     TString errStr;
     if (!context.SS->CheckApplyIf(tx, errStr)) {
@@ -599,7 +601,7 @@ TVector<ISubOperation::TPtr> CreateAlterCdcStream(TOperationId opId, const TTxTr
 
     TVector<ISubOperation::TPtr> result;
 
-    NCdc::DoAlterStream(op, opId, workingDirPath, tablePath, result);
+    DoAlterStream(op, opId, workingDirPath, tablePath, result);
 
     if (op.HasGetReady()) {
         auto outTx = TransactionTemplate(workingDirPath.PathString(), NKikimrSchemeOp::EOperationType::ESchemeOpDropLock);

ydb/core/tx/schemeshard/schemeshard__operation_create_cdc_stream.cpp

@@ -842,12 +842,12 @@ TVector<ISubOperation::TPtr> CreateNewCdcStream(TOperationId opId, const TTxTran
 
     const auto workingDirPath = TPath::Resolve(tx.GetWorkingDir(), context.SS);
 
-    const auto checksResult = NCdc::DoNewStreamPathChecks(opId, workingDirPath, tableName, streamName, acceptExisted);
+    const auto checksResult = DoNewStreamPathChecks(opId, workingDirPath, tableName, streamName, acceptExisted);
     if (std::holds_alternative<ISubOperation::TPtr>(checksResult)) {
         return {std::get<ISubOperation::TPtr>(checksResult)};
     }
 
-    const auto [tablePath, streamPath] = std::get<NCdc::TStreamPaths>(checksResult);
+    const auto [tablePath, streamPath] = std::get<TStreamPaths>(checksResult);
 
     switch (streamDesc.GetMode()) {
     case NKikimrSchemeOp::ECdcStreamModeKeysOnly:
@@ -926,8 +926,8 @@ TVector<ISubOperation::TPtr> CreateNewCdcStream(TOperationId opId, const TTxTran
         DoCreateLock(opId, workingDirPath, tablePath, result);
     }
 
-    NCdc::DoCreateStream(op, opId, workingDirPath, tablePath, acceptExisted, initialScan, result);
-    NCdc::DoCreatePqPart(opId, streamPath, streamName, table, op, boundaries, acceptExisted, result);
+    DoCreateStream(op, opId, workingDirPath, tablePath, acceptExisted, initialScan, result);
+    DoCreatePqPart(opId, streamPath, streamName, table, op, boundaries, acceptExisted, result);
 
     return result;
 }

ydb/core/tx/schemeshard/schemeshard__operation_drop_cdc_stream.cpp

@@ -10,6 +10,8 @@
 
 namespace NKikimr::NSchemeShard {
 
+namespace NCdc {
+
 namespace {
 
 class TPropose: public TSubOperationState {
@@ -435,8 +437,6 @@ class TDropCdcStreamAtTable: public TSubOperation {
 
 } // anonymous
 
-namespace NCdc {
-
 std::variant<TStreamPaths, ISubOperation::TPtr> DoDropStreamPathChecks(
     const TOperationId& opId,
     const TPath& workingDirPath,
@@ -560,6 +560,8 @@ void DoDropStream(
 
 } // namespace NCdc
 
+using namespace NCdc;
+
 ISubOperation::TPtr CreateDropCdcStreamImpl(TOperationId id, const TTxTransaction& tx) {
     return MakeSubOperation<TDropCdcStream>(id, tx);
 }
@@ -589,12 +591,12 @@ TVector<ISubOperation::TPtr> CreateDropCdcStream(TOperationId opId, const TTxTra
 
     const auto workingDirPath = TPath::Resolve(tx.GetWorkingDir(), context.SS);
 
-    const auto checksResult = NCdc::DoDropStreamPathChecks(opId, workingDirPath, tableName, streamName);
+    const auto checksResult = DoDropStreamPathChecks(opId, workingDirPath, tableName, streamName);
     if (std::holds_alternative<ISubOperation::TPtr>(checksResult)) {
         return {std::get<ISubOperation::TPtr>(checksResult)};
     }
 
-    const auto [tablePath, streamPath] = std::get<NCdc::TStreamPaths>(checksResult);
+    const auto [tablePath, streamPath] = std::get<TStreamPaths>(checksResult);
 
     TString errStr;
     if (!context.SS->CheckApplyIf(tx, errStr)) {
@@ -607,13 +609,13 @@ TVector<ISubOperation::TPtr> CreateDropCdcStream(TOperationId opId, const TTxTra
     const auto lockTxId = stream->State == TCdcStreamInfo::EState::ECdcStreamStateScan
         ? streamPath.Base()->CreateTxId
         : InvalidTxId;
-    if (const auto reject = NCdc::DoDropStreamChecks(opId, tablePath, lockTxId, context); reject) {
+    if (const auto reject = DoDropStreamChecks(opId, tablePath, lockTxId, context); reject) {
         return {reject};
     }
 
     TVector<ISubOperation::TPtr> result;
 
-    NCdc::DoDropStream(op, opId, workingDirPath, tablePath, streamPath, lockTxId, context, result);
+    DoDropStream(op, opId, workingDirPath, tablePath, streamPath, lockTxId, context, result);
 
     return result;
 }