Skip to content

Commit 85c3275

Browse files
committed
Add other entities
1 parent 74ee595 commit 85c3275

File tree

2 files changed

+51
-2
lines changed

2 files changed

+51
-2
lines changed

ydb/core/protos/flat_scheme_op.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -1482,7 +1482,7 @@ message TApplyIf {
14821482
optional uint64 PathId = 1;
14831483
optional uint64 PathVersion = 2;
14841484
optional uint64 LockedTxId = 3;
1485-
optional bool CheckGeneralVersion = 4 [default = true];
1485+
optional bool CheckEntityVersion = 4 [default = false];
14861486
}
14871487

14881488
message TUpgradeSubDomain {

ydb/core/tx/schemeshard/schemeshard_impl.cpp

+50-1
Original file line numberDiff line numberDiff line change
@@ -1231,11 +1231,60 @@ bool TSchemeShard::CheckApplyIf(const NKikimrSchemeOp::TModifyScheme &scheme, TS
12311231
auto path = TPath::Init(pathId, this);
12321232
auto pathVersion = GetPathVersion(path);
12331233

1234-
if (item.HasCheckGeneralVersion() && !item.GetCheckGeneralVersion()) {
1234+
if (item.HasCheckEntityVersion() && item.GetCheckEntityVersion()) {
12351235
switch(path.Base()->PathType) {
12361236
case NKikimrSchemeOp::EPathTypePersQueueGroup:
12371237
actualVersion = pathVersion.GetPQVersion();
12381238
break;
1239+
case NKikimrSchemeOp::EPathType::EPathTypeSubDomain:
1240+
case NKikimrSchemeOp::EPathType::EPathTypeExtSubDomain:
1241+
actualVersion = pathVersion.GetSubDomainVersion();
1242+
break;
1243+
case NKikimrSchemeOp::EPathTypeTable:
1244+
actualVersion = pathVersion.GetTableSchemaVersion();
1245+
break;
1246+
case NKikimrSchemeOp::EPathType::EPathTypeBlockStoreVolume:
1247+
actualVersion = pathVersion.GetBSVVersion();
1248+
break;
1249+
case NKikimrSchemeOp::EPathType::EPathTypeFileStore:
1250+
actualVersion = pathVersion.GetFileStoreVersion();
1251+
break;
1252+
case NKikimrSchemeOp::EPathType::EPathTypeKesus:
1253+
actualVersion = pathVersion.GetKesusVersion();
1254+
break;
1255+
case NKikimrSchemeOp::EPathType::EPathTypeRtmrVolume:
1256+
actualVersion = pathVersion.GetRTMRVersion();
1257+
break;
1258+
case NKikimrSchemeOp::EPathType::EPathTypeSolomonVolume:
1259+
actualVersion = pathVersion.GetSolomonVersion();
1260+
break;
1261+
case NKikimrSchemeOp::EPathType::EPathTypeTableIndex:
1262+
actualVersion = pathVersion.GetTableIndexVersion();
1263+
break;
1264+
case NKikimrSchemeOp::EPathType::EPathTypeColumnStore:
1265+
actualVersion = pathVersion.GetColumnStoreVersion();
1266+
break;
1267+
case NKikimrSchemeOp::EPathType::EPathTypeColumnTable:
1268+
actualVersion = pathVersion.GetColumnTableVersion();
1269+
break;
1270+
case NKikimrSchemeOp::EPathType::EPathTypeCdcStream:
1271+
actualVersion = pathVersion.GetCdcStreamVersion();
1272+
break;
1273+
case NKikimrSchemeOp::EPathType::EPathTypeSequence:
1274+
actualVersion = pathVersion.GetSequenceVersion();
1275+
break;
1276+
case NKikimrSchemeOp::EPathType::EPathTypeReplication:
1277+
actualVersion = pathVersion.GetReplicationVersion();
1278+
break;
1279+
case NKikimrSchemeOp::EPathType::EPathTypeExternalTable:
1280+
actualVersion = pathVersion.GetExternalTableVersion();
1281+
break;
1282+
case NKikimrSchemeOp::EPathType::EPathTypeExternalDataSource:
1283+
actualVersion = pathVersion.GetExternalDataSourceVersion();
1284+
break;
1285+
case NKikimrSchemeOp::EPathType::EPathTypeView:
1286+
actualVersion = pathVersion.GetViewVersion();
1287+
break;
12391288
default:
12401289
actualVersion = pathVersion.GetGeneralVersion();
12411290
break;

0 commit comments

Comments
 (0)