cleanup

Enjection · Enjection · commit 19335ff731bc · 2024-05-19T19:59:44.000Z
diff --git a/ydb/core/tx/schemeshard/backup/constants.h b/ydb/core/tx/schemeshard/backup/constants.h
@@ -0,0 +1,7 @@
+#pragma once
+
+namespace NKikimr::NSchemeShard::NBackup {
+
+constexpr static char const* CB_CDC_STREAM_NAME = "continuousBackupImpl";
+
+} // namespace NKikimr::NSchemeShard::NBackup
diff --git a/ydb/core/tx/schemeshard/backup/ya.make b/ydb/core/tx/schemeshard/backup/ya.make
@@ -0,0 +1,7 @@
+LIBRARY()
+
+SRCS(
+    constants.h
+)
+
+END()
diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_cdc_stream.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_cdc_stream.cpp
@@ -473,6 +473,8 @@ class TAlterCdcStreamAtTable: public TSubOperation {
 
 } // anonymous
 
+namespace NCdc {
+
 void DoAlterStream(
     const NKikimrSchemeOp::TAlterCdcStream& op,
     const TOperationId& opId,
@@ -503,6 +505,8 @@ void DoAlterStream(
     }
 }
 
+} // namespace NCdc
+
 ISubOperation::TPtr CreateAlterCdcStreamImpl(TOperationId id, const TTxTransaction& tx) {
     return MakeSubOperation<TAlterCdcStream>(id, tx);
 }
