Skip to content

Commit 121c415

Browse files
EnjectionEnjection
committed
cleanup
1 parent ea18634 commit 121c415

File tree

7 files changed

+14
-141
lines changed

7 files changed

+14
-141
lines changed

‎ydb/core/protos/counters_schemeshard.proto‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -203,14 +203,8 @@ enum ESimpleCounters {
203203
COUNTER_IN_FLIGHT_OPS_TxDropReplication = 161 [(CounterOpts) = {Name: "InFlightOps/DropReplication"}];
204204

205205
COUNTER_IN_FLIGHT_OPS_TxCreateContinuousBackup = 162 [(CounterOpts) = {Name: "InFlightOps/CreateContinuousBackup"}];
206-
COUNTER_IN_FLIGHT_OPS_TxCreateContinuousBackupAtTable = 163 [(CounterOpts) = {Name: "InFlightOps/CreateContinuousBackupAtTable"}];
207-
COUNTER_IN_FLIGHT_OPS_TxAlterContinuousBackup = 164 [(CounterOpts) = {Name: "InFlightOps/AlterContinuousBackup"}];
208-
COUNTER_IN_FLIGHT_OPS_TxAlterContinuousBackupAtTable = 165 [(CounterOpts) = {Name: "InFlightOps/AlterContinuousBackupAtTable"}];
209-
COUNTER_IN_FLIGHT_OPS_TxDropContinuousBackup = 166 [(CounterOpts) = {Name: "InFlightOps/DropContinuousBackup"}];
210-
COUNTER_IN_FLIGHT_OPS_TxDropContinuousBackupAtTable = 167 [(CounterOpts) = {Name: "InFlightOps/DropContinuousBackupAtTable"}];
211-
COUNTER_IN_FLIGHT_OPS_TxCreateContinuousBackupAtTableWithInitialScan = 168 [(CounterOpts) = {Name: "InFlightOps/CreateContinuousBackupAtTableWithInitialScan"}];
212-
COUNTER_IN_FLIGHT_OPS_TxAlterContinuousBackupAtTableDropSnapshot = 169 [(CounterOpts) = {Name: "InFlightOps/AlterContinuousBackupAtTableDropSnapshot"}];
213-
COUNTER_IN_FLIGHT_OPS_TxDropContinuousBackupAtTableDropSnapshot = 170 [(CounterOpts) = {Name: "InFlightOps/DropContinuousBackupAtTableDropSnapshot"}];
206+
COUNTER_IN_FLIGHT_OPS_TxAlterContinuousBackup = 163 [(CounterOpts) = {Name: "InFlightOps/AlterContinuousBackup"}];
207+
COUNTER_IN_FLIGHT_OPS_TxDropContinuousBackup = 164 [(CounterOpts) = {Name: "InFlightOps/DropContinuousBackup"}];
214208
}
215209

216210
enum ECumulativeCounters {
@@ -336,14 +330,8 @@ enum ECumulativeCounters {
336330
COUNTER_FINISHED_OPS_TxDropReplication = 99 [(CounterOpts) = {Name: "FinishedOps/DropReplication"}];
337331

338332
COUNTER_FINISHED_OPS_TxCreateContinuousBackup = 100 [(CounterOpts) = {Name: "FinishedOps/CreateContinuousBackup"}];
339-
COUNTER_FINISHED_OPS_TxCreateContinuousBackupAtTable = 101 [(CounterOpts) = {Name: "FinishedOps/CreateContinuousBackupAtTable"}];
340-
COUNTER_FINISHED_OPS_TxAlterContinuousBackup = 102 [(CounterOpts) = {Name: "FinishedOps/AlterContinuousBackup"}];
341-
COUNTER_FINISHED_OPS_TxAlterContinuousBackupAtTable = 103 [(CounterOpts) = {Name: "FinishedOps/AlterContinuousBackupAtTable"}];
342-
COUNTER_FINISHED_OPS_TxDropContinuousBackup = 104 [(CounterOpts) = {Name: "FinishedOps/DropContinuousBackup"}];
343-
COUNTER_FINISHED_OPS_TxDropContinuousBackupAtTable = 105 [(CounterOpts) = {Name: "FinishedOps/DropContinuousBackupAtTable"}];
344-
COUNTER_FINISHED_OPS_TxCreateContinuousBackupAtTableWithInitialScan = 106 [(CounterOpts) = {Name: "FinishedOps/CreateContinuousBackupAtTableWithInitialScan"}];
345-
COUNTER_FINISHED_OPS_TxAlterContinuousBackupAtTableDropSnapshot = 107 [(CounterOpts) = {Name: "FinishedOps/AlterContinuousBackupAtTableDropSnapshot"}];
346-
COUNTER_FINISHED_OPS_TxDropContinuousBackupAtTableDropSnapshot = 108 [(CounterOpts) = {Name: "FinishedOps/DropContinuousBackupAtTableDropSnapshot"}];
333+
COUNTER_FINISHED_OPS_TxAlterContinuousBackup = 101 [(CounterOpts) = {Name: "FinishedOps/AlterContinuousBackup"}];
334+
COUNTER_FINISHED_OPS_TxDropContinuousBackup = 102 [(CounterOpts) = {Name: "FinishedOps/DropContinuousBackup"}];
347335
}
348336

349337
enum EPercentileCounters {

‎ydb/core/protos/flat_scheme_op.proto‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -852,25 +852,11 @@ message TDropCdcStream {
852852
}
853853

854854
message TContinuousBackupDescription {
855-
// optional string Name = 1;
856-
// optional EContinuousBackupMode Mode = 2;
857-
// optional EContinuousBackupFormat Format = 6;
858-
optional bool VirtualTimestamps = 7;
859-
optional NKikimrProto.TPathID PathId = 3;
860-
// optional EContinuousBackupState State = 4;
861-
optional uint64 SchemaVersion = 5;
862-
repeated TUserAttribute UserAttributes = 8;
863-
// AwsRegion used to mark records in DynamoDB-compatible mode (FormatDynamoDBStreamsJson)
864-
optional string AwsRegion = 9;
865-
// Set to '0' to disable resolved timestamps
866-
optional uint64 ResolvedTimestampsIntervalMs = 10;
867855
}
868856

869857
message TCreateContinuousBackup {
870858
optional string TableName = 1;
871859
optional TContinuousBackupDescription ContinuousBackupDescription = 2;
872-
optional uint64 RetentionPeriodSeconds = 3 [default = 86400]; // 1d by default
873-
optional uint32 TopicPartitions = 4;
874860
}
875861

876862
message TAlterContinuousBackup {
@@ -1497,19 +1483,13 @@ enum EOperationType {
14971483

14981484
ESchemeOpDropReplication = 96;
14991485

1500-
/// CDC
1486+
/// ContinuousBackup
15011487
// Create
15021488
ESchemeOpCreateContinuousBackup = 97;
1503-
ESchemeOpCreateContinuousBackupImpl = 98;
1504-
ESchemeOpCreateContinuousBackupAtTable = 99;
15051489
// Alter
1506-
ESchemeOpAlterContinuousBackup = 100;
1507-
ESchemeOpAlterContinuousBackupImpl = 101;
1508-
ESchemeOpAlterContinuousBackupAtTable = 102;
1490+
ESchemeOpAlterContinuousBackup = 98;
15091491
// Drop
1510-
ESchemeOpDropContinuousBackup = 103;
1511-
ESchemeOpDropContinuousBackupImpl = 104;
1512-
ESchemeOpDropContinuousBackupAtTable = 105;
1492+
ESchemeOpDropContinuousBackup = 99;
15131493
}
15141494

15151495
message TApplyIf {

‎ydb/core/tx/schemeshard/schemeshard__operation.cpp‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,25 +1083,14 @@ ISubOperation::TPtr TOperation::RestorePart(TTxState::ETxType txType, TTxState::
10831083
return CreateDropView(NextPartId(), txState);
10841084
case TTxState::ETxType::TxAlterView:
10851085
Y_ABORT("TODO: implement");
1086-
// CDC
1086+
// Continuous Backup
1087+
// Now these functions won't be called because we presist only cdc function internally
10871088
case TTxState::ETxType::TxCreateContinuousBackup:
1088-
Y_ABORT("TODO: implement"); // return CreateNewContinuousBackupImpl(NextPartId(), txState);
1089-
case TTxState::ETxType::TxCreateContinuousBackupAtTable:
1090-
Y_ABORT("TODO: implement"); // return CreateNewContinuousBackupAtTable(NextPartId(), txState, false);
1091-
case TTxState::ETxType::TxCreateContinuousBackupAtTableWithInitialScan:
1092-
Y_ABORT("TODO: implement"); // return CreateNewContinuousBackupAtTable(NextPartId(), txState, true);
1089+
Y_ABORT("TODO: implement");
10931090
case TTxState::ETxType::TxAlterContinuousBackup:
1094-
Y_ABORT("TODO: implement"); // return CreateAlterContinuousBackupImpl(NextPartId(), txState);
1095-
case TTxState::ETxType::TxAlterContinuousBackupAtTable:
1096-
Y_ABORT("TODO: implement"); // return CreateAlterContinuousBackupAtTable(NextPartId(), txState, false);
1097-
case TTxState::ETxType::TxAlterContinuousBackupAtTableDropSnapshot:
1098-
Y_ABORT("TODO: implement"); // return CreateAlterContinuousBackupAtTable(NextPartId(), txState, true);
1091+
Y_ABORT("TODO: implement");
10991092
case TTxState::ETxType::TxDropContinuousBackup:
1100-
Y_ABORT("TODO: implement"); // return CreateDropContinuousBackupImpl(NextPartId(), txState);
1101-
case TTxState::ETxType::TxDropContinuousBackupAtTable:
1102-
Y_ABORT("TODO: implement"); // return CreateDropContinuousBackupAtTable(NextPartId(), txState, false);
1103-
case TTxState::ETxType::TxDropContinuousBackupAtTableDropSnapshot:
1104-
Y_ABORT("TODO: implement"); // return CreateDropContinuousBackupAtTable(NextPartId(), txState, true);
1093+
Y_ABORT("TODO: implement");
11051094

11061095
case TTxState::ETxType::TxInvalid:
11071096
Y_UNREACHABLE();
@@ -1333,16 +1322,10 @@ ISubOperation::TPtr TOperation::ConstructPart(NKikimrSchemeOp::EOperationType op
13331322

13341323
// CDC
13351324
case NKikimrSchemeOp::EOperationType::ESchemeOpCreateContinuousBackup:
1336-
case NKikimrSchemeOp::EOperationType::ESchemeOpCreateContinuousBackupImpl:
1337-
case NKikimrSchemeOp::EOperationType::ESchemeOpCreateContinuousBackupAtTable:
13381325
Y_ABORT("multipart operations are handled before, also they require transaction details");
13391326
case NKikimrSchemeOp::EOperationType::ESchemeOpAlterContinuousBackup:
1340-
case NKikimrSchemeOp::EOperationType::ESchemeOpAlterContinuousBackupImpl:
1341-
case NKikimrSchemeOp::EOperationType::ESchemeOpAlterContinuousBackupAtTable:
13421327
Y_ABORT("multipart operations are handled before, also they require transaction details");
13431328
case NKikimrSchemeOp::EOperationType::ESchemeOpDropContinuousBackup:
1344-
case NKikimrSchemeOp::EOperationType::ESchemeOpDropContinuousBackupImpl:
1345-
case NKikimrSchemeOp::EOperationType::ESchemeOpDropContinuousBackupAtTable:
13461329
Y_ABORT("multipart operations are handled before, also they require transaction details");
13471330

13481331
}

‎ydb/core/tx/schemeshard/schemeshard_audit_log_fragment.cpp‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -234,16 +234,10 @@ TString DefineUserOperationName(const NKikimrSchemeOp::TModifyScheme& tx) {
234234
return "DROP VIEW";
235235
// continuous backup
236236
case NKikimrSchemeOp::EOperationType::ESchemeOpCreateContinuousBackup:
237-
case NKikimrSchemeOp::EOperationType::ESchemeOpCreateContinuousBackupImpl:
238-
case NKikimrSchemeOp::EOperationType::ESchemeOpCreateContinuousBackupAtTable:
239237
return "ALTER TABLE ADD CONTINUOUS BACKUP";
240238
case NKikimrSchemeOp::EOperationType::ESchemeOpAlterContinuousBackup:
241-
case NKikimrSchemeOp::EOperationType::ESchemeOpAlterContinuousBackupImpl:
242-
case NKikimrSchemeOp::EOperationType::ESchemeOpAlterContinuousBackupAtTable:
243239
return "ALTER TABLE ALTER CONTINUOUS BACKUP";
244240
case NKikimrSchemeOp::EOperationType::ESchemeOpDropContinuousBackup:
245-
case NKikimrSchemeOp::EOperationType::ESchemeOpDropContinuousBackupImpl:
246-
case NKikimrSchemeOp::EOperationType::ESchemeOpDropContinuousBackupAtTable:
247241
return "ALTER TABLE DROP CONTINUOUS BACKUP";
248242
}
249243
Y_ABORT("switch should cover all operation types");
@@ -539,30 +533,12 @@ TVector<TString> ExtractChangingPaths(const NKikimrSchemeOp::TModifyScheme& tx)
539533
case NKikimrSchemeOp::EOperationType::ESchemeOpCreateContinuousBackup:
540534
result.emplace_back(NKikimr::JoinPath({tx.GetWorkingDir(), tx.GetCreateContinuousBackup().GetTableName()}));
541535
break;
542-
case NKikimrSchemeOp::EOperationType::ESchemeOpCreateContinuousBackupImpl:
543-
result.emplace_back(tx.GetWorkingDir());
544-
break;
545-
case NKikimrSchemeOp::EOperationType::ESchemeOpCreateContinuousBackupAtTable:
546-
result.emplace_back(NKikimr::JoinPath({tx.GetWorkingDir(), tx.GetCreateContinuousBackup().GetTableName()}));
547-
break;
548536
case NKikimrSchemeOp::EOperationType::ESchemeOpAlterContinuousBackup:
549537
result.emplace_back(NKikimr::JoinPath({tx.GetWorkingDir(), tx.GetAlterContinuousBackup().GetTableName()}));
550538
break;
551-
case NKikimrSchemeOp::EOperationType::ESchemeOpAlterContinuousBackupImpl:
552-
result.emplace_back(NKikimr::JoinPath({tx.GetWorkingDir()}));
553-
break;
554-
case NKikimrSchemeOp::EOperationType::ESchemeOpAlterContinuousBackupAtTable:
555-
result.emplace_back(NKikimr::JoinPath({tx.GetWorkingDir(), tx.GetAlterContinuousBackup().GetTableName()}));
556-
break;
557539
case NKikimrSchemeOp::EOperationType::ESchemeOpDropContinuousBackup:
558540
result.emplace_back(NKikimr::JoinPath({tx.GetWorkingDir(), tx.GetDropContinuousBackup().GetTableName()}));
559541
break;
560-
case NKikimrSchemeOp::EOperationType::ESchemeOpDropContinuousBackupImpl:
561-
result.emplace_back(NKikimr::JoinPath({tx.GetWorkingDir(), tx.GetDrop().GetName()}));
562-
break;
563-
case NKikimrSchemeOp::EOperationType::ESchemeOpDropContinuousBackupAtTable:
564-
result.emplace_back(NKikimr::JoinPath({tx.GetWorkingDir(), tx.GetDropContinuousBackup().GetTableName()}));
565-
break;
566542
}
567543

568544
return result;

‎ydb/core/tx/schemeshard/schemeshard_impl.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1487,12 +1487,6 @@ TPathElement::EPathState TSchemeShard::CalcPathState(TTxState::ETxType txType, T
14871487
case TTxState::TxAlterExternalDataSource:
14881488
case TTxState::TxAlterView:
14891489
case TTxState::TxAlterContinuousBackup:
1490-
case TTxState::TxAlterContinuousBackupAtTable:
1491-
case TTxState::TxAlterContinuousBackupAtTableDropSnapshot:
1492-
case TTxState::TxCreateContinuousBackupAtTable:
1493-
case TTxState::TxCreateContinuousBackupAtTableWithInitialScan:
1494-
case TTxState::TxDropContinuousBackupAtTable:
1495-
case TTxState::TxDropContinuousBackupAtTableDropSnapshot:
14961490
return TPathElement::EPathState::EPathStateAlter;
14971491
case TTxState::TxDropTable:
14981492
case TTxState::TxDropPQGroup:

‎ydb/core/tx/schemeshard/schemeshard_tx_infly.h‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -132,14 +132,8 @@ struct TTxState {
132132
item(TxCopySequence, 86) \
133133
item(TxDropReplication, 87) \
134134
item(TxCreateContinuousBackup, 88) \
135-
item(TxCreateContinuousBackupAtTable, 89) \
136-
item(TxAlterContinuousBackup, 90) \
137-
item(TxAlterContinuousBackupAtTable, 91) \
138-
item(TxDropContinuousBackup, 92) \
139-
item(TxDropContinuousBackupAtTable, 93) \
140-
item(TxCreateContinuousBackupAtTableWithInitialScan, 94) \
141-
item(TxAlterContinuousBackupAtTableDropSnapshot, 95) \
142-
item(TxDropContinuousBackupAtTableDropSnapshot, 96)
135+
item(TxAlterContinuousBackup, 89) \
136+
item(TxDropContinuousBackup, 90) \
143137

144138
// TX_STATE_TYPE_ENUM
145139

@@ -361,8 +355,6 @@ struct TTxState {
361355
case TxInitializeBuildIndex: //this is more like alter
362356
case TxCreateCdcStreamAtTable:
363357
case TxCreateCdcStreamAtTableWithInitialScan:
364-
case TxCreateContinuousBackupAtTable:
365-
case TxCreateContinuousBackupAtTableWithInitialScan:
366358
return false;
367359
case TxCreateLock: //this is more like alter
368360
case TxDropLock: //this is more like alter
@@ -394,8 +386,6 @@ struct TTxState {
394386
case TxDropExternalDataSource:
395387
case TxDropView:
396388
case TxDropContinuousBackup:
397-
case TxDropContinuousBackupAtTable:
398-
case TxDropContinuousBackupAtTableDropSnapshot:
399389
return false;
400390
case TxAlterPQGroup:
401391
case TxAlterTable:
@@ -428,8 +418,6 @@ struct TTxState {
428418
case TxAlterExternalDataSource:
429419
case TxAlterView:
430420
case TxAlterContinuousBackup:
431-
case TxAlterContinuousBackupAtTable:
432-
case TxAlterContinuousBackupAtTableDropSnapshot:
433421
return false;
434422
case TxMoveTable:
435423
case TxMoveTableIndex:
@@ -500,10 +488,6 @@ struct TTxState {
500488
case TxCreateView:
501489
case TxCopySequence:
502490
case TxCreateContinuousBackup:
503-
case TxCreateContinuousBackupAtTable:
504-
case TxCreateContinuousBackupAtTableWithInitialScan:
505-
case TxDropContinuousBackupAtTable:
506-
case TxDropContinuousBackupAtTableDropSnapshot:
507491
return false;
508492
case TxAlterPQGroup:
509493
case TxAlterTable:
@@ -536,8 +520,6 @@ struct TTxState {
536520
case TxAlterExternalDataSource:
537521
case TxAlterView:
538522
case TxAlterContinuousBackup:
539-
case TxAlterContinuousBackupAtTable:
540-
case TxAlterContinuousBackupAtTableDropSnapshot:
541523
return false;
542524
case TxMoveTable:
543525
case TxMoveTableIndex:
@@ -610,10 +592,6 @@ struct TTxState {
610592
case TxCreateExternalDataSource:
611593
case TxCreateView:
612594
case TxCreateContinuousBackup:
613-
case TxCreateContinuousBackupAtTable:
614-
case TxCreateContinuousBackupAtTableWithInitialScan:
615-
case TxDropContinuousBackupAtTable:
616-
case TxDropContinuousBackupAtTableDropSnapshot:
617595
return false;
618596
case TxAlterPQGroup:
619597
case TxAlterTable:
@@ -647,8 +625,6 @@ struct TTxState {
647625
case TxAlterExternalDataSource:
648626
case TxAlterView:
649627
case TxAlterContinuousBackup:
650-
case TxAlterContinuousBackupAtTable:
651-
case TxAlterContinuousBackupAtTableDropSnapshot:
652628
return false;
653629
case TxInvalid:
654630
Y_DEBUG_ABORT_UNLESS("UNREACHABLE");

‎ydb/core/tx/tx_proxy/schemereq.cpp‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -350,29 +350,11 @@ struct TBaseSchemeReq: public TActorBootstrapped<TDerived> {
350350
case NKikimrSchemeOp::ESchemeOpCreateContinuousBackup:
351351
return *modifyScheme.MutableCreateContinuousBackup()->MutableTableName();
352352

353-
case NKikimrSchemeOp::ESchemeOpCreateContinuousBackupImpl:
354-
Y_ABORT("no implementation for ESchemeOpCreateContinuousBackupImpl");
355-
356-
case NKikimrSchemeOp::ESchemeOpCreateContinuousBackupAtTable:
357-
return *modifyScheme.MutableCreateContinuousBackup()->MutableTableName();
358-
359353
case NKikimrSchemeOp::ESchemeOpAlterContinuousBackup:
360354
return *modifyScheme.MutableAlterContinuousBackup()->MutableTableName();
361355

362-
case NKikimrSchemeOp::ESchemeOpAlterContinuousBackupImpl:
363-
Y_ABORT("no implementation for ESchemeOpAlterContinuousBackupImpl");
364-
365-
case NKikimrSchemeOp::ESchemeOpAlterContinuousBackupAtTable:
366-
return *modifyScheme.MutableAlterContinuousBackup()->MutableTableName();
367-
368356
case NKikimrSchemeOp::ESchemeOpDropContinuousBackup:
369357
return *modifyScheme.MutableDropContinuousBackup()->MutableTableName();
370-
371-
case NKikimrSchemeOp::ESchemeOpDropContinuousBackupImpl:
372-
Y_ABORT("no implementation for ESchemeOpDropContinuousBackupImpl");
373-
374-
case NKikimrSchemeOp::ESchemeOpDropContinuousBackupAtTable:
375-
return *modifyScheme.MutableDropContinuousBackup()->MutableTableName();
376358
}
377359
}
378360

@@ -814,12 +796,6 @@ struct TBaseSchemeReq: public TActorBootstrapped<TDerived> {
814796
case NKikimrSchemeOp::ESchemeOpAlterCdcStreamAtTable:
815797
case NKikimrSchemeOp::ESchemeOpDropCdcStreamImpl:
816798
case NKikimrSchemeOp::ESchemeOpDropCdcStreamAtTable:
817-
case NKikimrSchemeOp::ESchemeOpCreateContinuousBackupImpl:
818-
case NKikimrSchemeOp::ESchemeOpCreateContinuousBackupAtTable:
819-
case NKikimrSchemeOp::ESchemeOpAlterContinuousBackupImpl:
820-
case NKikimrSchemeOp::ESchemeOpAlterContinuousBackupAtTable:
821-
case NKikimrSchemeOp::ESchemeOpDropContinuousBackupImpl:
822-
case NKikimrSchemeOp::ESchemeOpDropContinuousBackupAtTable:
823799
case NKikimrSchemeOp::ESchemeOpMoveTableIndex:
824800
case NKikimrSchemeOp::ESchemeOpAlterExtSubDomainCreateHive:
825801
case NKikimrSchemeOp::ESchemeOpAlterView:

0 commit comments

Comments
 (0)