@@ -579,7 +583,7 @@ TVector<ISubOperation::TPtr> CreateAlterCdcStream(TOperationId opId, const TTxTr
 
     TVector<ISubOperation::TPtr> result;
 
-    DoAlterStream(op, opId, workingDirPath, tablePath, result);
+    NCdc::DoAlterStream(op, opId, workingDirPath, tablePath, result);
 
     if (op.HasGetReady()) {
         auto outTx = TransactionTemplate(workingDirPath.PathString(), NKikimrSchemeOp::EOperationType::ESchemeOpDropLock);
diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_cdc_stream.h b/ydb/core/tx/schemeshard/schemeshard__operation_alter_cdc_stream.h
@@ -7,7 +7,7 @@
 #include <ydb/core/engine/mkql_proto.h>
 #include <ydb/core/scheme/scheme_types_proto.h>
 
-namespace NKikimr::NSchemeShard {
+namespace NKikimr::NSchemeShard::NCdc {
 
 void DoAlterStream(
     const NKikimrSchemeOp::TAlterCdcStream& op,
@@ -16,4 +16,4 @@ void DoAlterStream(
     const TPath& tablePath,
     TVector<ISubOperation::TPtr>& result);
 
-} // namespace NKikimr::NSchemesShard
+} // namespace NKikimr::NSchemesShard::NCdc
diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_continuous_backup.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_continuous_backup.cpp
@@ -4,15 +4,11 @@
 
 #include "schemeshard__operation_alter_cdc_stream.h"
 
+#include <ydb/core/tx/schemeshard/backup/constants.h>
+
 #include <ydb/core/engine/mkql_proto.h>
 #include <ydb/core/scheme/scheme_types_proto.h>
 
-namespace {
-
-constexpr static char const* cbCdcStreamName = "continuousBackupImpl";
-
-}
-
 namespace NKikimr::NSchemeShard {
 
 TVector<ISubOperation::TPtr> CreateAlterContinuousBackup(TOperationId opId, const TTxTransaction& tx, TOperationContext& context) {
@@ -25,12 +21,12 @@ TVector<ISubOperation::TPtr> CreateAlterContinuousBackup(TOperationId opId, cons
 
     NKikimrSchemeOp::TAlterCdcStream alterCdcStreamOp;
     alterCdcStreamOp.SetTableName(tableName);
-    alterCdcStreamOp.SetStreamName(cbCdcStreamName);
+    alterCdcStreamOp.SetStreamName(NBackup::CB_CDC_STREAM_NAME);
     alterCdcStreamOp.MutableDisable();
 
     TVector<ISubOperation::TPtr> result;
 
-    DoAlterStream(alterCdcStreamOp, opId, workingDirPath, tablePath, result);
+    NCdc::DoAlterStream(alterCdcStreamOp, opId, workingDirPath, tablePath, result);
 
     return result;
 }
diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_cdc_stream.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_cdc_stream.cpp
@@ -698,6 +698,8 @@ ISubOperation::TPtr RejectOnTablePathChecks(const TOperationId& opId, const TPat
 
 } // anonymous
 
+namespace NCdc {
+
 void DoCreateStream(const NKikimrSchemeOp::TCreateCdcStream& op, const TOperationId& opId, const TPath& workingDirPath, const TPath& tablePath,
     const bool acceptExisted, const bool initialScan, TVector<ISubOperation::TPtr>& result)
 {
@@ -781,6 +783,8 @@ void DoCreatePqPart(const TOperationId& opId, const TPath& streamPath, const TSt
     result.push_back(CreateNewPQ(NextPartId(opId, result), outTx));
 }
 
+} // namespace NCdc
+
 ISubOperation::TPtr CreateNewCdcStreamImpl(TOperationId id, const TTxTransaction& tx) {
     return MakeSubOperation<TNewCdcStream>(id, tx);
 }
@@ -899,8 +903,8 @@ TVector<ISubOperation::TPtr> CreateNewCdcStream(TOperationId opId, const TTxTran
         DoCreateLock(opId, workingDirPath, tablePath, result);
     }
 
-    DoCreateStream(op, opId, workingDirPath, tablePath, acceptExisted, initialScan, result);
-    DoCreatePqPart(opId, streamPath, streamName, table, op, boundaries, acceptExisted, result);
+    NCdc::DoCreateStream(op, opId, workingDirPath, tablePath, acceptExisted, initialScan, result);
+    NCdc::DoCreatePqPart(opId, streamPath, streamName, table, op, boundaries, acceptExisted, result);
 
     return result;
 }
diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_cdc_stream.h b/ydb/core/tx/schemeshard/schemeshard__operation_create_cdc_stream.h
@@ -7,7 +7,7 @@
 #include <ydb/core/engine/mkql_proto.h>
 #include <ydb/core/scheme/scheme_types_proto.h>
 
-namespace NKikimr::NSchemeShard {
+namespace NKikimr::NSchemeShard::NCdc {
 
 void DoCreateStream(
     const NKikimrSchemeOp::TCreateCdcStream& op,
@@ -28,4 +28,4 @@ void DoCreatePqPart(
     const bool acceptExisted,
     TVector<ISubOperation::TPtr>& result);
 
-} // namespace NKikimr::NSchemesShard
+} // namespace NKikimr::NSchemesShard::NCdc
diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_continuous_backup.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_continuous_backup.cpp
@@ -4,15 +4,11 @@
 
 #include "schemeshard__operation_create_cdc_stream.h"
 
+#include <ydb/core/tx/schemeshard/backup/constants.h>
+
 #include <ydb/core/engine/mkql_proto.h>
 #include <ydb/core/scheme/scheme_types_proto.h>
 
-namespace {
-
-constexpr static char const* cbCdcStreamName = "continuousBackupImpl";
-
-}
-
 namespace NKikimr::NSchemeShard {
 
 TVector<ISubOperation::TPtr> CreateNewContinuousBackup(TOperationId opId, const TTxTransaction& tx, TOperationContext& context) {
@@ -27,13 +23,13 @@ TVector<ISubOperation::TPtr> CreateNewContinuousBackup(TOperationId opId, const
     NKikimrSchemeOp::TCreateCdcStream createCdcStreamOp;
     createCdcStreamOp.SetTableName(tableName);
     auto& streamDescription = *createCdcStreamOp.MutableStreamDescription();
-    streamDescription.SetName(cbCdcStreamName);
+    streamDescription.SetName(NBackup::CB_CDC_STREAM_NAME);
     streamDescription.SetMode(NKikimrSchemeOp::ECdcStreamModeUpdate);
     streamDescription.SetFormat(NKikimrSchemeOp::ECdcStreamFormatProto);
 
     auto table = context.SS->Tables.at(tablePath.Base()->PathId);
 
-    const auto streamPath = tablePath.Child(cbCdcStreamName);
+    const auto streamPath = tablePath.Child(NBackup::CB_CDC_STREAM_NAME);
 
     TVector<TString> boundaries;
     const auto& partitions = table->GetPartitions();
@@ -48,8 +44,8 @@ TVector<ISubOperation::TPtr> CreateNewContinuousBackup(TOperationId opId, const
 
     TVector<ISubOperation::TPtr> result;
 
-    DoCreateStream(createCdcStreamOp, opId, workingDirPath, tablePath, acceptExisted, false, result);
-    DoCreatePqPart(opId, streamPath, cbCdcStreamName, table, createCdcStreamOp, boundaries, acceptExisted, result);
+    NCdc::DoCreateStream(createCdcStreamOp, opId, workingDirPath, tablePath, acceptExisted, false, result);
+    NCdc::DoCreatePqPart(opId, streamPath, NBackup::CB_CDC_STREAM_NAME, table, createCdcStreamOp, boundaries, acceptExisted, result);
 
     return result;
 }
diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_cdc_stream.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_cdc_stream.cpp
@@ -435,6 +435,8 @@ class TDropCdcStreamAtTable: public TSubOperation {
 
 } // anonymous
 
+namespace NCdc {
+
 void DoDropStream(
     const NKikimrSchemeOp::TDropCdcStream& op,
     const TOperationId& opId,
@@ -495,6 +497,8 @@ void DoDropStream(
     }
 }
 
+} // namespace NCdc
+
 ISubOperation::TPtr CreateDropCdcStreamImpl(TOperationId id, const TTxTransaction& tx) {
     return MakeSubOperation<TDropCdcStream>(id, tx);
 }
@@ -579,7 +583,7 @@ TVector<ISubOperation::TPtr> CreateDropCdcStream(TOperationId opId, const TTxTra
 
     TVector<ISubOperation::TPtr> result;
 
-    DoDropStream(op, opId, workingDirPath, tablePath, streamPath, lockTxId, context, result);
+    NCdc::DoDropStream(op, opId, workingDirPath, tablePath, streamPath, lockTxId, context, result);
 
     return result;
 }
diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_cdc_stream.h b/ydb/core/tx/schemeshard/schemeshard__operation_drop_cdc_stream.h
@@ -7,7 +7,7 @@
 #include <ydb/core/engine/mkql_proto.h>
 #include <ydb/core/scheme/scheme_types_proto.h>
 
-namespace NKikimr::NSchemeShard {
+namespace NKikimr::NSchemeShard::NCdc {
 
 void DoDropStream(
     const NKikimrSchemeOp::TDropCdcStream& op,
@@ -19,4 +19,4 @@ void DoDropStream(
     TOperationContext& context,
     TVector<ISubOperation::TPtr>& result);
 
-} // namespace NKikimr::NSchemesShard
+} // namespace NKikimr::NSchemesShard::NCdc
diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_continuous_backup.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_continuous_backup.cpp
@@ -4,15 +4,11 @@
 
 #include "schemeshard__operation_drop_cdc_stream.h"
 
+#include <ydb/core/tx/schemeshard/backup/constants.h>
+
 #include <ydb/core/engine/mkql_proto.h>
 #include <ydb/core/scheme/scheme_types_proto.h>
 
-namespace {
-
-constexpr static char const* cbCdcStreamName = "continuousBackupImpl";
-
-}
-
 namespace NKikimr::NSchemeShard {
 
 TVector<ISubOperation::TPtr> CreateDropContinuousBackup(TOperationId opId, const TTxTransaction& tx, TOperationContext& context) {
@@ -25,13 +21,13 @@ TVector<ISubOperation::TPtr> CreateDropContinuousBackup(TOperationId opId, const
 
     NKikimrSchemeOp::TDropCdcStream dropCdcStreamOp;
     dropCdcStreamOp.SetTableName(tableName);
-    dropCdcStreamOp.SetStreamName(cbCdcStreamName);
+    dropCdcStreamOp.SetStreamName(NBackup::CB_CDC_STREAM_NAME);
 
-    const auto streamPath = tablePath.Child(cbCdcStreamName);
+    const auto streamPath = tablePath.Child(NBackup::CB_CDC_STREAM_NAME);
 
     TVector<ISubOperation::TPtr> result;
 
-    DoDropStream(dropCdcStreamOp, opId, workingDirPath, tablePath, streamPath, InvalidTxId, context, result);
+    NCdc::DoDropStream(dropCdcStreamOp, opId, workingDirPath, tablePath, streamPath, InvalidTxId, context, result);
 
     return result;
 }
diff --git a/ydb/core/tx/schemeshard/ya.make b/ydb/core/tx/schemeshard/ya.make
@@ -266,6 +266,7 @@ PEERDIR(
     ydb/core/tablet_flat
     ydb/core/tx
     ydb/core/tx/datashard
+    ydb/core/tx/schemeshard/backup
     ydb/core/tx/schemeshard/common
     ydb/core/tx/schemeshard/olap
     ydb/core/tx/scheme_board

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +LIBRARY()
++
 +SRCS(
 +    constants.h
 +)
++
 +END()
Original file line number	Diff line number	Diff line change
`@@ -473,6 +473,8 @@ class TAlterCdcStreamAtTable: public TSubOperation {`
`473`	`473`
`474`	`474`	`} // anonymous`
`475`	`475`
	`476`	`+namespace NCdc {`
	`477`	`+`
`476`	`478`	`void DoAlterStream(`
`477`	`479`	`const NKikimrSchemeOp::TAlterCdcStream& op,`
`478`	`480`	`const TOperationId& opId,`
`@@ -503,6 +505,8 @@ void DoAlterStream(`
`503`	`505`	`}`
`504`	`506`	`}`
`505`	`507`
	`508`	`+} // namespace NCdc`
	`509`	`+`
`506`	`510`	`ISubOperation::TPtr CreateAlterCdcStreamImpl(TOperationId id, const TTxTransaction& tx) {`
`507`	`511`	`return MakeSubOperation<TAlterCdcStream>(id, tx);`
`508`	`512`	`}`
`@@ -579,7 +583,7 @@ TVector<ISubOperation::TPtr> CreateAlterCdcStream(TOperationId opId, const TTxTr`
`579`	`583`
`580`	`584`	`TVector<ISubOperation::TPtr> result;`
`581`	`585`
`582`		`- DoAlterStream(op, opId, workingDirPath, tablePath, result);`
	`586`	`+ NCdc::DoAlterStream(op, opId, workingDirPath, tablePath, result);`
`583`	`587`
`584`	`588`	`if (op.HasGetReady()) {`
`585`	`589`	`auto outTx = TransactionTemplate(workingDirPath.PathString(), NKikimrSchemeOp::EOperationType::ESchemeOpDropLock);`
Original file line number	Diff line number	Diff line change
`@@ -698,6 +698,8 @@ ISubOperation::TPtr RejectOnTablePathChecks(const TOperationId& opId, const TPat`
`698`	`698`
`699`	`699`	`} // anonymous`
`700`	`700`
	`701`	`+namespace NCdc {`
	`702`	`+`
`701`	`703`	`void DoCreateStream(const NKikimrSchemeOp::TCreateCdcStream& op, const TOperationId& opId, const TPath& workingDirPath, const TPath& tablePath,`
`702`	`704`	`const bool acceptExisted, const bool initialScan, TVector<ISubOperation::TPtr>& result)`
`703`	`705`	`{`
`@@ -781,6 +783,8 @@ void DoCreatePqPart(const TOperationId& opId, const TPath& streamPath, const TSt`
`781`	`783`	`result.push_back(CreateNewPQ(NextPartId(opId, result), outTx));`
`782`	`784`	`}`
`783`	`785`
	`786`	`+} // namespace NCdc`
	`787`	`+`
`784`	`788`	`ISubOperation::TPtr CreateNewCdcStreamImpl(TOperationId id, const TTxTransaction& tx) {`
`785`	`789`	`return MakeSubOperation<TNewCdcStream>(id, tx);`
`786`	`790`	`}`
`@@ -899,8 +903,8 @@ TVector<ISubOperation::TPtr> CreateNewCdcStream(TOperationId opId, const TTxTran`
`899`	`903`	`DoCreateLock(opId, workingDirPath, tablePath, result);`
`900`	`904`	`}`
`901`	`905`
`902`		`- DoCreateStream(op, opId, workingDirPath, tablePath, acceptExisted, initialScan, result);`
`903`		`- DoCreatePqPart(opId, streamPath, streamName, table, op, boundaries, acceptExisted, result);`
	`906`	`+ NCdc::DoCreateStream(op, opId, workingDirPath, tablePath, acceptExisted, initialScan, result);`
	`907`	`+ NCdc::DoCreatePqPart(opId, streamPath, streamName, table, op, boundaries, acceptExisted, result);`
`904`	`908`
`905`	`909`	`return result;`
`906`	`910`	`}`
Original file line number	Diff line number	Diff line change
`@@ -435,6 +435,8 @@ class TDropCdcStreamAtTable: public TSubOperation {`
`435`	`435`
`436`	`436`	`} // anonymous`
`437`	`437`
	`438`	`+namespace NCdc {`
	`439`	`+`
`438`	`440`	`void DoDropStream(`
`439`	`441`	`const NKikimrSchemeOp::TDropCdcStream& op,`
`440`	`442`	`const TOperationId& opId,`
`@@ -495,6 +497,8 @@ void DoDropStream(`
`495`	`497`	`}`
`496`	`498`	`}`
`497`	`499`
	`500`	`+} // namespace NCdc`
	`501`	`+`
`498`	`502`	`ISubOperation::TPtr CreateDropCdcStreamImpl(TOperationId id, const TTxTransaction& tx) {`
`499`	`503`	`return MakeSubOperation<TDropCdcStream>(id, tx);`
`500`	`504`	`}`
`@@ -579,7 +583,7 @@ TVector<ISubOperation::TPtr> CreateDropCdcStream(TOperationId opId, const TTxTra`
`579`	`583`
`580`	`584`	`TVector<ISubOperation::TPtr> result;`
`581`	`585`
`582`		`- DoDropStream(op, opId, workingDirPath, tablePath, streamPath, lockTxId, context, result);`
	`586`	`+ NCdc::DoDropStream(op, opId, workingDirPath, tablePath, streamPath, lockTxId, context, result);`
`583`	`587`
`584`	`588`	`return result;`
`585`	`589`	`}`