diff options
| author | ijon <ijon@yandex-team.com> | 2022-12-27 11:38:56 +0300 |
|---|---|---|
| committer | ijon <ijon@yandex-team.com> | 2022-12-27 11:38:56 +0300 |
| commit | 726a249dea3cbcaa4b1bf07754b1bb5ee1a6626a (patch) | |
| tree | 6122be9a529cb148f26886f8d98fe0a3dd280b31 | |
| parent | 0bfca112200bcb317bcccdbbd35422fb6708cb78 (diff) | |
| download | ydb-726a249dea3cbcaa4b1bf07754b1bb5ee1a6626a.tar.gz | |
schemeshard: fix spelling errors
Fix a trainload of spelling errors in ydb/core/tx/schemeshard/.
Plus one renaming: pathes -> paths. Contemporary plural term for 'path'
is 'paths'. 'Pathes' is a Middle English term (i.e. pre 16th century old)
with archaic and somewhat poetic vibe to it ('тропы', 'trailways').
A tiny little New Year present to me and all of us.
111 files changed, 885 insertions, 885 deletions
diff --git a/ydb/core/tx/schemeshard/operation_queue_timer.h b/ydb/core/tx/schemeshard/operation_queue_timer.h index 8f045de44ba..37da4095d78 100644 --- a/ydb/core/tx/schemeshard/operation_queue_timer.h +++ b/ydb/core/tx/schemeshard/operation_queue_timer.h @@ -12,7 +12,7 @@ // TODO: TOperationQueueWithTimer is a good candidate for core/util, but since // it uses actorlib_impl, which depends on core/util, it // can't be part of util. No other better place yet and since -// it is used in schemedard only then I put it here. +// it is used in schemeshard only then I put it here. namespace NKikimr { diff --git a/ydb/core/tx/schemeshard/schemeshard.cpp b/ydb/core/tx/schemeshard/schemeshard.cpp index 24b73f590cc..f85125f2bcf 100644 --- a/ydb/core/tx/schemeshard/schemeshard.cpp +++ b/ydb/core/tx/schemeshard/schemeshard.cpp @@ -6,7 +6,7 @@ namespace NKikimr { namespace NSchemeShard { TEvSchemeShard::TEvInitTenantSchemeShard::TEvInitTenantSchemeShard( ui64 selfTabletId, - ui64 pathId, TString tenanatRootPath, + ui64 pathId, TString tenantRootPath, TString owner, TString effectiveRootACL, ui64 effectiveRootACLVersion, const NKikimrSubDomains::TProcessingParams &processingParams, const TStoragePools &storagePools, const TMap<TString, TString> userAttrData, ui64 UserAttrsVersion, const NSchemeShard::TSchemeLimits &limits, @@ -14,7 +14,7 @@ namespace NSchemeShard { { Record.SetDomainSchemeShard(selfTabletId); Record.SetDomainPathId(pathId); - Record.SetRootPath(tenanatRootPath); + Record.SetRootPath(tenantRootPath); Record.SetOwner(owner); Record.SetEffectiveACL(effectiveRootACL); diff --git a/ydb/core/tx/schemeshard/schemeshard.h b/ydb/core/tx/schemeshard/schemeshard.h index 13dc8ac912d..0f6ccf5049b 100644 --- a/ydb/core/tx/schemeshard/schemeshard.h +++ b/ydb/core/tx/schemeshard/schemeshard.h @@ -377,7 +377,7 @@ struct TEvSchemeShard { TEvInitTenantSchemeShard() = default; TEvInitTenantSchemeShard(ui64 selfTabletId, - ui64 pathId, TString tenanatRootPath, + ui64 pathId, TString tenantRootPath, TString owner, TString effectiveRootACL, ui64 effectiveRootACLVersion, const NKikimrSubDomains::TProcessingParams& processingParams, const TStoragePools& storagePools, diff --git a/ydb/core/tx/schemeshard/schemeshard__borrowed_compaction.cpp b/ydb/core/tx/schemeshard/schemeshard__borrowed_compaction.cpp index 1da2fd32e6d..c3c386e5eb6 100644 --- a/ydb/core/tx/schemeshard/schemeshard__borrowed_compaction.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__borrowed_compaction.cpp @@ -83,7 +83,7 @@ void TSchemeShard::BorrowedCompactionHandleDisconnect(TTabletId tabletId, const RunningBorrowedCompactions.erase(it); - // disonnected from node we have requested borrowed compaction. We just resend request, because it + // disconnected from node we have requested borrowed compaction. We just resend request, because it // is safe: if first request is executing or has been already executed, then second request will be ignored. StartBorrowedCompaction(shardIdx); diff --git a/ydb/core/tx/schemeshard/schemeshard__clean_pathes.cpp b/ydb/core/tx/schemeshard/schemeshard__clean_pathes.cpp index 258699bba93..2454f89a4da 100644 --- a/ydb/core/tx/schemeshard/schemeshard__clean_pathes.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__clean_pathes.cpp @@ -6,7 +6,7 @@ namespace NSchemeShard { using namespace NTabletFlatExecutor; struct TSchemeShard::TTxCleanTables : public TTransactionBase<TSchemeShard> { - static const ui32 BacketSize = 100; + static const ui32 BucketSize = 100; TVector<TPathId> TablesToClean; ui32 RemovedCount; @@ -24,7 +24,7 @@ struct TSchemeShard::TTxCleanTables : public TTransactionBase<TSchemeShard> { NIceDb::TNiceDb db(txc.DB); ui32 RemovedCount = 0; - while (RemovedCount < BacketSize && TablesToClean) { + while (RemovedCount < BucketSize && TablesToClean) { TPathId tableId = TablesToClean.back(); Self->PersistRemoveTable(db, tableId, ctx); @@ -38,7 +38,7 @@ struct TSchemeShard::TTxCleanTables : public TTransactionBase<TSchemeShard> { void Complete(const TActorContext &ctx) override { if (RemovedCount) { LOG_WARN_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, - "TTxCleanPathes Complete" + "TTxCleanTables Complete" << ", done PersistRemoveTable for " << RemovedCount << " tables" << ", left " << TablesToClean.size() << ", at schemeshard: "<< Self->TabletID()); diff --git a/ydb/core/tx/schemeshard/schemeshard__delete_tablet_reply.cpp b/ydb/core/tx/schemeshard/schemeshard__delete_tablet_reply.cpp index c8bfaffba65..e69ae1be7c5 100644 --- a/ydb/core/tx/schemeshard/schemeshard__delete_tablet_reply.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__delete_tablet_reply.cpp @@ -14,7 +14,7 @@ struct TSchemeShard::TTxDeleteTabletReply : public TSchemeShard::TRwTxBase { TTxDeleteTabletReply(TSelf* self, TEvHive::TEvDeleteTabletReply::TPtr& ev) : TRwTxBase(self) , Ev(ev) - , ShardIdx(self->MakeLocalId(TLocalShardIdx(Ev->Get()->Record.GetTxId_Deprecated()))) // We use TxId field as a cookie where we store shrdIdx + , ShardIdx(self->MakeLocalId(TLocalShardIdx(Ev->Get()->Record.GetTxId_Deprecated()))) // We use TxId field as a cookie where we store shardIdx , TabletId(InvalidTabletId) , Status(Ev->Get()->Record.GetStatus()) , HiveId(Ev->Get()->Record.GetOrigin()) diff --git a/ydb/core/tx/schemeshard/schemeshard__init.cpp b/ydb/core/tx/schemeshard/schemeshard__init.cpp index 6a9225674be..734335427d7 100644 --- a/ydb/core/tx/schemeshard/schemeshard__init.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__init.cpp @@ -88,7 +88,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { TStepId, TTxId, TStepId, TTxId, TString, TTxId, ui64, ui64, ui64> TPathRec; - typedef TDeque<TPathRec> TPathesRows; + typedef TDeque<TPathRec> TPathRows; TPathElement::TPtr MakePathElement(const TPathRec& rec) const { TPathId pathId = std::get<0>(rec); @@ -137,7 +137,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { return path; } - bool LoadPathes(NIceDb::TNiceDb& db, TPathesRows& pathesRows) const { + bool LoadPaths(NIceDb::TNiceDb& db, TPathRows& pathRows) const { { { auto rows = db.Table<Schema::MigratedPaths>().Range().Select(); @@ -167,7 +167,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { ui64 userAttrsAlterVer = rows.GetValueOrDefault<Schema::MigratedPaths::UserAttrsAlterVersion>(1); ui64 aclAlterVer = rows.GetValueOrDefault<Schema::MigratedPaths::ACLVersion>(0); - pathesRows.emplace_back(pathId, parentPathId, name, owner, pathType, + pathRows.emplace_back(pathId, parentPathId, name, owner, pathType, stepCreated, txIdCreated, stepDropped, txIdDropped, acl, lastTxId, dirAlterVer, userAttrsAlterVer, aclAlterVer); @@ -218,11 +218,11 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { ui64 aclAlterVer = rows.GetValueOrDefault<Schema::Paths::ACLVersion>(0); if (pathId == parentPathId) { - pathesRows.emplace_front(pathId, parentPathId, name, owner, pathType, + pathRows.emplace_front(pathId, parentPathId, name, owner, pathType, stepCreated, txIdCreated, stepDropped, txIdDropped, acl, lastTxId, dirAlterVer, userAttrsAlterVer, aclAlterVer); } else { - pathesRows.emplace_back(pathId, parentPathId, name, owner, pathType, + pathRows.emplace_back(pathId, parentPathId, name, owner, pathType, stepCreated, txIdCreated, stepDropped, txIdDropped, acl, lastTxId, dirAlterVer, userAttrsAlterVer, aclAlterVer); } @@ -1122,7 +1122,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { typedef TDeque<TTableIndexColRec> TTableIndexKeyRows; typedef TDeque<TTableIndexColRec> TTableIndexDataRows; - bool LoadTableIndexeKeys(NIceDb::TNiceDb& db, TTableIndexKeyRows& tableIndexKeys) const { + bool LoadTableIndexKeys(NIceDb::TNiceDb& db, TTableIndexKeyRows& tableIndexKeys) const { { auto rowSet = db.Table<Schema::TableIndexKeys>().Range().Select(); if (!rowSet.IsReady()) { @@ -1388,7 +1388,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { #undef RETURN_IF_NO_PRECHARGED - if (!Self->IsShemeShardConfigured()) { + if (!Self->IsSchemeShardConfigured()) { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxInit, SS hasn't been configured yet" << ", state: " << (ui64)Self->InitState @@ -1419,19 +1419,19 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { // Read paths { - TPathesRows pathesRows; - if (!LoadPathes(db, pathesRows)) { + TPathRows pathRows; + if (!LoadPaths(db, pathRows)) { return false; } LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, - "TTxInit for Pathes" - << ", readed records: " << pathesRows.size() + "TTxInit for Paths" + << ", read records: " << pathRows.size() << ", at schemeshard: " << Self->TabletID()); - if (pathesRows) { + if (pathRows) { // read Root - TPathElement::TPtr rootPath = MakePathElement(pathesRows.front()); + TPathElement::TPtr rootPath = MakePathElement(pathRows.front()); Y_VERIFY(rootPath->PathId == Self->RootPathId()); Y_VERIFY(rootPath->ParentPathId == Self->RootPathId()); Y_VERIFY(rootPath->DomainPathId == Self->RootPathId()); @@ -1442,12 +1442,12 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { Y_VERIFY(!rootPath->StepDropped); Self->PathsById[rootPath->PathId] = rootPath; - pathesRows.pop_front(); + pathRows.pop_front(); } - Y_VERIFY_DEBUG(IsSorted(pathesRows.begin(), pathesRows.end())); + Y_VERIFY_DEBUG(IsSorted(pathRows.begin(), pathRows.end())); - for (auto& rec: pathesRows) { + for (auto& rec: pathRows) { TPathElement::TPtr path = MakePathElement(rec); Y_VERIFY(path->PathId != Self->RootPathId()); @@ -1473,7 +1473,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxInit for UserAttributes" - << ", readed records: " << userAttrsRows.size() + << ", read records: " << userAttrsRows.size() << ", at schemeshard: " << Self->TabletID()); for (auto& rec: userAttrsRows) { @@ -1499,7 +1499,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxInit for UserAttributesAlterData" - << ", readed records: " << userAttrsRows.size() + << ", read records: " << userAttrsRows.size() << ", at schemeshard: " << Self->TabletID()); for (auto& rec: userAttrsRows) { @@ -1805,7 +1805,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxInit for Tables" - << ", readed records: " << tableRows.size() + << ", read records: " << tableRows.size() << ", at schemeshard: " << Self->TabletID()); for (const auto& rec: tableRows) { @@ -1885,7 +1885,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxInit for Columns" - << ", readed records: " << columnRows.size() + << ", read records: " << columnRows.size() << ", at schemeshard: " << Self->TabletID()); for (const auto& rec: columnRows) { @@ -1903,7 +1903,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { Y_VERIFY_S(Self->PathsById.contains(pathId), "Path doesn't exist, pathId: " << pathId); Y_VERIFY_S(Self->PathsById.at(pathId)->IsTable(), "Path is not a table, pathId: " << pathId); - Y_VERIFY_S(Self->Tables.FindPtr(pathId), "Table doen't exist, pathId: " << pathId); + Y_VERIFY_S(Self->Tables.FindPtr(pathId), "Table doesn't exist, pathId: " << pathId); TTableInfo::TPtr tableInfo = Self->Tables[pathId]; Y_VERIFY_S(colId < tableInfo->NextColumnId, "Column id should be less than NextColId" @@ -1937,7 +1937,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxInit for ColumnsAlters" - << ", readed records: " << columnRows.size() + << ", read records: " << columnRows.size() << ", at schemeshard: " << Self->TabletID()); for (const auto& rec: columnRows) { @@ -1956,7 +1956,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { Y_VERIFY_S(Self->PathsById.contains(pathId), "Path doesn't exist, pathId: " << pathId); Y_VERIFY_S(Self->PathsById.at(pathId)->IsTable(), "Path is not a table, pathId: " << pathId); - Y_VERIFY_S(Self->Tables.FindPtr(pathId), "Table doen't exist, pathId: " << pathId); + Y_VERIFY_S(Self->Tables.FindPtr(pathId), "Table doesn't exist, pathId: " << pathId); TTableInfo::TPtr tableInfo = Self->Tables[pathId]; tableInfo->InitAlterData(); @@ -1976,7 +1976,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { } } - // Read shards (any tipe of tablets) + // Read shards (any type of tablets) THashMap<TPathId, TShardIdx> pqBalancers; // pathId -> shardIdx THashMap<TPathId, TShardIdx> nbsVolumeShards; // pathId -> shardIdx THashMap<TPathId, TShardIdx> fileStoreShards; // pathId -> shardIdx @@ -1991,7 +1991,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxInit for Shards" - << ", readed records: " << shards.size() + << ", read records: " << shards.size() << ", at schemeshard: " << Self->TabletID()); for (auto& rec: shards) { @@ -2000,7 +2000,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { LOG_TRACE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxInit for Shards" << ", read: " << idx - << ", tabetId: " << std::get<1>(rec) + << ", tabletId: " << std::get<1>(rec) << ", PathId: " << std::get<2>(rec) << ", TabletType: " << TTabletTypes::TypeToStr(std::get<4>(rec)) << ", at schemeshard: " << Self->TabletID()); @@ -2015,7 +2015,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { Self->IncrementPathDbRefCount(shard.PathId); - Y_VERIFY(shard.TabletType != ETabletType::TypeInvalid, "upgrage schema was wrong"); + Y_VERIFY(shard.TabletType != ETabletType::TypeInvalid, "upgrade schema was wrong"); switch (shard.TabletType) { case ETabletType::PersQueueReadBalancer: @@ -2074,7 +2074,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxInit for TablePartitions" - << ", readed records: " << tablePartitions.size() + << ", read records: " << tablePartitions.size() << ", at schemeshard: " << Self->TabletID()); TPathId prevTableId; @@ -2140,7 +2140,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxInit for TableShardPartitionConfigs" - << ", readed records: " << tablePartitions.size() + << ", read records: " << tablePartitions.size() << ", at schemeshard: " << Self->TabletID()); for (auto& rec: tablePartitions) { @@ -2269,7 +2269,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxInit for ChannelsBinding" - << ", readed records: " << channelBindingRows.size() + << ", read records: " << channelBindingRows.size() << ", at schemeshard: " << Self->TabletID()); for (auto& rec: channelBindingRows) { @@ -2595,7 +2595,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxInit for TableIndexes" - << ", readed records: " << indexes.size() + << ", read records: " << indexes.size() << ", at schemeshard: " << Self->TabletID()); for (auto& rec: indexes) { @@ -2662,7 +2662,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { TTableIndexKeyRows indexKeys; TTableIndexDataRows indexData; - if (!LoadTableIndexeKeys(db, indexKeys)) { + if (!LoadTableIndexKeys(db, indexKeys)) { return false; } @@ -2672,7 +2672,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxInit for TableIndexKeys" - << ", readed records: " << indexKeys.size() + << ", read records: " << indexKeys.size() << ", at schemeshard: " << Self->TabletID()); for (const auto& rec: indexKeys) { @@ -3123,7 +3123,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxInit for KesusInfos" - << ", readed records: " << kesusRows.size() + << ", read records: " << kesusRows.size() << ", at schemeshard: " << Self->TabletID()); for (const auto& rec: kesusRows) { @@ -3159,7 +3159,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxInit for KesusAlters" - << ", readed records: " << kesusAlterRows.size() + << ", read records: " << kesusAlterRows.size() << ", at schemeshard: " << Self->TabletID()); for (const auto& rec: kesusAlterRows) { @@ -3265,7 +3265,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { Y_VERIFY_S(Self->PathsById.contains(tablePathId), "Path doesn't exist, pathId: " << tablePathId); Y_VERIFY_S(Self->PathsById.at(tablePathId)->IsTable(), "Path is not a table, pathId: " << tablePathId); - Y_VERIFY_S(Self->Tables.FindPtr(tablePathId), "Table doen't exist, pathId: " << tablePathId); + Y_VERIFY_S(Self->Tables.FindPtr(tablePathId), "Table doesn't exist, pathId: " << tablePathId); // legacy, ??? Y_VERIFY(Self->Tables.contains(tablePathId)); @@ -3359,7 +3359,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxInit for TxShards" - << ", readed records: " << txShardsRows.size() + << ", read records: " << txShardsRows.size() << ", at schemeshard: " << Self->TabletID()); for (auto& rec: txShardsRows) { @@ -3435,7 +3435,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { } // After all shard operations are loaded we can fill range ends for shards participating in split operations - // and register shrads as busy + // and register shards as busy for (TOperationId opId : splitOpIds) { THashMap<TShardIdx, TString> shardIdxToRangeEnd; TTxState* txState = Self->FindTx(opId); @@ -3444,7 +3444,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { Y_VERIFY(Self->Tables.contains(txState->TargetPathId)); TTableInfo::TPtr tableInfo = Self->Tables.at(txState->TargetPathId); - tableInfo->RegisterSplitMegreOp(opId, *txState); + tableInfo->RegisterSplitMergeOp(opId, *txState); for (ui32 i = 0; i < txState->SplitDescription->DestinationRangesSize(); ++i) { const auto& dst = txState->SplitDescription->GetDestinationRanges(i); @@ -3464,8 +3464,8 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { for (TOperationId opId: forceDropOpIds) { TTxState* txState = Self->FindTx(opId); Y_VERIFY(txState); - auto pathes = Self->ListSubTree(txState->TargetPathId, ctx); - Self->MarkAsDropping(pathes, opId.GetTxId(), ctx); + auto paths = Self->ListSubTree(txState->TargetPathId, ctx); + Self->MarkAsDropping(paths, opId.GetTxId(), ctx); } // Read txid dependencies @@ -3503,7 +3503,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxInit for ShardToDelete" - << ", readed records: " << shardsToDelete.size() + << ", read records: " << shardsToDelete.size() << ", at schemeshard: " << Self->TabletID()); for (auto& rec: shardsToDelete) { @@ -3520,7 +3520,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxInit for BackupSettings" - << ", readed records: " << backupSettings.size() + << ", read records: " << backupSettings.size() << ", at schemeshard: " << Self->TabletID()); for (auto& rec: backupSettings) { @@ -3662,7 +3662,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxInit for ShardBackupStatus" - << ", readed records: " << backupStatuses.size() + << ", read records: " << backupStatuses.size() << ", at schemeshard: " << Self->TabletID()); THashMap<TTxId, TShardBackupStatusRows> statusesByTxId; @@ -3678,7 +3678,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxInit for CompletedBackup" - << ", readed records: " << history.size() + << ", read records: " << history.size() << ", at schemeshard: " << Self->TabletID()); for (auto& rec: history) { @@ -3745,10 +3745,10 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { Self->TabletIdToShardIdx[tabletId] = shardIdx; Y_VERIFY(Self->PathsById.contains(pathId)); - auto path = Self->PathsById.at(pathId); //path should't be dropeed? + auto path = Self->PathsById.at(pathId); //path should't be dropped? path->IncShardsInside(); - auto domainInfo = Self->ResolveDomainInfo(pathId); //domain should't be dropeed? + auto domainInfo = Self->ResolveDomainInfo(pathId); //domain should't be dropped? domainInfo->AddInternalShard(shardIdx, Self->IsBackupTable(pathId)); switch (si.second.TabletType) { @@ -3837,7 +3837,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { TPathElement::TPtr parent = Self->PathsById.at(path->ParentPathId); TPathElement::TPtr inclusiveDomainPath = Self->PathsById.at(Self->ResolvePathIdForDomain(parent)); // take upper domain id info even when the path is domain by itself - TSubDomainInfo::TPtr inclusivedomainInfo = Self->ResolveDomainInfo(parent); + TSubDomainInfo::TPtr inclusiveDomainInfo = Self->ResolveDomainInfo(parent); if (inclusiveDomainPath->IsExternalSubDomainRoot()) { path->PathState = TPathElement::EPathState::EPathStateMigrated; @@ -3847,7 +3847,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { if (!path->IsRoot()) { const bool isBackupTable = Self->IsBackupTable(item.first); parent->IncAliveChildren(1, isBackupTable); - inclusivedomainInfo->IncPathsInside(1, isBackupTable); + inclusiveDomainInfo->IncPathsInside(1, isBackupTable); } Self->TabletCounters->Simple()[COUNTER_USER_ATTRIBUTES_COUNT].Add(path->UserAttrs->Size()); @@ -3865,8 +3865,8 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { ui64 throughput = ((ui64)delta) * config.GetPartitionConfig().GetWriteSpeedInBytesPerSecond(); ui64 storage = throughput * config.GetPartitionConfig().GetLifetimeSeconds(); - inclusivedomainInfo->IncPQPartitionsInside(delta); - inclusivedomainInfo->IncPQReservedStorage(storage); + inclusiveDomainInfo->IncPQPartitionsInside(delta); + inclusiveDomainInfo->IncPQReservedStorage(storage); Self->TabletCounters->Simple()[COUNTER_STREAM_SHARDS_COUNT].Add(delta); Self->TabletCounters->Simple()[COUNTER_STREAM_RESERVED_THROUGHPUT].Add(throughput); @@ -3933,7 +3933,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxInit for Publications" - << ", readed records: " << publicationRows.size() + << ", read records: " << publicationRows.size() << ", at schemeshard: " << Self->TabletID()); for (auto& rec: publicationRows) { @@ -4325,7 +4325,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { rowset.GetValue<Schema::SnapshotTables::TableOwnerId>(), rowset.GetValue<Schema::SnapshotTables::TableLocalId>()); - Self->TablesWithSnaphots.emplace(tableId, id); + Self->TablesWithSnapshots.emplace(tableId, id); Self->SnapshotTables[id].insert(tableId); ++records; @@ -4666,7 +4666,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { << ", txId: " << operation->TxId << ", parts: " << operation->Parts.size() << ", await num: " << operation->WaitOperations.size() - << ", dependet num: " << operation->DependentOperations.size() + << ", dependent num: " << operation->DependentOperations.size() << ", at schemeshard: " << Self->TabletID()); if (operation->WaitOperations.size()) { @@ -4717,7 +4717,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> { OnComplete.ApplyOnComplete(Self, ctx); - if (!Self->IsShemeShardConfigured()) { + if (!Self->IsSchemeShardConfigured()) { if (Self->IsDomainSchemeShard) { // self initiation Self->Execute(Self->CreateTxInitRoot(), ctx); } else { // wait initiation msg diff --git a/ydb/core/tx/schemeshard/schemeshard__init_populator.cpp b/ydb/core/tx/schemeshard/schemeshard__init_populator.cpp index 299757e38b3..b35e01b0c6f 100644 --- a/ydb/core/tx/schemeshard/schemeshard__init_populator.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__init_populator.cpp @@ -25,21 +25,21 @@ struct TSchemeShard::TTxInitPopulator : public TTransactionBase<TSchemeShard> { TTxType GetTxType() const override { return TXTYPE_INIT_POPULATOR; } bool Execute(TTransactionContext&, const TActorContext& ctx) override { - Y_VERIFY(Self->IsShemeShardConfigured()); + Y_VERIFY(Self->IsSchemeShardConfigured()); for (auto item: Self->PathsById) { TPathId pathId = item.first; TPathElement::TPtr pathEl = item.second; // KIKIMR-13173 - // planned to drop pathes are added to populator - // also such pathes (like BSV PQ) can be considered as deleted by path description however they aren't dropped jet + // planned to drop paths are added to populator + // also such paths (like BSV PQ) can be considered as deleted by path description however they aren't dropped jet if (pathEl->Dropped()) { - // migrated pathes should be published directly + // migrated paths should be published directly // but once they published on the quorum replicas as deleted directly, further publishing is unnecessary // actually they are publishing strongly on the quorum as part of deleting operation - // so it's ok to skip migrated pathes is they has beem marked as deleted + // so it's ok to skip migrated paths is they has been marked as deleted continue; } diff --git a/ydb/core/tx/schemeshard/schemeshard__init_root.cpp b/ydb/core/tx/schemeshard/schemeshard__init_root.cpp index cb908996c79..5201abd44b7 100644 --- a/ydb/core/tx/schemeshard/schemeshard__init_root.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__init_root.cpp @@ -32,7 +32,7 @@ struct TSchemeShard::TTxInitRoot : public TSchemeShard::TRwTxBase { Y_VERIFY_S(Self->IsDomainSchemeShard, "Do not run this transaction on tenant schemeshard" ", tenant schemeshard needs proper initiation by domain schemeshard"); - Y_VERIFY(!Self->IsShemeShardConfigured()); + Y_VERIFY(!Self->IsSchemeShardConfigured()); Y_VERIFY_S(!rootName.empty(), "invalid root name in domain config"); TVector<TString> rootPathElements = SplitPath(rootName); @@ -214,7 +214,7 @@ struct TSchemeShard::TTxInitRootCompatibility : public TSchemeShard::TRwTxBase { ++root.Base()->DirAlterVersion; Self->PersistPathDirAlterVersion(db, root.Base()); - // we already inited, so we have to publish changes + // we already initialized, so we have to publish changes OnComplete.PublishToSchemeBoard(TOperationId(0,0), root.Base()->PathId); OnComplete.ApplyOnExecute(Self, txc, ctx); @@ -301,12 +301,12 @@ struct TSchemeShard::TTxInitTenantSchemeShard : public TSchemeShard::TRwTxBase { - if (Self->IsShemeShardConfigured()) { + if (Self->IsSchemeShardConfigured()) { TPathElement::TPtr root = Self->PathsById.at(Self->RootPathId()); if (joinedRootPath != root->Name) { LOG_WARN_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TEvInitTenantSchemeShard DoExecute" - << ", tenant SchemeShard has been alredy initialized with different root path" + << ", tenant SchemeShard has been already initialized with different root path" << ", at schemeshard: " << selfTabletId); Reply->Record.SetStatus(NKikimrScheme::StatusInvalidParameter); return; @@ -315,7 +315,7 @@ struct TSchemeShard::TTxInitTenantSchemeShard : public TSchemeShard::TRwTxBase { if (TTabletId(processingParams.GetSchemeShard()) != selfTabletId) { LOG_WARN_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TEvInitTenantSchemeShard DoExecute" - << ", tenant SchemeShard has been alredy initialized, unexpected scheme shard ID in params" + << ", tenant SchemeShard has been already initialized, unexpected scheme shard ID in params" << ", at schemeshard: " << selfTabletId); Reply->Record.SetStatus(NKikimrScheme::StatusInvalidParameter); return; @@ -429,7 +429,7 @@ struct TSchemeShard::TTxInitTenantSchemeShard : public TSchemeShard::TRwTxBase { << ", status: " <<Reply->Record.GetStatus() << ", at schemeshard: " << Self->TabletID()); - if (Reply->Record.GetStatus() != NKikimrScheme::StatusSuccess || !Self->IsShemeShardConfigured()) { + if (Reply->Record.GetStatus() != NKikimrScheme::StatusSuccess || !Self->IsSchemeShardConfigured()) { ctx.Send(Ev->Sender, Reply.Release()); return; } diff --git a/ydb/core/tx/schemeshard/schemeshard__make_access_database_no_inheritable.cpp b/ydb/core/tx/schemeshard/schemeshard__make_access_database_no_inheritable.cpp index 56719d8b401..f6b04d393d2 100644 --- a/ydb/core/tx/schemeshard/schemeshard__make_access_database_no_inheritable.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__make_access_database_no_inheritable.cpp @@ -58,7 +58,7 @@ struct TSchemeShard::TTxMakeAccessDatabaseNoInheritable : public TTransactionBas bool Execute(TTransactionContext &txc, const TActorContext &ctx) override { LOG_DEBUG_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxUpgradeSchema.Execute"); - if (!Self->IsShemeShardConfigured()) { + if (!Self->IsSchemeShardConfigured()) { return true; } diff --git a/ydb/core/tx/schemeshard/schemeshard__monitoring.cpp b/ydb/core/tx/schemeshard/schemeshard__monitoring.cpp index 5b87929a81a..65b359a7537 100644 --- a/ydb/core/tx/schemeshard/schemeshard__monitoring.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__monitoring.cpp @@ -355,13 +355,13 @@ private: "TSchemeShard::TTxMonitoring AdminRequest " << debug); str << debug; - TStringStream templateAnsver = str; + TStringStream templateAnswer = str; str.clear(); - OutputAdminPage(templateAnsver); + OutputAdminPage(templateAnswer); - auto func = [templateAnsver] (const TMap<TPathId, TSet<TString>>& done) -> NActors::IEventBase* { - TStringStream str = templateAnsver; + auto func = [templateAnswer] (const TMap<TPathId, TSet<TString>>& done) -> NActors::IEventBase* { + TStringStream str = templateAnswer; HTML(str) { TABLE_SORTABLE_CLASS("table") { TABLEHEAD() { @@ -406,13 +406,13 @@ private: "TSchemeShard::TTxMonitoring AdminRequest " << debug); str << debug; - TStringStream templateAnsver = str; + TStringStream templateAnswer = str; str.clear(); - OutputAdminPage(templateAnsver); + OutputAdminPage(templateAnswer); - auto func = [templateAnsver] (const TMap<TPathId, TSet<TString>>& done) -> NActors::IEventBase* { - TStringStream str = templateAnsver; + auto func = [templateAnswer] (const TMap<TPathId, TSet<TString>>& done) -> NActors::IEventBase* { + TStringStream str = templateAnswer; HTML(str) { TABLE_SORTABLE_CLASS("table") { TABLEHEAD() { @@ -530,7 +530,7 @@ private: } { str << "<form method=\"GET\" id=\"tblMonSSFrm\" name=\"tblMonSSFrm\" class=\"form-group\">" << Endl; - str << "<legend> Make all Access Database rights no inheritable at all datatabase: </legend>"; + str << "<legend> Make all Access Database rights no inheritable at all database: </legend>"; str << TCgi::TabletID.AsHiddenInput(Self->TabletID()); str << TCgi::Page.AsHiddenInput(TCgi::TPages::AdminRequest); str << TCgi::FixAccessDatabaseInheritance.AsHiddenInput("1"); diff --git a/ydb/core/tx/schemeshard/schemeshard__notify.cpp b/ydb/core/tx/schemeshard/schemeshard__notify.cpp index d390367947a..231b87ffe4e 100644 --- a/ydb/core/tx/schemeshard/schemeshard__notify.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__notify.cpp @@ -33,7 +33,7 @@ struct TSchemeShard::TTxNotifyCompletion : public TSchemeShard::TRwTxBase { if (operation->IsReadyToNotify(ctx)) { LOG_INFO_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "NotifyTxCompletion" - << ", operation is ready to notificate" + << ", operation is ready to notify" << ", txId: " << txId << ", at schemeshard: " << Self->TabletID()); Result = new TEvSchemeShard::TEvNotifyTxCompletionResult(ui64(txId)); @@ -65,7 +65,7 @@ struct TSchemeShard::TTxNotifyCompletion : public TSchemeShard::TRwTxBase { if (exportInfo->IsFinished()) { LOG_INFO_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "NotifyTxCompletion" - << ", export is ready to notificate" + << ", export is ready to notify" << ", txId: " << txId << ", at schemeshard: " << Self->TabletID()); Result = new TEvSchemeShard::TEvNotifyTxCompletionResult(txId); @@ -86,7 +86,7 @@ struct TSchemeShard::TTxNotifyCompletion : public TSchemeShard::TRwTxBase { if (importInfo->IsFinished()) { LOG_INFO_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "NotifyTxCompletion" - << ", import is ready to notificate" + << ", import is ready to notify" << ", txId: " << txId << ", at schemeshard: " << Self->TabletID()); Result = new TEvSchemeShard::TEvNotifyTxCompletionResult(txId); @@ -108,7 +108,7 @@ struct TSchemeShard::TTxNotifyCompletion : public TSchemeShard::TRwTxBase { if (indexInfo->IsFinished()) { LOG_INFO_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "NotifyTxCompletion" - << ", index build is ready to notificate" + << ", index build is ready to notify" << ", txId: " << txId << ", at schemeshard: " << Self->TabletID()); Result = new TEvSchemeShard::TEvNotifyTxCompletionResult(ui64(txId)); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation.cpp b/ydb/core/tx/schemeshard/schemeshard__operation.cpp index 48b58e078b9..85d1ec2616d 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation.cpp @@ -1161,7 +1161,7 @@ ISubOperationBase::TPtr TOperation::ConstructPart(NKikimrSchemeOp::EOperationTyp Y_FAIL("multipart operations are handled before, also they require transaction details"); case NKikimrSchemeOp::EOperationType::ESchemeOp_DEPRECATED_35: - Y_FAIL("imposible"); + Y_FAIL("impossible"); // Move case NKikimrSchemeOp::EOperationType::ESchemeOpMoveTable: @@ -1169,7 +1169,7 @@ ISubOperationBase::TPtr TOperation::ConstructPart(NKikimrSchemeOp::EOperationTyp case NKikimrSchemeOp::EOperationType::ESchemeOpMoveTableIndex: return CreateMoveTableIndex(NextPartId(), tx); case NKikimrSchemeOp::EOperationType::ESchemeOpMoveIndex: - Y_FAIL("imposible"); + Y_FAIL("impossible"); // Replication case NKikimrSchemeOp::EOperationType::ESchemeOpCreateReplication: @@ -1276,15 +1276,15 @@ void TOperation::AddNotifySubscriber(const TActorId& actorId) { void TOperation::DoNotify(TSchemeShard*, TSideEffects& sideEffects, const TActorContext& ctx) { Y_VERIFY(IsReadyToNotify()); - for (auto& subsriber: Subscribers) { + for (auto& subscriber: Subscribers) { THolder<TEvSchemeShard::TEvNotifyTxCompletionResult> msg = MakeHolder<TEvSchemeShard::TEvNotifyTxCompletionResult>(ui64(TxId)); LOG_DEBUG_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TOperation DoNotify" << " send TEvNotifyTxCompletionResult" - << " to actorId: " << subsriber + << " to actorId: " << subscriber << " message: " << msg->Record.ShortDebugString()); - sideEffects.Send(subsriber, msg.Release(), ui64(TxId)); + sideEffects.Send(subscriber, msg.Release(), ui64(TxId)); } Subscribers.clear(); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_kesus.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_kesus.cpp index d09d8018191..98255d1b244 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_alter_kesus.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_alter_kesus.cpp @@ -281,7 +281,7 @@ public: TString errStr; if (!alter.HasName() && !alter.HasPathId()) { - errStr = "Niether kesus name nor pathId in Kesus"; + errStr = "Neither kesus name nor pathId in Kesus"; result->SetError(NKikimrScheme::StatusInvalidParameter, errStr); return result; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_olap_store.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_olap_store.cpp index 515ee20c608..f0d4180c2ac 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_alter_olap_store.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_alter_olap_store.cpp @@ -285,7 +285,7 @@ public: context.Ctx.SelfID, ui64(OperationId.GetTxId()), columnShardTxBody, - context.SS->SelectProcessingPrarams(txState->TargetPathId)); + context.SS->SelectProcessingParams(txState->TargetPathId)); context.OnComplete.BindMsgToPipe(OperationId, tabletId, shard.Idx, event.release()); } else { diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_olap_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_olap_table.cpp index 0a14cef8097..97320acd1ff 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_alter_olap_table.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_alter_olap_table.cpp @@ -211,7 +211,7 @@ public: context.Ctx.SelfID, ui64(OperationId.GetTxId()), columnShardTxBody, - context.SS->SelectProcessingPrarams(txState->TargetPathId)); + context.SS->SelectProcessingParams(txState->TargetPathId)); context.OnComplete.BindMsgToPipe(OperationId, tabletId, shard.Idx, event.release()); } else { diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_pq.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_pq.cpp index 67803c7740c..bcf2394b854 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_alter_pq.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_alter_pq.cpp @@ -166,7 +166,7 @@ public: for (const auto& p : alter.GetPartitionsToAdd()) { if (!parts.insert(p.GetPartitionId()).second) { errStr = TStringBuilder() - << "providing partition " << p.GetPartitionId() << " serveral times in PartitionsToAdd is forbidden"; + << "providing partition " << p.GetPartitionId() << " several times in PartitionsToAdd is forbidden"; return nullptr; } params->PartitionsToAdd.emplace(p.GetPartitionId(), p.GetGroupId()); @@ -391,7 +391,7 @@ public: TString errStr; if (!alter.HasName() && !alter.HasPathId()) { - errStr = "Niether topic name nor pathId in Alter"; + errStr = "Neither topic name nor pathId in Alter"; result->SetError(NKikimrScheme::StatusInvalidParameter, errStr); return result; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_solomon.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_solomon.cpp index d19f6f95503..1c46c007334 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_alter_solomon.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_alter_solomon.cpp @@ -243,7 +243,7 @@ public: } if (alter.GetPartitionCount() == solomon->Partitions.size()) { - result->SetError(NKikimrScheme::StatusSuccess, "solomon volume has olready the same shards as requested"); + result->SetError(NKikimrScheme::StatusSuccess, "solomon volume has already the same shards as requested"); return result; } } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_subdomain.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_subdomain.cpp index 24b278b2af8..8c5713884c0 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_alter_subdomain.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_alter_subdomain.cpp @@ -147,7 +147,7 @@ public: if (subDomain->IsRoot()) { result->SetError( NKikimrScheme::StatusInvalidParameter, - "Malformed subdomain request: unable to change PlanResolution at root, only additiong storage pools is allowed"); + "Malformed subdomain request: unable to change PlanResolution at root, only addition storage pools is allowed"); return result; } } @@ -162,7 +162,7 @@ public: if (subDomain->IsRoot()) { result->SetError( NKikimrScheme::StatusInvalidParameter, - "Malformed subdomain request: unable to change TimeCastBucketsPerMediator at root, only additiong storage pools is allowed"); + "Malformed subdomain request: unable to change TimeCastBucketsPerMediator at root, only addition storage pools is allowed"); return result; } } @@ -245,15 +245,15 @@ public: } { - TVector<TStoragePool> omitedPools; + TVector<TStoragePool> omittedPools; std::set_difference(actualPools.begin(), actualPools.end(), requestedPools.begin(), requestedPools.end(), - std::back_inserter(omitedPools)); + std::back_inserter(omittedPools)); - if (omitedPools && requestedPools) { + if (omittedPools && requestedPools) { result->SetError( NKikimrScheme::StatusInvalidParameter, - "Malformed subdomain request: deleting storage pool is not allowed, for example, requested deletion '" + omitedPools.begin()->GetName() +"'"); + "Malformed subdomain request: deleting storage pool is not allowed, for example, requested deletion '" + omittedPools.begin()->GetName() +"'"); return result; } } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_table.cpp index e0495020666..6e4df063fb4 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_alter_table.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_alter_table.cpp @@ -9,7 +9,7 @@ namespace { using namespace NKikimr; using namespace NSchemeShard; -bool CheckFreezeStateAlredySet(const TTableInfo::TPtr table, const NKikimrSchemeOp::TTableDescription& alter) { +bool CheckFreezeStateAlreadySet(const TTableInfo::TPtr table, const NKikimrSchemeOp::TTableDescription& alter) { if (!alter.HasPartitionConfig()) return false; if (alter.GetPartitionConfig().HasFreezeState()) { @@ -79,7 +79,7 @@ TTableInfo::TAlterDataPtr ParseParams(const TPath& path, TTableInfo::TPtr table, if (copyAlter.HasPartitionConfig() && copyAlter.GetPartitionConfig().HasFreezeState()) { if (hasSchemaChanges) { - errStr = Sprintf("Mix freeze cmd with other options is forbiden"); + errStr = Sprintf("Mix freeze cmd with other options is forbidden"); status = NKikimrScheme::StatusInvalidParameter; return nullptr; } @@ -104,8 +104,8 @@ TTableInfo::TAlterDataPtr ParseParams(const TPath& path, TTableInfo::TPtr table, col.ClearId(); } - if (CheckFreezeStateAlredySet(table, copyAlter)) { - errStr = Sprintf("Requested freeze state alredy set"); + if (CheckFreezeStateAlreadySet(table, copyAlter)) { + errStr = Sprintf("Requested freeze state already set"); status = NKikimrScheme::StatusAlreadyExists; return nullptr; } @@ -180,7 +180,7 @@ void PrepareChanges(TOperationId opId, TPathElement::TPtr path, TTableInfo::TPtr context.OnComplete.ActivateTx(opId); } -bool CheckDropingColumns(const TSchemeShard* ss, const NKikimrSchemeOp::TTableDescription& alter, const TPath& tablePath, TString& errStr) { +bool CheckDroppingColumns(const TSchemeShard* ss, const NKikimrSchemeOp::TTableDescription& alter, const TPath& tablePath, TString& errStr) { TSet<TString> deletedColumns; for (const auto& colDescr: alter.GetDropColumns()) { @@ -202,7 +202,7 @@ bool CheckDropingColumns(const TSchemeShard* ss, const NKikimrSchemeOp::TTableDe for (const auto& indexKey: indexInfo->IndexKeys) { if (deletedColumns.contains(indexKey)) { errStr = TStringBuilder () - << "Imposible drop column because table has an index with that column" + << "Impossible drop column because table has an index with that column" << ", column name: " << indexKey << ", table name: " << tablePath.PathString() << ", index name: " << childName; @@ -213,7 +213,7 @@ bool CheckDropingColumns(const TSchemeShard* ss, const NKikimrSchemeOp::TTableDe for (const auto& col: indexInfo->IndexDataColumns) { if (deletedColumns.contains(col)) { errStr = TStringBuilder () - << "Imposible drop column because table index covers that column" + << "Impossible drop column because table index covers that column" << ", column name: " << col << ", table name: " << tablePath.PathString() << ", index name: " << childName; @@ -281,7 +281,7 @@ public: context.Ctx.SelfID, ui64(OperationId.GetTxId()), txBody, - context.SS->SelectProcessingPrarams(txState->TargetPathId)); + context.SS->SelectProcessingParams(txState->TargetPathId)); context.OnComplete.BindMsgToPipe(OperationId, datashardId, idx, event.Release()); } @@ -557,7 +557,7 @@ public: Y_VERIFY(alterData->AlterVersion == table->AlterVersion + 1); - if (!CheckDropingColumns(context.SS, alter, path, errStr)) { + if (!CheckDroppingColumns(context.SS, alter, path, errStr)) { result->SetError(NKikimrScheme::StatusPreconditionFailed, errStr); return result; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_apply_build_index.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_apply_build_index.cpp index 69263a6b02e..b72b5aae68f 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_apply_build_index.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_apply_build_index.cpp @@ -26,7 +26,7 @@ TVector<ISubOperationBase::TPtr> ApplyBuildIndex(TOperationId nextId, const TTxT TPath implIndexTable = index.Child("indexImplTable"); - TTableInfo::TPtr implInxexTableInfo = context.SS->Tables.at(implIndexTable.Base()->PathId); + TTableInfo::TPtr implIndexTableInfo = context.SS->Tables.at(implIndexTable.Base()->PathId); //check idempotence @@ -39,7 +39,7 @@ TVector<ISubOperationBase::TPtr> ApplyBuildIndex(TOperationId nextId, const TTxT *finalize.MutableLockGuard() = tx.GetLockGuard(); auto op = finalize.MutableFinalizeBuildIndexMainTable(); op->SetTableName(table.LeafName()); - op->SetSnapshotTxId(config.GetSnaphotTxId()); + op->SetSnapshotTxId(config.GetSnaphotTxId()); //TODO: fix spelling error in flat_scheme_op.proto first op->SetBuildIndexId(config.GetBuildIndexId()); op->MutableOutcome()->MutableApply(); @@ -60,7 +60,7 @@ TVector<ISubOperationBase::TPtr> ApplyBuildIndex(TOperationId nextId, const TTxT auto indexImplTableAltering = TransactionTemplate(index.PathString(), NKikimrSchemeOp::EOperationType::ESchemeOpFinalizeBuildIndexImplTable); auto alterTable = indexImplTableAltering.MutableAlterTable(); alterTable->SetName(implIndexTable.LeafName()); - alterTable->MutablePartitionConfig()->MutableCompactionPolicy()->CopyFrom(implInxexTableInfo->PartitionConfig().GetCompactionPolicy()); + alterTable->MutablePartitionConfig()->MutableCompactionPolicy()->CopyFrom(implIndexTableInfo->PartitionConfig().GetCompactionPolicy()); alterTable->MutablePartitionConfig()->MutableCompactionPolicy()->SetKeepEraseMarkers(false); alterTable->MutablePartitionConfig()->SetShadowData(false); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_backup_restore_common.h b/ydb/core/tx/schemeshard/schemeshard__operation_backup_restore_common.h index 618a5a6d1cd..50fb0b36361 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_backup_restore_common.h +++ b/ydb/core/tx/schemeshard/schemeshard__operation_backup_restore_common.h @@ -220,10 +220,10 @@ public: << " at tablet# " << ssId << " message# " << evRecord.ShortDebugString()); - bool allnotificationRecieved = NTableState::CollectSchemaChanged(OperationId, ev, context); + bool allnotificationsReceived = NTableState::CollectSchemaChanged(OperationId, ev, context); CollectStats(OperationId, ev, context); - if (!allnotificationRecieved) { + if (!allnotificationsReceived) { return false; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_common.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_common.cpp index 9a2ca79ce23..15dbe5fdb44 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_common.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_common.cpp @@ -208,7 +208,7 @@ bool NTableState::CollectSchemaChanged( auto shardIdx = context.SS->MustGetShardIdx(datashardId); Y_VERIFY(context.SS->ShardInfos.contains(shardIdx)); - // Save this notification if was received earlier than the Tx swithched to ProposedWaitParts state + // Save this notification if was received earlier than the Tx switched to ProposedWaitParts state ui32 generation = evRecord.GetGeneration(); auto pTablet = txState.SchemeChangeNotificationReceived.FindPtr(shardIdx); if (pTablet && pTablet->second >= generation) { @@ -267,7 +267,7 @@ void NTableState::AckAllSchemaChanges(const TOperationId &operationId, TTxState TTabletId ssId = context.SS->SelfTabletId(); LOG_INFO_S(context.Ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, - "all shard schema changes has been recieved" + "all shard schema changes has been received" << ", operationId: " << operationId << ", at schemeshard: " << ssId); @@ -587,10 +587,10 @@ TSet<ui32> AllIncomingEvents() { return result; } -void NForceDrop::CollectShards(const THashSet<TPathId>& pathes, TOperationId operationId, TTxState *txState, TOperationContext &context) { +void NForceDrop::CollectShards(const THashSet<TPathId>& paths, TOperationId operationId, TTxState *txState, TOperationContext &context) { NIceDb::TNiceDb db(context.GetDB()); - auto shards = context.SS->CollectAllShards(pathes); + auto shards = context.SS->CollectAllShards(paths); for (auto shardIdx: shards) { Y_VERIFY_S(context.SS->ShardInfos.contains(shardIdx), "Unknown shardIdx " << shardIdx); auto& shardInfo = context.SS->ShardInfos.at(shardIdx); @@ -614,11 +614,11 @@ void NForceDrop::CollectShards(const THashSet<TPathId>& pathes, TOperationId ope context.SS->PersistTxState(db, operationId); } -void NForceDrop::ValidateNoTransactionOnPathes(TOperationId operationId, const THashSet<TPathId>& pathes, TOperationContext &context) { +void NForceDrop::ValidateNoTransactionOnPaths(TOperationId operationId, const THashSet<TPathId>& paths, TOperationContext &context) { // No transaction should materialize in a subdomain that is being deleted -- // -- all operations should be checking parent dir status at Propose stage. // However, it is better to verify that, just in case. - auto transactions = context.SS->GetRelatedTransactions(pathes, context.Ctx); + auto transactions = context.SS->GetRelatedTransactions(paths, context.Ctx); for (auto otherTxId: transactions) { if (otherTxId == operationId.GetTxId()) { continue; diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_common.h b/ydb/core/tx/schemeshard/schemeshard__operation_common.h index f0fd3c5bd36..54bfb7f90bf 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_common.h +++ b/ydb/core/tx/schemeshard/schemeshard__operation_common.h @@ -552,7 +552,7 @@ public: TShardIdx idx = context.SS->MustGetShardIdx(tabletId); txState->ShardsInProgress.erase(idx); - // Dettach datashard pipe + // Detach datashard pipe context.OnComplete.UnbindMsgFromPipe(OperationId, tabletId, idx); if (txState->ShardsInProgress.empty()) { @@ -994,7 +994,7 @@ public: auto oldVolumeSpace = volume->GetVolumeSpace(); volume->FinishAlter(); auto newVolumeSpace = volume->GetVolumeSpace(); - // Decrease in occupied space is appled on tx finish + // Decrease in occupied space is applied on tx finish auto domainDir = context.SS->PathsById.at(context.SS->ResolvePathIdForDomain(path)); Y_VERIFY(domainDir); domainDir->ChangeVolumeSpaceCommit(newVolumeSpace, oldVolumeSpace); @@ -1098,7 +1098,7 @@ public: auto ev = MakeHolder<TEvDataShard::TEvProposeTransaction>( NKikimrTxDataShard::TX_KIND_SCHEME, context.SS->TabletID(), context.Ctx.SelfID, ui64(OperationId.GetTxId()), txBody, - context.SS->SelectProcessingPrarams(pathId) + context.SS->SelectProcessingParams(pathId) ); context.OnComplete.BindMsgToPipe(OperationId, datashardId, idx, ev.Release()); @@ -1217,9 +1217,9 @@ protected: } // NCdcStreamState namespace NForceDrop { -void ValidateNoTransactionOnPathes(TOperationId operationId, const THashSet<TPathId>& pathes, TOperationContext& context); +void ValidateNoTransactionOnPaths(TOperationId operationId, const THashSet<TPathId>& paths, TOperationContext& context); -void CollectShards(const THashSet<TPathId>& pathes, TOperationId operationId, TTxState* txState, TOperationContext& context); +void CollectShards(const THashSet<TPathId>& paths, TOperationId operationId, TTxState* txState, TOperationContext& context); } // namespace NForceDrop } // namespace NSchemeShard diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_common_subdomain.h b/ydb/core/tx/schemeshard/schemeshard__operation_common_subdomain.h index 3aadbb1516c..f94c27897f0 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_common_subdomain.h +++ b/ydb/core/tx/schemeshard/schemeshard__operation_common_subdomain.h @@ -210,7 +210,7 @@ public: } case ETabletType::SysViewProcessor: { LOG_DEBUG_S(context.Ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, - "Send configure request to sysview processor: " << tabletID << + "Send configure request to sys view processor: " << tabletID << " opId: " << OperationId << " schemeshard: " << ssId); auto event = new NSysView::TEvSysView::TEvConfigureProcessor(path.PathString()); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_consistent_copy_tables.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_consistent_copy_tables.cpp index 11aaffd34c0..99ea34bf603 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_consistent_copy_tables.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_consistent_copy_tables.cpp @@ -134,7 +134,7 @@ TVector<ISubOperationBase::TPtr> CreateConsistentCopyTables(TOperationId nextId, } Y_VERIFY(srcIndexPath.Base()->PathId == pathId); - Y_VERIFY_S(srcIndexPath.Base()->GetChildren().size() == 1, srcIndexPath.PathString() << " has children " << srcIndexPath.Base()->GetChildren().size() << " but 1 exected"); + Y_VERIFY_S(srcIndexPath.Base()->GetChildren().size() == 1, srcIndexPath.PathString() << " has children " << srcIndexPath.Base()->GetChildren().size() << " but 1 expected"); TTableIndexInfo::TPtr indexInfo = context.SS->Indexes.at(pathId); result.push_back(CreateNewTableIndex(NextPartId(nextId, result), CreateIndexTask(indexInfo, dstIndexPath))); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_copy_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_copy_table.cpp index b6625fccd5b..e59fa1b160e 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_copy_table.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_copy_table.cpp @@ -16,7 +16,7 @@ void PrepareScheme(NKikimrSchemeOp::TTableDescription* schema, const TString& na context.SS->DescribeTable(srcTableInfo, typeRegistry, true, false, &completedSchema); completedSchema.SetName(name); - //inherit all from Src exept PartitionConfig, PartitionConfig could be altered + //inherit all from Src except PartitionConfig, PartitionConfig could be altered completedSchema.MutablePartitionConfig()->CopyFrom(schema->GetPartitionConfig()); schema->Swap(&completedSchema); } @@ -67,7 +67,7 @@ public: const TTableInfo::TPtr dstTableInfo = *context.SS->Tables.FindPtr(txState->TargetPathId); Y_VERIFY(srcTableInfo->GetPartitions().size() == dstTableInfo->GetPartitions().size(), - "CopyTable paritition counts don't match"); + "CopyTable partition counts don't match"); const ui64 dstSchemaVersion = NEW_TABLE_ALTER_VERSION; const ui64 subDomainPathId = context.SS->ResolvePathIdForDomain(txState->TargetPathId).LocalPathId; @@ -108,7 +108,7 @@ public: context.Ctx.SelfID, ui64(OperationId.GetTxId()), txBody, - context.SS->SelectProcessingPrarams(txState->TargetPathId))); + context.SS->SelectProcessingParams(txState->TargetPathId))); context.OnComplete.BindMsgToPipe(OperationId, dstDatashardId, dstShardIdx, dstEvent.Release()); // Send "SendParts" transaction to source datashard @@ -127,7 +127,7 @@ public: context.Ctx.SelfID, ui64(OperationId.GetTxId()), txBody, - context.SS->SelectProcessingPrarams(txState->TargetPathId))); + context.SS->SelectProcessingParams(txState->TargetPathId))); context.OnComplete.BindMsgToPipe(OperationId, srcDatashardId, srcShardIdx, srcEvent.Release()); } @@ -349,7 +349,7 @@ public: if (parent.Base()->IsTableIndex()) { checks .IsInsideTableIndexPath() //copy imp index table as index index table, not a separate one - .NotChildren(); //imp table doesnt have indexes + .NotChildren(); //imp table doesn't have indexes } else { checks.IsCommonSensePath(); } @@ -417,7 +417,7 @@ public: transactionSupport |= domainInfo->GetAlter()->IsSupportTransactions(); } if (!transactionSupport) { - result->SetError(NKikimrScheme::StatusNameConflict, "Inclusive subDomian do not support shared transactions"); + result->SetError(NKikimrScheme::StatusNameConflict, "Inclusive subDomain do not support shared transactions"); return result; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_backup.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_backup.cpp index caecc26c750..03b4aafd1a2 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_backup.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_backup.cpp @@ -19,7 +19,7 @@ struct TBackup { static void ProposeTx(const TOperationId& opId, TTxState& txState, TOperationContext& context) { auto seqNo = context.SS->StartRound(txState); - const auto& processingParams = context.SS->SelectProcessingPrarams(txState.TargetPathId); + const auto& processingParams = context.SS->SelectProcessingParams(txState.TargetPathId); Y_VERIFY(context.SS->Tables.contains(txState.TargetPathId)); TTableInfo::TPtr table = context.SS->Tables.at(txState.TargetPathId); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_build_index.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_build_index.cpp index 3f67672349a..612dce46091 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_build_index.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_build_index.cpp @@ -81,8 +81,8 @@ TVector<ISubOperationBase::TPtr> CreateBuildIndex(TOperationId opId, const TTxTr auto outTx = TransactionTemplate(table.Parent().PathString(), NKikimrSchemeOp::EOperationType::ESchemeOpInitiateBuildIndexMainTable); *outTx.MutableLockGuard() = tx.GetLockGuard(); - auto& shapshot = *outTx.MutableInitiateBuildIndexMainTable(); - shapshot.SetTableName(table.LeafName()); + auto& snapshot = *outTx.MutableInitiateBuildIndexMainTable(); + snapshot.SetTableName(table.LeafName()); result.push_back(CreateInitializeBuildIndexMainTable(NextPartId(opId, result), outTx)); } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_cdc_stream.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_cdc_stream.cpp index 666980c1254..ddfe96e765e 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_cdc_stream.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_cdc_stream.cpp @@ -450,7 +450,7 @@ public: context.MemChanges.GrabNewTableSnapshot(context.SS, tablePath.Base()->PathId, OperationId.GetTxId()); context.DbChanges.PersistTableSnapshot(tablePath.Base()->PathId, OperationId.GetTxId()); - context.SS->TablesWithSnaphots.emplace(tablePath.Base()->PathId, OperationId.GetTxId()); + context.SS->TablesWithSnapshots.emplace(tablePath.Base()->PathId, OperationId.GetTxId()); context.SS->SnapshotTables[OperationId.GetTxId()].insert(tablePath.Base()->PathId); } @@ -650,7 +650,7 @@ TVector<ISubOperationBase::TPtr> CreateNewCdcStream(TOperationId opId, const TTx if (initialScan) { outTx.MutableLockGuard()->SetOwnerTxId(ui64(opId.GetTxId())); } - + result.push_back(CreateNewCdcStreamAtTable(NextPartId(opId, result), outTx, initialScan)); } @@ -712,7 +712,7 @@ TVector<ISubOperationBase::TPtr> CreateNewCdcStream(TOperationId opId, const TTx Y_VERIFY(table->Columns.contains(tag)); const auto typeId = table->Columns.at(tag).PType; const bool ok = NMiniKQL::CellToValue(typeId, cell, *boundary.AddTuple(), errStr); - Y_VERIFY(ok, "Failed to build key tuple at postition %" PRIu32 " error: %s", ki, errStr.data()); + Y_VERIFY(ok, "Failed to build key tuple at position %" PRIu32 " error: %s", ki, errStr.data()); } mg.MutableKeyRange()->SetToBound(cur.EndOfRange); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_kesus.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_kesus.cpp index e5de243751b..1ff1a45294d 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_kesus.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_kesus.cpp @@ -214,7 +214,7 @@ public: // KIKIMR-9036 // usually we make creation over alter, alter as null -> first version - // but now kesus allready has been persisted as first version at propose stage + // but now kesus already has been persisted as first version at propose stage // so we bump version to be sure that actual description pass over caches correctly ++kesus->Version; context.SS->PersistKesusVersion(db, pathId, kesus); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_olap_store.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_olap_store.cpp index 291b499cc26..7cd72a698fc 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_olap_store.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_olap_store.cpp @@ -211,7 +211,7 @@ public: context.Ctx.SelfID, ui64(OperationId.GetTxId()), columnShardTxBody, - context.SS->SelectProcessingPrarams(txState->TargetPathId)); + context.SS->SelectProcessingParams(txState->TargetPathId)); context.OnComplete.BindMsgToPipe(OperationId, tabletId, shard.Idx, event.release()); } else { diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_olap_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_olap_table.cpp index 14a07f8d109..4f523979d5b 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_olap_table.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_olap_table.cpp @@ -362,7 +362,7 @@ public: context.Ctx.SelfID, ui64(OperationId.GetTxId()), columnShardTxBody, - context.SS->SelectProcessingPrarams(txState->TargetPathId)); + context.SS->SelectProcessingParams(txState->TargetPathId)); context.OnComplete.BindMsgToPipe(OperationId, tabletId, shard.Idx, event.release()); } else { @@ -627,8 +627,8 @@ public: storeInfo = context.SS->OlapStores.at(olapStorePath->PathId); Y_VERIFY(storeInfo, "Unexpected failure to find an tablestore info"); - NSchemeShard::TPath::TChecker ckecksStore = olapStorePath.Check(); - ckecksStore + NSchemeShard::TPath::TChecker storeChecks = olapStorePath.Check(); + storeChecks .NotUnderDomainUpgrade() .IsAtLocalSchemeShard() .IsResolved() @@ -637,7 +637,7 @@ public: .IsOlapStore() .NotUnderOperation(); - if (!ckecksStore) { + if (!storeChecks) { result->SetError(checks.GetStatus(), checks.GetError()); return result; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_restore.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_restore.cpp index 7a82fe3c2fa..ad2e7f2649c 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_restore.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_restore.cpp @@ -21,7 +21,7 @@ struct TRestore { const auto& pathId = txState.TargetPathId; const auto seqNo = context.SS->StartRound(txState); - const auto& processingParams = context.SS->SelectProcessingPrarams(pathId); + const auto& processingParams = context.SS->SelectProcessingParams(pathId); Y_VERIFY(context.SS->Tables.contains(pathId)); TTableInfo::TPtr table = context.SS->Tables.at(pathId); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_solomon.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_solomon.cpp index b5aa77d2836..5066516e8e6 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_solomon.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_solomon.cpp @@ -14,7 +14,7 @@ bool ValidateConfig(const NKikimrSchemeOp::TCreateSolomonVolume& op, TEvSchemeShard::EStatus& status, TString& errStr) { if (op.GetPartitionCount() && op.AdoptedPartitionsSize()) { - errStr = "mutable exclusive parametrs PartitionCount and AdoptedPartitions are set"; + errStr = "mutable exclusive parameters PartitionCount and AdoptedPartitions are set"; status = TEvSchemeShard::EStatus::StatusInvalidParameter; return false; } @@ -36,7 +36,7 @@ bool ValidateConfig(const NKikimrSchemeOp::TCreateSolomonVolume& op, TSet<std::pair<ui64, ui64>> owners; for (auto& portion: op.GetAdoptedPartitions()) { if (tabletIds.contains(portion.GetTabletId())) { - errStr = "Dublicate tabletsId in AdoptedPartitions " + errStr = "Duplicate tabletsId in AdoptedPartitions " + ToString(portion.GetTabletId()); status = TEvSchemeShard::EStatus::StatusInvalidParameter; return false; @@ -45,7 +45,7 @@ bool ValidateConfig(const NKikimrSchemeOp::TCreateSolomonVolume& op, auto owner = std::make_pair<ui64, ui64>(portion.GetOwnerId(), portion.GetShardIdx()); if (owners.contains(owner)) { - errStr = "Dublicate pair owner and shard in AdoptedPartitions " + errStr = "Duplicate pair owner and shard in AdoptedPartitions " + ToString(owner.first) + " " + ToString(owner.second); status = TEvSchemeShard::EStatus::StatusInvalidParameter; return false; diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp index e281852bef4..ddf486c7e82 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp @@ -222,7 +222,7 @@ public: context.Ctx.SelfID, ui64(OperationId.GetTxId()), txBody, - context.SS->SelectProcessingPrarams(txState->TargetPathId))); + context.SS->SelectProcessingParams(txState->TargetPathId))); LOG_DEBUG_S(context.Ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, DebugHint() << " ProgressState" @@ -525,7 +525,7 @@ public: transactionSupport |= domainInfo->GetAlter()->IsSupportTransactions(); } if (!transactionSupport) { - result->SetError(NKikimrScheme::StatusNameConflict, "Inclusive subDomian do not support shared transactions"); + result->SetError(NKikimrScheme::StatusNameConflict, "Inclusive subDomain do not support shared transactions"); return result; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_db_changes.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_db_changes.cpp index d4915bd6a6b..919c37fe0af 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_db_changes.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_db_changes.cpp @@ -10,7 +10,7 @@ void TStorageChanges::Apply(TSchemeShard* ss, NTabletFlatExecutor::TTransactionC //TODO: paths/other changes could be repeated many times, could it be a problem? - for (const auto& pId : Pathes) { + for (const auto& pId : Paths) { ss->PersistPath(db, pId); } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_db_changes.h b/ydb/core/tx/schemeshard/schemeshard__operation_db_changes.h index ae632bb18f3..8cdbab2bb49 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_db_changes.h +++ b/ydb/core/tx/schemeshard/schemeshard__operation_db_changes.h @@ -13,7 +13,7 @@ namespace NKikimr::NSchemeShard { class TSchemeShard; class TStorageChanges: public TSimpleRefCount<TStorageChanges> { - TDeque<TPathId> Pathes; + TDeque<TPathId> Paths; TDeque<TPathId> Tables; TDeque<std::pair<TPathId, TTxId>> TableSnapshots; @@ -38,7 +38,7 @@ public: ~TStorageChanges() = default; void PersistPath(const TPathId& pathId) { - Pathes.push_back(pathId); + Paths.push_back(pathId); } void PersistTable(const TPathId& pathId) { diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_bsv.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_bsv.cpp index c307fed7995..af4f7287e86 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_bsv.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_bsv.cpp @@ -36,7 +36,7 @@ public: TTxState* txState = context.SS->FindTx(OperationId); Y_VERIFY(txState->TxType == TTxState::TxDropBlockStoreVolume); - // Initiate asynchonous deletion of all shards + // Initiate asynchronous deletion of all shards for (auto shard : txState->Shards) { context.OnComplete.DeleteShard(shard.Idx); } @@ -90,8 +90,8 @@ public: parentDir->DecAliveChildren(); // KIKIMR-13173 - // Repeat it here for a waile, delete it from TDeleteParts after - // Initiate asynchonous deletion of all shards + // Repeat it here for a while, delete it from TDeleteParts after + // Initiate asynchronous deletion of all shards for (auto shard : txState->Shards) { context.OnComplete.DeleteShard(shard.Idx); } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_extsubdomain.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_extsubdomain.cpp index 98e6de0fc2c..7340a30e858 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_extsubdomain.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_extsubdomain.cpp @@ -194,9 +194,9 @@ public: // if its root is not resolvable. And nodes could go away right in the middle of anything -- // -- being able to reconnect node any time until extsubdomain is actually gone // is a good thing. - auto pathes = context.SS->ListSubTree(pathId, context.Ctx); - pathes.erase(pathId); - context.SS->DropPathes(pathes, step, OperationId.GetTxId(), db, context.Ctx); + auto paths = context.SS->ListSubTree(pathId, context.Ctx); + paths.erase(pathId); + context.SS->DropPaths(paths, step, OperationId.GetTxId(), db, context.Ctx); auto parentDir = context.SS->PathsById.at(path->ParentPathId); ++parentDir->DirAlterVersion; @@ -204,7 +204,7 @@ public: context.SS->ClearDescribePathCaches(parentDir); context.OnComplete.PublishToSchemeBoard(OperationId, parentDir->PathId); - for (auto id: pathes) { + for (auto id: paths) { context.OnComplete.PublishToSchemeBoard(OperationId, id); } @@ -225,9 +225,9 @@ public: auto targetPath = context.SS->PathsById.at(txState->TargetPathId); - auto pathes = context.SS->ListSubTree(targetPath->PathId, context.Ctx); - NForceDrop::ValidateNoTransactionOnPathes(OperationId, pathes, context); - NForceDrop::CollectShards(pathes, OperationId, txState, context); + auto paths = context.SS->ListSubTree(targetPath->PathId, context.Ctx); + NForceDrop::ValidateNoTransactionOnPaths(OperationId, paths, context); + NForceDrop::CollectShards(paths, OperationId, txState, context); context.SS->MarkAsDropping(targetPath, OperationId.GetTxId(), context.Ctx); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_fs.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_fs.cpp index 9c1cf1e948a..569c497d12d 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_fs.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_fs.cpp @@ -39,7 +39,7 @@ public: auto* txState = context.SS->FindTx(OperationId); Y_VERIFY(txState->TxType == TTxState::TxDropFileStore); - // Initiate asynchonous deletion of all shards + // Initiate asynchronous deletion of all shards for (const auto& shard: txState->Shards) { context.OnComplete.DeleteShard(shard.Idx); } @@ -101,8 +101,8 @@ public: parentDir->DecAliveChildren(); // KIKIMR-13173 - // Repeat it here for a waile, delete it from TDeleteParts after - // Initiate asynchonous deletion of all shards + // Repeat it here for a while, delete it from TDeleteParts after + // Initiate asynchronous deletion of all shards for (auto shard : txState->Shards) { context.OnComplete.DeleteShard(shard.Idx); } @@ -272,7 +272,7 @@ THolder<TProposeResponse> TDropFileStore::Propose( } TTxState& txState = context.SS->CreateTx(OperationId, TTxState::TxDropFileStore, path.Base()->PathId); - // Dirty hack: operation step must not be zero because 0 is treated as "hasn't been operationped" + // Dirty hack: operation step must not be zero because 0 is treated as "hasn't been in operation" txState.MinStep = TStepId(1); txState.State = TTxState::DeleteParts; diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_index.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_index.cpp index 654dec779f9..a357ce069e8 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_index.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_index.cpp @@ -118,7 +118,7 @@ public: context.Ctx.SelfID, ui64(OperationId.GetTxId()), txBody, - context.SS->SelectProcessingPrarams(txState->TargetPathId))); + context.SS->SelectProcessingParams(txState->TargetPathId))); context.OnComplete.BindMsgToPipe(OperationId, datashardId, idx, event.Release()); } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_kesus.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_kesus.cpp index fcdb3bfd050..e790b4f548f 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_kesus.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_kesus.cpp @@ -36,7 +36,7 @@ public: TTxState* txState = context.SS->FindTx(OperationId); Y_VERIFY(txState->TxType == TTxState::TxDropKesus); - // Initiate asynchonous deletion of all shards + // Initiate asynchronous deletion of all shards for (auto shard : txState->Shards) { context.OnComplete.DeleteShard(shard.Idx); } @@ -91,8 +91,8 @@ public: parentDir->DecAliveChildren(); // KIKIMR-13173 - // Repeat it here for a waile, delete it from TDeleteParts after - // Initiate asynchonous deletion of all shards + // Repeat it here for a while, delete it from TDeleteParts after + // Initiate asynchronous deletion of all shards for (auto shard : txState->Shards) { context.OnComplete.DeleteShard(shard.Idx); } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_olap_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_olap_table.cpp index a3515ffe31b..ee7f80b2d10 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_olap_table.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_olap_table.cpp @@ -71,7 +71,7 @@ public: context.Ctx.SelfID, ui64(OperationId.GetTxId()), columnShardTxBody, - context.SS->SelectProcessingPrarams(txState->TargetPathId)); + context.SS->SelectProcessingParams(txState->TargetPathId)); context.OnComplete.BindMsgToPipe(OperationId, tabletId, shard.Idx, event.release()); } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_pq.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_pq.cpp index 7b1e950e7a8..9051ccc18c7 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_pq.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_pq.cpp @@ -144,7 +144,7 @@ public: TTxState* txState = context.SS->FindTx(OperationId); - // Initiate asynchonous deletion of all shards + // Initiate asynchronous deletion of all shards for (auto shard : txState->Shards) { context.OnComplete.DeleteShard(shard.Idx); } @@ -199,8 +199,8 @@ public: Y_VERIFY(pqGroup); // KIKIMR-13173 - // Repeat it here for a waile, delete it from TDeleteParts after - // Initiate asynchonous deletion of all shards + // Repeat it here for a while, delete it from TDeleteParts after + // Initiate asynchronous deletion of all shards for (auto shard : txState->Shards) { context.OnComplete.DeleteShard(shard.Idx); } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_solomon.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_solomon.cpp index c6ec4888d38..bf4ace647e9 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_solomon.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_solomon.cpp @@ -35,7 +35,7 @@ public: TTxState* txState = context.SS->FindTx(OperationId); - // Initiate asynchonous deletion of all shards + // Initiate asynchronous deletion of all shards for (auto shard : txState->Shards) { context.OnComplete.DeleteShard(shard.Idx); } @@ -80,9 +80,9 @@ public: NIceDb::TNiceDb db(context.GetDB()); - auto pathes = context.SS->ListSubTree(pathId, context.Ctx); - Y_VERIFY(pathes.size() == 1); - context.SS->DropPathes(pathes, step, OperationId.GetTxId(), db, context.Ctx); + auto paths = context.SS->ListSubTree(pathId, context.Ctx); + Y_VERIFY(paths.size() == 1); + context.SS->DropPaths(paths, step, OperationId.GetTxId(), db, context.Ctx); if (!AppData()->DisableSchemeShardCleanupOnDropForTest) { context.SS->PersistRemoveSolomonVolume(db, pathId); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_subdomain.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_subdomain.cpp index e1e1458a37c..076f300b502 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_subdomain.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_subdomain.cpp @@ -35,7 +35,7 @@ public: TTxState* txState = context.SS->FindTx(OperationId); - // Initiate asynchonous deletion of all shards + // Initiate asynchronous deletion of all shards for (auto shard : txState->Shards) { context.OnComplete.DeleteShard(shard.Idx); } @@ -79,9 +79,9 @@ public: NIceDb::TNiceDb db(context.GetDB()); - auto pathes = context.SS->ListSubTree(pathId, context.Ctx); - Y_VERIFY(pathes.size() == 1); - context.SS->DropPathes(pathes, step, OperationId.GetTxId(), db, context.Ctx); + auto paths = context.SS->ListSubTree(pathId, context.Ctx); + Y_VERIFY(paths.size() == 1); + context.SS->DropPaths(paths, step, OperationId.GetTxId(), db, context.Ctx); auto parentDir = context.SS->PathsById.at(path->ParentPathId); ++parentDir->DirAlterVersion; diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_table.cpp index c67bc2bfe5d..e286f4e6633 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_table.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_table.cpp @@ -140,7 +140,7 @@ public: context.Ctx.SelfID, ui64(OperationId.GetTxId()), txBody, - context.SS->SelectProcessingPrarams(txState->TargetPathId)); + context.SS->SelectProcessingParams(txState->TargetPathId)); context.OnComplete.BindMsgToPipe(OperationId, datashardId, idx, event.Release()); } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_drop_unsafe.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_drop_unsafe.cpp index c45916a4c87..fee01f4cce2 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_drop_unsafe.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_drop_unsafe.cpp @@ -35,7 +35,7 @@ public: TTxState* txState = context.SS->FindTx(OperationId); - // Initiate asynchonous deletion of all shards + // Initiate asynchronous deletion of all shards for (auto shard : txState->Shards) { context.OnComplete.DeleteShard(shard.Idx); } @@ -78,11 +78,11 @@ public: TPathId pathId = txState->TargetPathId; TPathElement::TPtr path = context.SS->PathsById.at(pathId); - auto pathes = context.SS->ListSubTree(pathId, context.Ctx); + auto paths = context.SS->ListSubTree(pathId, context.Ctx); NIceDb::TNiceDb db(context.GetDB()); - context.SS->DropPathes(pathes, step, OperationId.GetTxId(), db, context.Ctx); + context.SS->DropPaths(paths, step, OperationId.GetTxId(), db, context.Ctx); auto parentDir = context.SS->PathsById.at(path->ParentPathId); ++parentDir->DirAlterVersion; @@ -91,7 +91,7 @@ public: if (!context.SS->DisablePublicationsOfDropping) { context.OnComplete.PublishToSchemeBoard(OperationId, parentDir->PathId); - for (const TPathId pathId : pathes) { + for (const TPathId pathId : paths) { context.OnComplete.PublishToSchemeBoard(OperationId, pathId); } } @@ -111,10 +111,10 @@ public: Y_VERIFY(txState); Y_VERIFY(txState->TxType == TTxState::TxForceDropSubDomain); - auto pathes = context.SS->ListSubTree(txState->TargetPathId, context.Ctx); - NForceDrop::ValidateNoTransactionOnPathes(OperationId, pathes, context); - context.SS->MarkAsDropping(pathes, OperationId.GetTxId(), context.Ctx); - NForceDrop::CollectShards(pathes, OperationId, txState, context); + auto paths = context.SS->ListSubTree(txState->TargetPathId, context.Ctx); + NForceDrop::ValidateNoTransactionOnPaths(OperationId, paths, context); + context.SS->MarkAsDropping(paths, OperationId.GetTxId(), context.Ctx); + NForceDrop::CollectShards(paths, OperationId, txState, context); context.OnComplete.ProposeToCoordinator(OperationId, txState->TargetPathId, TStepId(0)); return false; @@ -180,7 +180,7 @@ public: LOG_WARN_S(context.Ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, " UNSAFE DELETION IS CALLED." " TDropForceUnsafe is UNSAFE operation." - " Nornally it is called for deleting user's DB (tenant)." + " Usually it is called for deleting user's DB (tenant)." " But it could be triggered by administrator for special emergency cases. And there is that case." " I hope you are aware of the problems with it." " 1: Shared transactions among the tables could be broken if one of the tables is force dropped. Dependent transactions on other tables could be blocked forever." @@ -246,9 +246,9 @@ public: NIceDb::TNiceDb db(context.GetDB()); - auto pathes = context.SS->ListSubTree(path.Base()->PathId, context.Ctx); + auto paths = context.SS->ListSubTree(path.Base()->PathId, context.Ctx); - auto relatedTx = context.SS->GetRelatedTransactions(pathes, context.Ctx); + auto relatedTx = context.SS->GetRelatedTransactions(paths, context.Ctx); for (auto otherTxId: relatedTx) { if (otherTxId == OperationId.GetTxId()) { continue; @@ -271,7 +271,7 @@ public: } } - context.SS->MarkAsDropping(pathes, OperationId.GetTxId(), context.Ctx); + context.SS->MarkAsDropping(paths, OperationId.GetTxId(), context.Ctx); txState.State = TTxState::Propose; context.OnComplete.ActivateTx(OperationId); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_finalize_build_index.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_finalize_build_index.cpp index dad87300727..c873f6eb30d 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_finalize_build_index.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_finalize_build_index.cpp @@ -57,8 +57,8 @@ public: txState->ClearShardsInProgress(); - const TTxId snapshotTxId = context.SS->TablesWithSnaphots.at(pathId); - const TStepId snapshotStepid = context.SS->SnapshotsStepIds.at(snapshotTxId); + const TTxId snapshotTxId = context.SS->TablesWithSnapshots.at(pathId); + const TStepId snapshotStepId = context.SS->SnapshotsStepIds.at(snapshotTxId); for (ui32 i = 0; i < txState->Shards.size(); ++i) { TShardIdx shardIdx = txState->Shards[i].Idx; @@ -71,7 +71,7 @@ public: PathIdFromPathId(pathId, op->MutablePathId()); op->SetSnapshotTxId(ui64(snapshotTxId)); - op->SetSnapshotStep(ui64(snapshotStepid)); + op->SetSnapshotStep(ui64(snapshotStepId)); op->SetTableSchemaVersion(table->AlterVersion+1); op->SetBuildIndexId(ui64(txState->BuildIndexId)); if (txState->BuildIndexOutcome) { @@ -98,7 +98,7 @@ public: context.Ctx.SelfID, ui64(OperationId.GetTxId()), txBody, - context.SS->SelectProcessingPrarams(txState->TargetPathId))); + context.SS->SelectProcessingParams(txState->TargetPathId))); context.OnComplete.BindMsgToPipe(OperationId, datashardId, shardIdx, event.Release()); } @@ -155,13 +155,13 @@ public: NIceDb::TNiceDb db(context.GetDB()); TPathId tableId = txState->TargetPathId; - TTxId snapshotTxId = context.SS->TablesWithSnaphots.at(tableId); + TTxId snapshotTxId = context.SS->TablesWithSnapshots.at(tableId); context.SS->SnapshotsStepIds.erase(snapshotTxId); context.SS->SnapshotTables.at(snapshotTxId).erase(tableId); if (context.SS->SnapshotTables.at(snapshotTxId).empty()) { context.SS->SnapshotTables.erase(snapshotTxId); } - context.SS->TablesWithSnaphots.erase(tableId); + context.SS->TablesWithSnapshots.erase(tableId); context.SS->PersistDropSnapshot(db, snapshotTxId, tableId); @@ -351,7 +351,7 @@ public: return result; } - if (!context.SS->TablesWithSnaphots.contains(tablePathId)) { + if (!context.SS->TablesWithSnapshots.contains(tablePathId)) { errStr = TStringBuilder() << "No snapshot presents for table" << ", tableId:" << tablePathId @@ -360,15 +360,15 @@ public: return result; } - TTxId shapshotTxId = context.SS->TablesWithSnaphots.at(tablePathId); - if (TTxId(finalizeMainTable.GetSnapshotTxId()) != shapshotTxId) { + TTxId snapshotTxId = context.SS->TablesWithSnapshots.at(tablePathId); + if (TTxId(finalizeMainTable.GetSnapshotTxId()) != snapshotTxId) { errStr = TStringBuilder() << "No snapshot with requested txId presents for table" << ", tableId:" << tablePathId << ", txId: " << OperationId.GetTxId() << ", requested snapshotTxId: " << finalizeMainTable.GetSnapshotTxId() - << ", snapshotTxId: " << shapshotTxId - << ", snapshotStepId: " << context.SS->SnapshotsStepIds.at(shapshotTxId); + << ", snapshotTxId: " << snapshotTxId + << ", snapshotStepId: " << context.SS->SnapshotsStepIds.at(snapshotTxId); result->SetError(TEvSchemeShard::EStatus::StatusPathDoesNotExist, errStr); return result; } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_initiate_build_index.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_initiate_build_index.cpp index 8162040d622..c83d3962963 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_initiate_build_index.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_initiate_build_index.cpp @@ -118,7 +118,7 @@ public: NKikimrTxDataShard::TX_KIND_SCHEME, context.SS->TabletID(), context.Ctx.SelfID, ui64(OperationId.GetTxId()), txBody, - context.SS->SelectProcessingPrarams(txState->TargetPathId) + context.SS->SelectProcessingParams(txState->TargetPathId) ); context.OnComplete.BindMsgToPipe(OperationId, datashardId, shardIdx, event.Release()); @@ -392,7 +392,7 @@ public: context.OnComplete.Dependence(splitTx.GetTxId(), OperationId.GetTxId()); } - context.SS->TablesWithSnaphots.emplace(tablePathId, OperationId.GetTxId()); + context.SS->TablesWithSnapshots.emplace(tablePathId, OperationId.GetTxId()); context.SS->SnapshotTables[OperationId.GetTxId()].insert(tablePathId); context.SS->TabletCounters->Simple()[COUNTER_SNAPSHOTS_COUNT].Add(1); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_memory_changes.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_memory_changes.cpp index 90ac31c6ee1..ba3db31cf22 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_memory_changes.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_memory_changes.cpp @@ -14,14 +14,14 @@ void TMemoryChanges::GrabNewTxState(TSchemeShard* ss, const TOperationId& op) { void TMemoryChanges::GrabNewPath(TSchemeShard* ss, const TPathId& pathId) { Y_VERIFY(!ss->PathsById.contains(pathId)); - Pathes.emplace(pathId, nullptr); + Paths.emplace(pathId, nullptr); } void TMemoryChanges::GrabPath(TSchemeShard* ss, const TPathId& pathId) { Y_VERIFY(ss->PathsById.contains(pathId)); TPathElement::TPtr copy = new TPathElement(*ss->PathsById.at(pathId)); - Pathes.emplace(pathId, copy); + Paths.emplace(pathId, copy); } void TMemoryChanges::GrabNewTable(TSchemeShard* ss, const TPathId& pathId) { @@ -75,9 +75,9 @@ void TMemoryChanges::GrabNewCdcStream(TSchemeShard* ss, const TPathId& pathId) { } void TMemoryChanges::GrabNewTableSnapshot(TSchemeShard* ss, const TPathId& pathId, TTxId snapshotTxId) { - Y_VERIFY(!ss->TablesWithSnaphots.contains(pathId)); + Y_VERIFY(!ss->TablesWithSnapshots.contains(pathId)); - TablesWithSnaphots.emplace(pathId, snapshotTxId); + TablesWithSnapshots.emplace(pathId, snapshotTxId); } void TMemoryChanges::GrabNewLongLock(TSchemeShard* ss, const TPathId& pathId, TTxId lockTxId) { @@ -90,14 +90,14 @@ void TMemoryChanges::UnDo(TSchemeShard* ss) { // be aware of the order of grab & undo ops // stack is the best way to manage it right - while (Pathes) { - const auto& [id, elem] = Pathes.top(); + while (Paths) { + const auto& [id, elem] = Paths.top(); if (elem) { ss->PathsById[id] = elem; } else { ss->PathsById.erase(id); } - Pathes.pop(); + Paths.pop(); } while (Indexes) { @@ -120,10 +120,10 @@ void TMemoryChanges::UnDo(TSchemeShard* ss) { CdcStreams.pop(); } - while (TablesWithSnaphots) { - const auto& [id, snapshotTxId] = TablesWithSnaphots.top(); + while (TablesWithSnapshots) { + const auto& [id, snapshotTxId] = TablesWithSnapshots.top(); - ss->TablesWithSnaphots.erase(id); + ss->TablesWithSnapshots.erase(id); auto it = ss->SnapshotTables.find(snapshotTxId); if (it != ss->SnapshotTables.end()) { it->second.erase(id); @@ -132,7 +132,7 @@ void TMemoryChanges::UnDo(TSchemeShard* ss) { } } - TablesWithSnaphots.pop(); + TablesWithSnapshots.pop(); } while (LockedPaths) { diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_memory_changes.h b/ydb/core/tx/schemeshard/schemeshard__operation_memory_changes.h index e901c0f5316..bca0268921a 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_memory_changes.h +++ b/ydb/core/tx/schemeshard/schemeshard__operation_memory_changes.h @@ -15,7 +15,7 @@ class TSchemeShard; class TMemoryChanges: public TSimpleRefCount<TMemoryChanges> { using TPathState = std::pair<TPathId, TPathElement::TPtr>; - TStack<TPathState> Pathes; + TStack<TPathState> Paths; using TIndexState = std::pair<TPathId, TTableIndexInfo::TPtr>; TStack<TIndexState> Indexes; @@ -24,7 +24,7 @@ class TMemoryChanges: public TSimpleRefCount<TMemoryChanges> { TStack<TCdcStreamState> CdcStreams; using TTableSnapshotState = std::pair<TPathId, TTxId>; - TStack<TTableSnapshotState> TablesWithSnaphots; + TStack<TTableSnapshotState> TablesWithSnapshots; using TLockState = std::pair<TPathId, TTxId>; TStack<TLockState> LockedPaths; diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_move_index.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_move_index.cpp index 2f0c0cd52bd..a40ce5c4057 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_move_index.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_move_index.cpp @@ -148,7 +148,7 @@ public: context.Ctx.SelfID, ui64(OperationId.GetTxId()), txBody, - context.SS->SelectProcessingPrarams(txState->TargetPathId))); + context.SS->SelectProcessingParams(txState->TargetPathId))); context.OnComplete.BindMsgToPipe(OperationId, datashardId, idx, event.Release()); } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_move_table.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_move_table.cpp index 5452799d884..6acb4eff554 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_move_table.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_move_table.cpp @@ -127,7 +127,7 @@ public: context.Ctx.SelfID, ui64(OperationId.GetTxId()), txBody, - context.SS->SelectProcessingPrarams(txState->TargetPathId)); + context.SS->SelectProcessingParams(txState->TargetPathId)); context.OnComplete.BindMsgToPipe(OperationId, datashardId, idx, event.Release()); } diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_part.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_part.cpp index e30f7511a83..d4957b644f2 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_part.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_part.cpp @@ -82,7 +82,7 @@ struct TDebugEvent<TEvPrivate::TEvUndoTenantUpdate> { bool TSubOperationState::HandleReply(TEvType::TPtr& ev, TOperationContext& context) { \ if (!MsgToIgnore.empty() && MsgToIgnore.contains(TEvType::EventType)) { \ LOG_INFO_S(context.Ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, \ - "Superflous message, " << LogHint \ + "Superfluous message, " << LogHint \ << " TEvType# " << #TEvType \ << " debug msg# " << DebugReply(ev) \ << " at tablet# " << context.SS->TabletID()); \ diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_part.h b/ydb/core/tx/schemeshard/schemeshard__operation_part.h index e1a1890aa45..0d3a3c2cd33 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_part.h +++ b/ydb/core/tx/schemeshard/schemeshard__operation_part.h @@ -130,7 +130,7 @@ public: NTable::TDatabase& GetDB() { Y_VERIFY_S(ProtectDB == false, "there is attempt to write to the DB when it is protected," - " in that case all writes slould be done over TStorageChanges" + " in that case all writes should be done over TStorageChanges" " in order to maintain revert the changes"); DirectAccessGranted = true; return GetTxc().DB; @@ -197,7 +197,7 @@ public: // call it inside multipart operations after failed propose virtual void AbortPropose(TOperationContext& context) = 0; - // call it only before execute ForceDrop operaion for path + // call it only before execute ForceDrop operation for path virtual void AbortUnsafe(TTxId forceDropTxId, TOperationContext& context) = 0; // getters diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_side_effects.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_side_effects.cpp index c966b7d93e1..2cde5a9ce7f 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_side_effects.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_side_effects.cpp @@ -12,8 +12,8 @@ void TSideEffects::ProposeToCoordinator(TOperationId opId, TPathId pathId, TStep CoordinatorProposes.push_back(TProposeRec(opId, pathId, minStep)); } -void TSideEffects::CoordinatorAck(TActorId coordiantor, TStepId stepId, TTxId txId) { - CoordinatorAcks.push_back(TCoordinatorAck(coordiantor, stepId, txId)); +void TSideEffects::CoordinatorAck(TActorId coordinator, TStepId stepId, TTxId txId) { + CoordinatorAcks.push_back(TCoordinatorAck(coordinator, stepId, txId)); } void TSideEffects::MediatorAck(TActorId mediator, TStepId stepId) { @@ -197,7 +197,7 @@ void TSideEffects::ApplyOnComplete(TSchemeShard* ss, const TActorContext& ctx) { DoBindMsg(ss, ctx); //attach/detach tablets - PendingPipeTrackerCommands.Apply(ss->PipeTracker, ctx); //it's better to decomposite attach and detach, detach shoud be applied at ApplyOnExecute + PendingPipeTrackerCommands.Apply(ss->PipeTracker, ctx); //it's better to decompose attach and detach, detach should be applied at ApplyOnExecute DoRegisterRelations(ss, ctx); DoTriggerDeleteShards(ss, ctx); @@ -267,7 +267,7 @@ bool TSideEffects::CheckDecouplingProposes(TString& errExpl) const { errExpl = TStringBuilder() << "can't propose more then one operation to the shard with the same txId" << ", here shardId is " << shard - << " has coolision with operations " << opId + << " has collision with operations " << opId << " and " << position->second; return false; } @@ -336,7 +336,7 @@ void TSideEffects::DoMediatorsAck(TSchemeShard* ss, const TActorContext& ctx) { } void TSideEffects::DoCoordinatorAck(TSchemeShard* ss, const TActorContext& ctx) { - //agregate + //aggregate TMap<TActorId, TMap<TStepId, TSet<TTxId>>> toCoordinatorAck; for (auto& rec: CoordinatorAcks) { TActorId coordinator; @@ -402,7 +402,7 @@ void TSideEffects::DoUpdateTenant(TSchemeShard* ss, NTabletFlatExecutor::TTransa if (tenantLink.TenantRootACL && tenantRoot.Base()->ACL) { // KIKIMR-10699: transfer tenants root ACL from GSS to the TSS // here GSS sees the ACL from TSS - // so GSS just removes what alresy has been transfered form GSS to TSS + // so GSS just removes what already has been transferred from GSS to TSS NACLib::TACL tenantRootACL(tenantLink.TenantRootACL); @@ -434,7 +434,7 @@ void TSideEffects::DoUpdateTenant(TSchemeShard* ss, NTabletFlatExecutor::TTransa } if (tenantRoot.Base()->ACL) { - // send ACL untill all rights are transfered + // send ACL until all rights are transferred message->SetUpdateTenantRootACL(tenantRoot.Base()->ACL); hasChanges = true; } @@ -651,7 +651,7 @@ void TSideEffects::DoBindMsgAcks(TSchemeShard *ss, const TActorContext &ctx) { if (operation->PipeBindedMessages[tablet].size() == 0) { operation->PipeBindedMessages.erase(tablet); - //Dettach(opId, tablet); + //Detach(opId, tablet); } } } @@ -807,7 +807,7 @@ void TSideEffects::DoDoneTransactions(TSchemeShard *ss, NTabletFlatExecutor::TTr LOG_DEBUG_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "Remove dependency" << ", parent tx: " << txId - << ", depnedent tx: " << dependent); + << ", dependent tx: " << dependent); ss->PersistRemoveTxDependency(db, txId, dependent); @@ -818,7 +818,7 @@ void TSideEffects::DoDoneTransactions(TSchemeShard *ss, NTabletFlatExecutor::TTr auto dependentOp = ss->Operations.at(dependent); Y_VERIFY_S(dependentOp->WaitOperations.contains(txId), "self consistency check, dependentOp must have parent operation in WaitOperations" - << ", dependet " << dependent + << ", dependent " << dependent << ", parent " << txId); dependentOp->WaitOperations.erase(txId); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_side_effects.h b/ydb/core/tx/schemeshard/schemeshard__operation_side_effects.h index b5c75b35a68..3a1587a9d71 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_side_effects.h +++ b/ydb/core/tx/schemeshard/schemeshard__operation_side_effects.h @@ -77,7 +77,7 @@ public: CoordinatorProposesShards.push_back(TProposeShards(opId, shard)); } } - void CoordinatorAck(TActorId coordiantor, TStepId stepId, TTxId txId); + void CoordinatorAck(TActorId coordinator, TStepId stepId, TTxId txId); void MediatorAck(TActorId mediator, TStepId stepId); void UpdateTenant(TPathId pathIds); @@ -108,7 +108,7 @@ public: void DoneOperation(TOperationId opId); void ReadyToNotify(TOperationId opId); - void Dependence(TTxId parend, TTxId child); + void Dependence(TTxId parent, TTxId child); void ActivateTx(TOperationId opId); void ActivateOperation(TTxId txId); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_split_merge.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_split_merge.cpp index b11a8d557a7..0cd787eaedc 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_split_merge.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_split_merge.cpp @@ -152,7 +152,7 @@ public: THolder(new TEvDataShard::TEvInitSplitMergeDestination(ui64(OperationId.GetTxId()), context.SS->TabletID(), subDomainPathId, splitDescForShard, - context.SS->SelectProcessingPrarams(txState->TargetPathId))); + context.SS->SelectProcessingParams(txState->TargetPathId))); // Add a new-style CreateTable with correct per-shard settings // WARNING: legacy datashard will ignore this and use the schema @@ -178,18 +178,18 @@ public: } }; -class TTranserData: public TSubOperationState { +class TTransferData: public TSubOperationState { private: TOperationId OperationId; TString DebugHint() const override { return TStringBuilder() - << "TSplitMerge TTranserData" + << "TSplitMerge TTransferData" << " operationId#" << OperationId; } public: - TTranserData(TOperationId id) + TTransferData(TOperationId id) : OperationId(id) { IgnoreMessages(DebugHint(), {TEvHive::TEvCreateTabletReply::EventType, TEvDataShard::TEvInitSplitMergeDestinationAck::EventType}); @@ -288,7 +288,7 @@ public: auto oldAggrStats = tableInfo->GetStats().Aggregated; - // Delete the whole old partitioning and persist the whole new partitionig as the indexes have changed + // Delete the whole old partitioning and persist the whole new partitioning as the indexes have changed context.SS->PersistTablePartitioningDeletion(db, tableId, tableInfo); context.SS->SetPartitioning(tableId, tableInfo, std::move(newPartitioning)); context.SS->PersistTablePartitioning(db, tableId, tableInfo); @@ -507,7 +507,7 @@ class TSplitMerge: public TSubOperation { case TTxState::ConfigureParts: return THolder(new TConfigureDestination(OperationId)); case TTxState::TransferData: - return THolder(new TTranserData(OperationId)); + return THolder(new TTransferData(OperationId)); case TTxState::NotifyPartitioningChanged: return THolder(new TNotifySrc(OperationId)); default: @@ -799,7 +799,7 @@ public: if (!context.SS->ShardInfos.contains(srcShardIdx)) { TString errMsg = TStringBuilder() - << "shard doesn't present at schemesahrd at all" + << "shard doesn't present at schemeshard at all" << ", tablet: " << srcTabletId << ", srcShardIdx: " << srcShardIdx << ", pathId: " << path.Base()->PathId; @@ -809,7 +809,7 @@ public: if (!shardIdx2partition.contains(srcShardIdx)) { TString errMsg = TStringBuilder() - << "shard doesn't present at schemesahrd at table" + << "shard doesn't present at schemeshard at table" << ", tablet: " << srcTabletId << ", srcShardIdx: " << srcShardIdx << ", pathId: " << path.Base()->PathId; @@ -948,7 +948,7 @@ public: TTableInfo::TPtr mutableTableInfo = context.SS->Tables.at(path->PathId); - mutableTableInfo->RegisterSplitMegreOp(OperationId, op); + mutableTableInfo->RegisterSplitMergeOp(OperationId, op); context.SS->CreateTx(OperationId, TTxState::TxSplitTablePartition, path->PathId) = op; context.OnComplete.ActivateTx(OperationId); diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_upgrade_subdomain.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_upgrade_subdomain.cpp index 4d1b2182c84..01d421e0968 100644 --- a/ydb/core/tx/schemeshard/schemeshard__operation_upgrade_subdomain.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__operation_upgrade_subdomain.cpp @@ -42,14 +42,14 @@ public: bool isDone = true; // wait all transaction inside - auto pathes = context.SS->ListSubTree(txState->TargetPathId, context.Ctx); - auto relatedTx = context.SS->GetRelatedTransactions(pathes, context.Ctx); + auto paths = context.SS->ListSubTree(txState->TargetPathId, context.Ctx); + auto relatedTx = context.SS->GetRelatedTransactions(paths, context.Ctx); for (auto otherTxId: relatedTx) { if (otherTxId == OperationId.GetTxId()) { continue; } TStringBuilder errMsg; - errMsg << "TWait ProgressState, dependence has found, but actually it is unexepcted" + errMsg << "TWait ProgressState, dependence has found, but actually it is unexpected" << ", dependent transaction: " << OperationId.GetTxId() << ", parent transaction: " << otherTxId << ", at schemeshard: " << ssId; @@ -84,7 +84,7 @@ private: TOperationId OperationId; TTabletId TenantSchemeShardId = InvalidTabletId; - THashSet<TPathId> PathesInside; + THashSet<TPathId> PathsInside; TString DebugHint() const override { return TStringBuilder() @@ -140,7 +140,7 @@ public: << " at schemeshard: " << ssId); context.OnComplete.UnbindMsgFromPipe(OperationId, TenantSchemeShardId, pathId); - PathesInside.erase(pathId); + PathsInside.erase(pathId); auto next = NextMessage(context); if (!next) { @@ -286,11 +286,11 @@ public: } THolder<TEvSchemeShard::TEvMigrateSchemeShard> NextMessage(TOperationContext& context) { - if (!PathesInside) { + if (!PathsInside) { return nullptr; } - TPathId pathId = *PathesInside.begin(); + TPathId pathId = *PathsInside.begin(); TPath path = TPath::Init(pathId, context.SS); @@ -308,7 +308,7 @@ public: break; case NKikimrSchemeOp::EPathType::EPathTypeSubDomain: case NKikimrSchemeOp::EPathType::EPathTypeExtSubDomain: - Y_FAIL("imposible to migrate subDomain or extSubDomain as part of the other subDomain"); + Y_FAIL("impossible to migrate subDomain or extSubDomain as part of the other subDomain"); break; case NKikimrSchemeOp::EPathType::EPathTypeTable: { @@ -375,7 +375,7 @@ public: TPathId pathId = ev->Get()->GetPathId(); context.OnComplete.UnbindMsgFromPipe(OperationId, TenantSchemeShardId, pathId); - PathesInside.erase(pathId); + PathsInside.erase(pathId); auto next = NextMessage(context); if (!next) { @@ -429,7 +429,7 @@ public: shard.Operation = TTxState::ConfigureParts; TenantSchemeShardId = TTabletId(processing.GetSchemeShard()); - PathesInside = context.SS->ListSubTree(path.Base()->PathId, context.Ctx); + PathsInside = context.SS->ListSubTree(path.Base()->PathId, context.Ctx); LOG_DEBUG_S(context.Ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, DebugHint() @@ -518,7 +518,7 @@ private: TOperationId OperationId; TTxState::ETxState& UpgradeDecision; - TPathElement::TChildrenCont HidenChildren; + TPathElement::TChildrenCont HiddenChildren; TString DebugHint() const override { return TStringBuilder() @@ -549,7 +549,7 @@ public: TPathId pathId = txState->TargetPathId; auto path = context.SS->PathsById.at(pathId); - path->SwapChildren(HidenChildren); //return back children, now we do not pretend that there no children, we define them as Migrated + path->SwapChildren(HiddenChildren); //return back children, now we do not pretend that there no children, we define them as Migrated auto pathsInside = context.SS->ListSubTree(pathId, context.Ctx); pathsInside.erase(pathId); for (auto pId: pathsInside) { @@ -594,7 +594,7 @@ public: Y_VERIFY(item->PathType == TPathElement::EPathType::EPathTypeExtSubDomain); item->PathType = TPathElement::EPathType::EPathTypeSubDomain; - item->SwapChildren(HidenChildren); //return back children + item->SwapChildren(HiddenChildren); //return back children item->PreSerializedChildrenListing.clear(); auto subDomain = context.SS->SubDomains.at(pathId); @@ -605,7 +605,7 @@ public: subDomain->ActualizeAlterData(context.SS->ShardInfos, context.Ctx.Now(), /* isExternal */ false, context.SS); context.SS->RevertedMigrations[pathId].push_back(subDomain->GetTenantSchemeShardID()); - context.SS->PersistRevertedMirgration(db, pathId, subDomain->GetTenantSchemeShardID()); + context.SS->PersistRevertedMigration(db, pathId, subDomain->GetTenantSchemeShardID()); alterData->SetAlterPrivate(nullptr); subDomain->SetAlterPrivate(nullptr); @@ -666,7 +666,7 @@ public: subDomain->SetAlterPrivate(nullptr); context.SS->SubDomains[pathId] = alterData; - item->SwapChildren(HidenChildren); + item->SwapChildren(HiddenChildren); item->PreSerializedChildrenListing.clear(); TPathElement::TPtr parentItem = context.SS->PathsById.at(item->ParentPathId); @@ -717,9 +717,9 @@ public: Y_VERIFY(txState); Y_VERIFY(txState->Shards.size() == 1); - TShardIdx tenantShemeShardIdx = txState->Shards.front().Idx; + TShardIdx tenantSchemeShardIdx = txState->Shards.front().Idx; - context.OnComplete.DeleteShard(tenantShemeShardIdx); + context.OnComplete.DeleteShard(tenantSchemeShardIdx); TPathId pathId = txState->TargetPathId; auto subDomain = context.SS->SubDomains.at(pathId); @@ -831,9 +831,9 @@ public: TenantSchemeShardId = subDomain->GetTenantSchemeShardID(); Y_VERIFY(TenantSchemeShardId); - auto pathesInside = context.SS->ListSubTree(targetPathId, context.Ctx); - pathesInside.erase(targetPathId); - for (auto pId: pathesInside) { + auto pathsInside = context.SS->ListSubTree(targetPathId, context.Ctx); + pathsInside.erase(targetPathId); + for (auto pId: pathsInside) { TPathElement::TPtr item = context.SS->PathsById.at(pId); switch (item->PathType) { @@ -858,7 +858,7 @@ public: // no shards break; case NKikimrSchemeOp::EPathType::EPathTypeKesus: - // the is one shard, but it's owner shuldn't be rewritten + // the is one shard, but it's owner shouldn't be rewritten break; default: Y_FAIL_S("Not implemented for " << NKikimrSchemeOp::EPathType_Name(item->PathType)); @@ -947,9 +947,9 @@ class TDoneMigrateTree: public TSubOperationState { private: TOperationId OperationId; - //we do not forget any shards. We leave them until database life. And we ensure it deleted at the removing databse + //we do not forget any shards. We leave them until database life. And we ensure it deleted at the removing database //but hang up them to the domain path - TDeque<TShardIdx> ShardsToRememder; + TDeque<TShardIdx> ShardsToRemember; bool IsInited = false; @@ -977,11 +977,11 @@ public: } IsInited = true; - auto pathes = context.SS->ListSubTree(pathId, context.Ctx); - pathes.erase(pathId); + auto paths = context.SS->ListSubTree(pathId, context.Ctx); + paths.erase(pathId); - auto shards = context.SS->CollectAllShards(pathes); - ShardsToRememder.assign(shards.begin(), shards.end()); + auto shards = context.SS->CollectAllShards(paths); + ShardsToRemember.assign(shards.begin(), shards.end()); } bool ProgressState(TOperationContext& context) override { @@ -998,8 +998,8 @@ public: NIceDb::TNiceDb db(context.GetDB()); - if (!ShardsToRememder.empty()) { - const auto shardIdx = ShardsToRememder.back(); + if (!ShardsToRemember.empty()) { + const auto shardIdx = ShardsToRemember.back(); TShardInfo& shardInfo = context.SS->ShardInfos.at(shardIdx); context.SS->IncrementPathDbRefCount(txState->TargetPathId); @@ -1019,7 +1019,7 @@ public: domainInfo->AddPrivateShard(shardIdx); - ShardsToRememder.pop_back(); + ShardsToRemember.pop_back(); context.OnComplete.ActivateTx(OperationId); return false; @@ -1151,7 +1151,7 @@ public: Y_VERIFY(context.SS->SubDomains.contains(pathId)); TSubDomainInfo::TPtr subDomain = context.SS->SubDomains.at(pathId); if (!subDomain->IsSupportTransactions()) { - result->SetError(NKikimrScheme::StatusSchemeError, "There are no sence to upgrade subdomain with out transactions support (NBS?)."); + result->SetError(NKikimrScheme::StatusSchemeError, "There are no sense to upgrade subdomain with out transactions support (NBS?)."); return result; } @@ -1161,32 +1161,32 @@ public: return result; } - const THashSet<TPathElement::EPathType> allowedPathesToUpgrade = { + const THashSet<TPathElement::EPathType> allowedPathsToUpgrade = { TPathElement::EPathType::EPathTypeDir, TPathElement::EPathType::EPathTypeTable, TPathElement::EPathType::EPathTypeTableIndex, TPathElement::EPathType::EPathTypeKesus }; - auto pathesInside = context.SS->ListSubTree(pathId, context.Ctx); - for (auto pId: pathesInside) { + auto pathsInside = context.SS->ListSubTree(pathId, context.Ctx); + for (auto pId: pathsInside) { if (pId == pathId) { continue; } auto pElem = context.SS->PathsById.at(pId); - if (allowedPathesToUpgrade.contains(pElem->PathType)) { + if (allowedPathsToUpgrade.contains(pElem->PathType)) { continue; } TString msg = TStringBuilder() << "Unable to upgrade subdomain" - << ", path type " << NKikimrSchemeOp::EPathType_Name(pElem->PathType) << " is forbiden to migrate" + << ", path type " << NKikimrSchemeOp::EPathType_Name(pElem->PathType) << " is forbidden to migrate" << ", pathId: " << pId; result->SetError(NKikimrScheme::StatusPreconditionFailed, msg); return result; } - for (auto pId: pathesInside) { + for (auto pId: pathsInside) { if (!context.SS->LockedPaths.contains(pId)) { continue; } @@ -1232,7 +1232,7 @@ public: context.SS->PersistSubDomainAlter(db, pathId, *alterData); // wait all transaction inside - auto relatedTx = context.SS->GetRelatedTransactions(pathesInside, context.Ctx); + auto relatedTx = context.SS->GetRelatedTransactions(pathsInside, context.Ctx); for (auto otherTxId: relatedTx) { if (otherTxId == OperationId.GetTxId()) { continue; diff --git a/ydb/core/tx/schemeshard/schemeshard__publish_to_scheme_board.cpp b/ydb/core/tx/schemeshard/schemeshard__publish_to_scheme_board.cpp index cb9a270d256..4824e22297b 100644 --- a/ydb/core/tx/schemeshard/schemeshard__publish_to_scheme_board.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__publish_to_scheme_board.cpp @@ -110,7 +110,7 @@ struct TSchemeShard::TTxAckPublishToSchemeBoard: public TTransactionBase<TScheme && operation->IsReadyToNotify(ctx)) { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxAckPublishToSchemeBoard" - << ", operation is ready to notificate" + << ", operation is ready to notify" << ", at schemeshard: " << Self->TabletID() << ", txId: " << txId); @@ -121,7 +121,7 @@ struct TSchemeShard::TTxAckPublishToSchemeBoard: public TTransactionBase<TScheme for (auto opId: toActivateWaitPublication) { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxAckPublishToSchemeBoard" - << ", operation is ready to ack that some awaited pathed is published" + << ", operation is ready to ack that some awaited paths are published" << ", opId: " << opId << ", left await publications: " << operation->CountWaitPublication(opId) << ", at schemeshard: " << Self->TabletID() diff --git a/ydb/core/tx/schemeshard/schemeshard__serverless_storage_billing.cpp b/ydb/core/tx/schemeshard/schemeshard__serverless_storage_billing.cpp index fdb4593a73e..4ee18f4995c 100644 --- a/ydb/core/tx/schemeshard/schemeshard__serverless_storage_billing.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__serverless_storage_billing.cpp @@ -69,7 +69,7 @@ struct TSchemeShard::TTxServerlessStorageBilling : public TTransactionBase<TSche if (!cloud_id || !folder_id || !database_id) { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, - "TTxServerlessStorageBilling: unable to make a bill, neither cloud_id and nor folder_id nor database_id have found in user attrubutes at the domain" + "TTxServerlessStorageBilling: unable to make a bill, neither cloud_id and nor folder_id nor database_id have found in user attributes at the domain" << ", schemeshardId: " << Self->SelfTabletId() << ", domainId: " << Self->ParentDomainId << ", next retry at: " << TimeToNextBill); diff --git a/ydb/core/tx/schemeshard/schemeshard__table_stats_histogram.cpp b/ydb/core/tx/schemeshard/schemeshard__table_stats_histogram.cpp index 547c69180a0..498d65a3f34 100644 --- a/ydb/core/tx/schemeshard/schemeshard__table_stats_histogram.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__table_stats_histogram.cpp @@ -57,7 +57,7 @@ TSerializedCellVec ChooseSplitKeyByHistogram(const NKikimrTableStats::THistogram } else { // med == lo and med != hi, so we want to find a value that is > med and <= hi if (IsIntegerType(columnType) && !keyMed.GetCells()[i].IsNull()) { - // For interger types we can add 1 to med + // For integer types we can add 1 to med ui64 val = 0; size_t sz = keyMed.GetCells()[i].Size(); memcpy(&val, keyMed.GetCells()[i].Data(), sz); @@ -235,7 +235,7 @@ void TSchemeShard::Handle(TEvDataShard::TEvGetTableStatsResult::TPtr& ev, const ui64 rowCount = rec.GetTableStats().GetRowCount(); LOG_DEBUG_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, - "Got partition histogran at tablet " << TabletID() + "Got partition histogram at tablet " << TabletID() <<" from datashard " << datashardId << " state: '" << DatashardStateName(rec.GetShardState()) << "'" << " data size: " << dataSize @@ -288,7 +288,7 @@ bool TTxPartitionHistogram::Execute(TTransactionContext& txc, const TActorContex ui64 rowCount = rec.GetTableStats().GetRowCount(); LOG_INFO_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, - "TTxPartitionHistogram::Execute partition histogran" + "TTxPartitionHistogram::Execute partition histogram" << " at tablet " << Self->SelfTabletId() << " from datashard " << datashardId << " for pathId " << tableId diff --git a/ydb/core/tx/schemeshard/schemeshard__upgrade_access_database.cpp b/ydb/core/tx/schemeshard/schemeshard__upgrade_access_database.cpp index 4864dc9db36..df118eb4bb5 100644 --- a/ydb/core/tx/schemeshard/schemeshard__upgrade_access_database.cpp +++ b/ydb/core/tx/schemeshard/schemeshard__upgrade_access_database.cpp @@ -75,7 +75,7 @@ struct TSchemeShard::TTxUpgradeAccessDatabaseRights : public TTransactionBase<TS bool Execute(TTransactionContext &txc, const TActorContext &ctx) override { LOG_DEBUG_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxUpgradeSchema.Execute"); - if (!Self->IsShemeShardConfigured()) { + if (!Self->IsSchemeShardConfigured()) { return true; } diff --git a/ydb/core/tx/schemeshard/schemeshard_audit_log_fragment.cpp b/ydb/core/tx/schemeshard/schemeshard_audit_log_fragment.cpp index 4fcee4ff11b..18d6ca8e6aa 100644 --- a/ydb/core/tx/schemeshard/schemeshard_audit_log_fragment.cpp +++ b/ydb/core/tx/schemeshard/schemeshard_audit_log_fragment.cpp @@ -194,7 +194,7 @@ TAuditLogFragment::TAuditLogFragment(const NKikimrSchemeOp::TModifyScheme& tx) : Operation(DefineUserOperationName(tx.GetOperationType())) , ProtoRequest(tx.ShortDebugString()) { - FillPathes(tx); + FillPaths(tx); FillACL(tx); } @@ -223,7 +223,7 @@ void TAuditLogFragment::FillACL(const NKikimrSchemeOp::TModifyScheme& tx) { } } -void TAuditLogFragment::FillPathes(const NKikimrSchemeOp::TModifyScheme& tx) { +void TAuditLogFragment::FillPaths(const NKikimrSchemeOp::TModifyScheme& tx) { switch (tx.GetOperationType()) { case NKikimrSchemeOp::EOperationType::ESchemeOpMkDir: Path = JoinPath({tx.GetWorkingDir(), tx.GetMkDir().GetName()}); diff --git a/ydb/core/tx/schemeshard/schemeshard_audit_log_fragment.h b/ydb/core/tx/schemeshard/schemeshard_audit_log_fragment.h index 1814b696924..16b1832e141 100644 --- a/ydb/core/tx/schemeshard/schemeshard_audit_log_fragment.h +++ b/ydb/core/tx/schemeshard/schemeshard_audit_log_fragment.h @@ -23,7 +23,7 @@ struct TAuditLogFragment { TAuditLogFragment(const NKikimrSchemeOp::TModifyScheme& tx); void FillACL(const NKikimrSchemeOp::TModifyScheme& tx); - void FillPathes(const NKikimrSchemeOp::TModifyScheme& tx); + void FillPaths(const NKikimrSchemeOp::TModifyScheme& tx); TString GetAnyPath() const; TString GetOperation() const; diff --git a/ydb/core/tx/schemeshard/schemeshard_build_index__cancel.cpp b/ydb/core/tx/schemeshard/schemeshard_build_index__cancel.cpp index 64f6af6b41a..3db9c444837 100644 --- a/ydb/core/tx/schemeshard/schemeshard_build_index__cancel.cpp +++ b/ydb/core/tx/schemeshard/schemeshard_build_index__cancel.cpp @@ -53,7 +53,7 @@ public: return Reply( std::move(response), Ydb::StatusIds::NOT_FOUND, - TStringBuilder() << "Index build prcess with id <" << indexBuildId << "> not found" + TStringBuilder() << "Index build process with id <" << indexBuildId << "> not found" ); } @@ -62,7 +62,7 @@ public: return Reply( std::move(response), Ydb::StatusIds::NOT_FOUND, - TStringBuilder() << "Index build prcess with id <" << indexBuildId << "> not found in database <" << record.GetDatabaseName() << ">" + TStringBuilder() << "Index build process with id <" << indexBuildId << "> not found in database <" << record.GetDatabaseName() << ">" ); } @@ -70,7 +70,7 @@ public: return Reply( std::move(response), Ydb::StatusIds::PRECONDITION_FAILED, - TStringBuilder() << "Index build prcess with id <" << indexBuildId << "> has been finished already" + TStringBuilder() << "Index build process with id <" << indexBuildId << "> has been finished already" ); } @@ -78,7 +78,7 @@ public: return Reply( std::move(response), Ydb::StatusIds::PRECONDITION_FAILED, - TStringBuilder() << "Index build prcess with id <" << indexBuildId << "> canceling already" + TStringBuilder() << "Index build process with id <" << indexBuildId << "> canceling already" ); } @@ -86,7 +86,7 @@ public: return Reply( std::move(response), Ydb::StatusIds::PRECONDITION_FAILED, - TStringBuilder() << "Index build prcess with id <" << indexBuildId << "> are almost done, cancellation has no sense" + TStringBuilder() << "Index build process with id <" << indexBuildId << "> are almost done, cancellation has no sense" ); } diff --git a/ydb/core/tx/schemeshard/schemeshard_build_index__forget.cpp b/ydb/core/tx/schemeshard/schemeshard_build_index__forget.cpp index b6ec902e85b..1d77fb728a6 100644 --- a/ydb/core/tx/schemeshard/schemeshard_build_index__forget.cpp +++ b/ydb/core/tx/schemeshard/schemeshard_build_index__forget.cpp @@ -52,7 +52,7 @@ public: return Reply( std::move(response), Ydb::StatusIds::NOT_FOUND, - TStringBuilder() << "Index build prcess with id <" << indexBuildId << "> not found" + TStringBuilder() << "Index build process with id <" << indexBuildId << "> not found" ); } @@ -61,7 +61,7 @@ public: return Reply( std::move(response), Ydb::StatusIds::NOT_FOUND, - TStringBuilder() << "Index build prcess with id <" << indexBuildId << "> not found in database <" << record.GetDatabaseName() << ">" + TStringBuilder() << "Index build process with id <" << indexBuildId << "> not found in database <" << record.GetDatabaseName() << ">" ); } @@ -69,7 +69,7 @@ public: return Reply( std::move(response), Ydb::StatusIds::PRECONDITION_FAILED, - TStringBuilder() << "Index build prcess with id <" << indexBuildId << "> hasn't been finished yet" + TStringBuilder() << "Index build process with id <" << indexBuildId << "> hasn't been finished yet" ); } diff --git a/ydb/core/tx/schemeshard/schemeshard_build_index__get.cpp b/ydb/core/tx/schemeshard/schemeshard_build_index__get.cpp index d0657e40c93..f6292fc85db 100644 --- a/ydb/core/tx/schemeshard/schemeshard_build_index__get.cpp +++ b/ydb/core/tx/schemeshard/schemeshard_build_index__get.cpp @@ -52,7 +52,7 @@ public: return Reply( std::move(response), Ydb::StatusIds::PRECONDITION_FAILED, - TStringBuilder() << "Index build prcess with id <" << indexBuildId << "> not found" + TStringBuilder() << "Index build process with id <" << indexBuildId << "> not found" ); } @@ -61,7 +61,7 @@ public: return Reply( std::move(response), Ydb::StatusIds::BAD_REQUEST, - TStringBuilder() << "Index build prcess with id <" << indexBuildId << "> not found in database <" << record.GetDatabaseName() << ">" + TStringBuilder() << "Index build process with id <" << indexBuildId << "> not found in database <" << record.GetDatabaseName() << ">" ); } diff --git a/ydb/core/tx/schemeshard/schemeshard_build_index__progress.cpp b/ydb/core/tx/schemeshard/schemeshard_build_index__progress.cpp index 2334a721df7..b58d3a500fa 100644 --- a/ydb/core/tx/schemeshard/schemeshard_build_index__progress.cpp +++ b/ydb/core/tx/schemeshard/schemeshard_build_index__progress.cpp @@ -229,8 +229,8 @@ public: } if (!buildInfo->SnapshotTxId || !buildInfo->SnapshotStep) { - Y_VERIFY(Self->TablesWithSnaphots.contains(buildInfo->TablePathId)); - Y_VERIFY(Self->TablesWithSnaphots.at(buildInfo->TablePathId) == buildInfo->InitiateTxId); + Y_VERIFY(Self->TablesWithSnapshots.contains(buildInfo->TablePathId)); + Y_VERIFY(Self->TablesWithSnapshots.at(buildInfo->TablePathId) == buildInfo->InitiateTxId); buildInfo->SnapshotTxId = buildInfo->InitiateTxId; Y_VERIFY(buildInfo->SnapshotTxId); @@ -242,8 +242,8 @@ public: TPath implTable = TPath::Init(buildInfo->TablePathId, Self).Dive(buildInfo->IndexName).Dive("indexImplTable"); buildInfo->ImplTablePath = implTable.PathString(); - TTableInfo::TPtr imptTableInfo = Self->Tables.at(implTable.Base()->PathId); - buildInfo->ImplTableColumns = NTableIndex::ExtractInfo(imptTableInfo); + TTableInfo::TPtr implTableInfo = Self->Tables.at(implTable.Base()->PathId); + buildInfo->ImplTableColumns = NTableIndex::ExtractInfo(implTableInfo); } while (!buildInfo->ToUploadShards.empty() @@ -595,7 +595,7 @@ public: case TIndexBuildInfo::EState::Rejection_Unlocking: case TIndexBuildInfo::EState::Rejected: LOG_D("TTxReply : PipeRetry" - << " superflous event" + << " superfluous event" << ", buildIndexId# " << buildId << ", tabletId# " << tabletId << ", shardIdx# " << shardIdx); @@ -732,7 +732,7 @@ public: case NKikimrTxDataShard::TEvBuildIndexProgressResponse::BUILD_ERROR: buildInfo->Issue += TStringBuilder() - << "One of the shards report BUILD_ERROR at Filling stage, procces has to be canceled" + << "One of the shards report BUILD_ERROR at Filling stage, process has to be canceled" << ", shardId: " << shardId << ", shardIdx: " << shardIdx; Self->PersistBuildIndexIssue(db, buildInfo); @@ -742,7 +742,7 @@ public: break; case NKikimrTxDataShard::TEvBuildIndexProgressResponse::BAD_REQUEST: buildInfo->Issue += TStringBuilder() - << "One of the shards report BAD_REQUEST at Filling stage, procces has to be canceled" + << "One of the shards report BAD_REQUEST at Filling stage, process has to be canceled" << ", shardId: " << shardId << ", shardIdx: " << shardIdx; Self->PersistBuildIndexIssue(db, buildInfo); @@ -765,7 +765,7 @@ public: case TIndexBuildInfo::EState::Rejection_Unlocking: case TIndexBuildInfo::EState::Rejected: LOG_D("TTxReply : TEvBuildIndexProgressResponse" - << " superflous message " << record.ShortDebugString()); + << " superfluous message " << record.ShortDebugString()); break; } @@ -777,7 +777,7 @@ public: const auto txId = TTxId(record.GetTxId()); if (!Self->TxIdToIndexBuilds.contains(txId)) { - LOG_I("TTxReply : TEvNotifyTxCompletionResult superflous message" + LOG_I("TTxReply : TEvNotifyTxCompletionResult superfluous message" << ", txId: " << record.GetTxId() << ", buildInfoId not found"); return true; @@ -926,7 +926,7 @@ public: const auto txId = TTxId(record.GetTxId()); if (!Self->TxIdToIndexBuilds.contains(txId)) { - LOG_I("TTxReply : TEvModifySchemeTransactionResult superflous message" + LOG_I("TTxReply : TEvModifySchemeTransactionResult superfluous message" << ", cookie: " << ModifyResult->Cookie << ", txId: " << record.GetTxId() << ", status: " << NKikimrScheme::EStatus_Name(record.GetStatus()) @@ -1074,7 +1074,7 @@ public: // no op } else { buildInfo->Issue += TStringBuilder() - << "At cancelation applying state got unsuccess propose result" + << "At cancellation applying state got unsuccess propose result" << ", status: " << NKikimrScheme::EStatus_Name(buildInfo->InitiateTxStatus) << ", reason: " << record.GetReason(); Self->PersistBuildIndexIssue(db, buildInfo); @@ -1097,7 +1097,7 @@ public: // no op } else { buildInfo->Issue += TStringBuilder() - << "At cancelation unlocking state got unsuccess propose result" + << "At cancellation unlocking state got unsuccess propose result" << ", status: " << NKikimrScheme::EStatus_Name(buildInfo->InitiateTxStatus) << ", reason: " << record.GetReason(); Self->PersistBuildIndexIssue(db, buildInfo); @@ -1147,7 +1147,7 @@ public: // no op } else { buildInfo->Issue += TStringBuilder() - << "At rejection_unlockiing state got unsuccess propose result" + << "At rejection_unlocking state got unsuccess propose result" << ", status: " << NKikimrScheme::EStatus_Name(buildInfo->InitiateTxStatus) << ", reason: " << record.GetReason(); Self->PersistBuildIndexIssue(db, buildInfo); diff --git a/ydb/core/tx/schemeshard/schemeshard_build_index_tx_base.h b/ydb/core/tx/schemeshard/schemeshard_build_index_tx_base.h index f2e4d9e56bd..e9f4adb5745 100644 --- a/ydb/core/tx/schemeshard/schemeshard_build_index_tx_base.h +++ b/ydb/core/tx/schemeshard/schemeshard_build_index_tx_base.h @@ -46,7 +46,7 @@ private: ApplyBill(txc, ctx); } - void ApplyOnComlete(const TActorContext& ctx) { + void ApplyOnComplete(const TActorContext& ctx) { SideEffects.ApplyOnComplete(Self, ctx); ApplySchedule(ctx); } @@ -125,7 +125,7 @@ private: } if (!cloud_id || !folder_id || !database_id) { - LOG_N("ApplyBill: unable to make a bill, neither cloud_id and nor folder_id nor database_id have found in user attrubutes at the domain" + LOG_N("ApplyBill: unable to make a bill, neither cloud_id and nor folder_id nor database_id have found in user attributes at the domain" << ", build index operation: " << buildId << ", domain: " << domain.PathString() << ", domainId: " << buildInfo->DomainPathId @@ -359,7 +359,7 @@ protected: case NKikimrScheme::StatusTxIsNotCancellable: case NKikimrScheme::StatusReserved18: case NKikimrScheme::StatusReserved19: - Y_FAIL("unreadchable"); + Y_FAIL("unreachable"); } return Ydb::StatusIds::STATUS_CODE_UNSPECIFIED; @@ -420,7 +420,7 @@ public: void Complete(const TActorContext& ctx) override { DoComplete(ctx); - ApplyOnComlete(ctx); + ApplyOnComplete(ctx); } }; diff --git a/ydb/core/tx/schemeshard/schemeshard_effective_acl.cpp b/ydb/core/tx/schemeshard/schemeshard_effective_acl.cpp index 40f06183d9c..7eca1c1619c 100644 --- a/ydb/core/tx/schemeshard/schemeshard_effective_acl.cpp +++ b/ydb/core/tx/schemeshard/schemeshard_effective_acl.cpp @@ -14,7 +14,7 @@ void TEffectiveACL::Init(const TString &effectiveACL) // InheritOnly is not filtered from self effective. // Record with InheritOnly doesn't counted at CheckAccess // InheritOnly flag is eliminated on inheriting - // so here is enough to copy acl withount filtering InheritOnly flags + // so here is enough to copy acl without filtering InheritOnly flags ForSelf = effectiveACL; } diff --git a/ydb/core/tx/schemeshard/schemeshard_impl.cpp b/ydb/core/tx/schemeshard/schemeshard_impl.cpp index 9effda381a4..08bb94357d5 100644 --- a/ydb/core/tx/schemeshard/schemeshard_impl.cpp +++ b/ydb/core/tx/schemeshard/schemeshard_impl.cpp @@ -187,7 +187,7 @@ struct TAttachOrder { decision = EAttachChildResult::AttachedAsCreatedActual; return true; } else { - decision = EAttachChildResult::RejectAsInactve; + decision = EAttachChildResult::RejectAsInactive; return false; } } else { @@ -290,7 +290,7 @@ bool TSchemeShard::PathIsActive(TPathId pathId) const { TPathElement::TPtr parent = PathsById.at(path->ParentPathId); if (parent->IsExternalSubDomainRoot() && parent->PathState == NKikimrSchemeOp::EPathState::EPathStateUpgrade) { - // Children list is empty during TPublishGlobal stage as part of upgrage subdomain + // Children list is empty during TPublishGlobal stage as part of upgrade subdomain return true; } @@ -1056,12 +1056,12 @@ TPathId TSchemeShard::GetDomainKey(TPathId pathId) const { return GetDomainKey(PathsById.at(pathId)); } -const NKikimrSubDomains::TProcessingParams &TSchemeShard::SelectProcessingPrarams(TPathId id) const { +const NKikimrSubDomains::TProcessingParams &TSchemeShard::SelectProcessingParams(TPathId id) const { TPathElement::TPtr item = PathsById.at(id); - return SelectProcessingPrarams(item); + return SelectProcessingParams(item); } -const NKikimrSubDomains::TProcessingParams &TSchemeShard::SelectProcessingPrarams(TPathElement::TPtr pathEl) const { +const NKikimrSubDomains::TProcessingParams &TSchemeShard::SelectProcessingParams(TPathElement::TPtr pathEl) const { Y_VERIFY(pathEl.Get()); auto subDomainInfo = ResolveDomainInfo(pathEl); @@ -1129,7 +1129,7 @@ bool TSchemeShard::CheckApplyIf(const NKikimrSchemeOp::TModifyScheme &scheme, TS if (requiredVersion != actualVersion) { errStr = TStringBuilder() << "fail user constraint in ApplyIf section:" - << " path version mistmach, path with id " << pathEl->PathId + << " path version mismatch, path with id " << pathEl->PathId << " has actual version " << actualVersion << " but version " << requiredVersion << " was required"; return false; @@ -1224,8 +1224,8 @@ bool TSchemeShard::CheckInFlightLimit(NKikimrSchemeOp::EOperationType opType, TS } bool TSchemeShard::CanCreateSnapshot(const TPathId& tablePathId, TTxId txId, NKikimrScheme::EStatus& status, TString& errStr) const { - auto it = TablesWithSnaphots.find(tablePathId); - if (it == TablesWithSnaphots.end()) { + auto it = TablesWithSnapshots.find(tablePathId); + if (it == TablesWithSnapshots.end()) { return true; } @@ -1467,7 +1467,7 @@ void TSchemeShard::BumpIncompatibleChanges(NIceDb::TNiceDb& db, ui64 incompatibl ", but maximum supported change is " << Schema::MaxIncompatibleChangeSupported); // We add a special path on the first incompatible change, which breaks // all versions that don't know about incompatible changes. Newer - // versions will just skip this non-sensical entry. + // versions will just skip this non-sensible entry. if (MaxIncompatibleChange == 0) { db.Table<Schema::Paths>().Key(0).Update( NIceDb::TUpdate<Schema::Paths::ParentId>(0), @@ -1519,29 +1519,29 @@ void TSchemeShard::PersistTableIndex(NIceDb::TNiceDb& db, const TPathId& pathId) void TSchemeShard::PersistTableIndexAlterData(NIceDb::TNiceDb& db, const TPathId& pathId) { Y_VERIFY(PathsById.contains(pathId)); - TPathElement::TPtr elemnt = PathsById.at(pathId); + TPathElement::TPtr elem = PathsById.at(pathId); Y_VERIFY(Indexes.contains(pathId)); TTableIndexInfo::TPtr index = Indexes.at(pathId); Y_VERIFY(IsLocalId(pathId)); - Y_VERIFY(elemnt->IsTableIndex()); + Y_VERIFY(elem->IsTableIndex()); TTableIndexInfo::TPtr alterData = index->AlterData; Y_VERIFY(alterData); - db.Table<Schema::TableIndexAlterData>().Key(elemnt->PathId.LocalPathId).Update( + db.Table<Schema::TableIndexAlterData>().Key(elem->PathId.LocalPathId).Update( NIceDb::TUpdate<Schema::TableIndexAlterData::AlterVersion>(alterData->AlterVersion), NIceDb::TUpdate<Schema::TableIndexAlterData::IndexType>(alterData->Type), NIceDb::TUpdate<Schema::TableIndexAlterData::State>(alterData->State)); for (ui32 keyIdx = 0; keyIdx < alterData->IndexKeys.size(); ++keyIdx) { - db.Table<Schema::TableIndexKeysAlterData>().Key(elemnt->PathId.LocalPathId, keyIdx).Update( + db.Table<Schema::TableIndexKeysAlterData>().Key(elem->PathId.LocalPathId, keyIdx).Update( NIceDb::TUpdate<Schema::TableIndexKeysAlterData::KeyName>(alterData->IndexKeys[keyIdx])); } for (ui32 dataColIdx = 0; dataColIdx < alterData->IndexDataColumns.size(); ++dataColIdx) { - db.Table<Schema::TableIndexDataColumnsAlterData>().Key(elemnt->PathId.OwnerId, elemnt->PathId.LocalPathId, dataColIdx).Update( + db.Table<Schema::TableIndexDataColumnsAlterData>().Key(elem->PathId.OwnerId, elem->PathId.LocalPathId, dataColIdx).Update( NIceDb::TUpdate<Schema::TableIndexDataColumnsAlterData::DataColumnName>(alterData->IndexDataColumns[dataColIdx])); } } @@ -1666,7 +1666,7 @@ void TSchemeShard::PersistUserAttributes(NIceDb::TNiceDb& db, TPathId pathId, db.Table<Schema::MigratedUserAttributes>().Key(pathId.OwnerId, pathId.LocalPathId, name).Delete(); } } - //aply new version and clear UserAttributesAlterData + //apply new version and clear UserAttributesAlterData if (!alterAttrs) { return; } @@ -1709,40 +1709,40 @@ void TSchemeShard::PersistLastTxId(NIceDb::TNiceDb& db, const TPathElement::TPtr void TSchemeShard::PersistPath(NIceDb::TNiceDb& db, const TPathId& pathId) { Y_VERIFY(PathsById.contains(pathId)); - TPathElement::TPtr elemnt = PathsById.at(pathId); + TPathElement::TPtr elem = PathsById.at(pathId); if (IsLocalId(pathId)) { db.Table<Schema::Paths>().Key(pathId.LocalPathId).Update( - NIceDb::TUpdate<Schema::Paths::ParentOwnerId>(elemnt->ParentPathId.OwnerId), - NIceDb::TUpdate<Schema::Paths::ParentId>(elemnt->ParentPathId.LocalPathId), - NIceDb::TUpdate<Schema::Paths::Name>(elemnt->Name), - NIceDb::TUpdate<Schema::Paths::PathType>(elemnt->PathType), - NIceDb::TUpdate<Schema::Paths::StepCreated>(elemnt->StepCreated), - NIceDb::TUpdate<Schema::Paths::CreateTxId>(elemnt->CreateTxId), - NIceDb::TUpdate<Schema::Paths::StepDropped>(elemnt->StepDropped), - NIceDb::TUpdate<Schema::Paths::DropTxId>(elemnt->DropTxId), - NIceDb::TUpdate<Schema::Paths::Owner>(elemnt->Owner), - NIceDb::TUpdate<Schema::Paths::ACL>(elemnt->ACL), - NIceDb::TUpdate<Schema::Paths::LastTxId>(elemnt->LastTxId), - NIceDb::TUpdate<Schema::Paths::DirAlterVersion>(elemnt->DirAlterVersion), - NIceDb::TUpdate<Schema::Paths::UserAttrsAlterVersion>(elemnt->UserAttrs->AlterVersion), - NIceDb::TUpdate<Schema::Paths::ACLVersion>(elemnt->ACLVersion) + NIceDb::TUpdate<Schema::Paths::ParentOwnerId>(elem->ParentPathId.OwnerId), + NIceDb::TUpdate<Schema::Paths::ParentId>(elem->ParentPathId.LocalPathId), + NIceDb::TUpdate<Schema::Paths::Name>(elem->Name), + NIceDb::TUpdate<Schema::Paths::PathType>(elem->PathType), + NIceDb::TUpdate<Schema::Paths::StepCreated>(elem->StepCreated), + NIceDb::TUpdate<Schema::Paths::CreateTxId>(elem->CreateTxId), + NIceDb::TUpdate<Schema::Paths::StepDropped>(elem->StepDropped), + NIceDb::TUpdate<Schema::Paths::DropTxId>(elem->DropTxId), + NIceDb::TUpdate<Schema::Paths::Owner>(elem->Owner), + NIceDb::TUpdate<Schema::Paths::ACL>(elem->ACL), + NIceDb::TUpdate<Schema::Paths::LastTxId>(elem->LastTxId), + NIceDb::TUpdate<Schema::Paths::DirAlterVersion>(elem->DirAlterVersion), + NIceDb::TUpdate<Schema::Paths::UserAttrsAlterVersion>(elem->UserAttrs->AlterVersion), + NIceDb::TUpdate<Schema::Paths::ACLVersion>(elem->ACLVersion) ); } else { db.Table<Schema::MigratedPaths>().Key(pathId.OwnerId, pathId.LocalPathId).Update( - NIceDb::TUpdate<Schema::MigratedPaths::ParentOwnerId>(elemnt->ParentPathId.OwnerId), - NIceDb::TUpdate<Schema::MigratedPaths::ParentLocalId>(elemnt->ParentPathId.LocalPathId), - NIceDb::TUpdate<Schema::MigratedPaths::Name>(elemnt->Name), - NIceDb::TUpdate<Schema::MigratedPaths::PathType>(elemnt->PathType), - NIceDb::TUpdate<Schema::MigratedPaths::StepCreated>(elemnt->StepCreated), - NIceDb::TUpdate<Schema::MigratedPaths::CreateTxId>(elemnt->CreateTxId), - NIceDb::TUpdate<Schema::MigratedPaths::StepDropped>(elemnt->StepDropped), - NIceDb::TUpdate<Schema::MigratedPaths::DropTxId>(elemnt->DropTxId), - NIceDb::TUpdate<Schema::MigratedPaths::Owner>(elemnt->Owner), - NIceDb::TUpdate<Schema::MigratedPaths::ACL>(elemnt->ACL), - NIceDb::TUpdate<Schema::MigratedPaths::LastTxId>(elemnt->LastTxId), - NIceDb::TUpdate<Schema::MigratedPaths::DirAlterVersion>(elemnt->DirAlterVersion), - NIceDb::TUpdate<Schema::MigratedPaths::UserAttrsAlterVersion>(elemnt->UserAttrs->AlterVersion), - NIceDb::TUpdate<Schema::MigratedPaths::ACLVersion>(elemnt->ACLVersion) + NIceDb::TUpdate<Schema::MigratedPaths::ParentOwnerId>(elem->ParentPathId.OwnerId), + NIceDb::TUpdate<Schema::MigratedPaths::ParentLocalId>(elem->ParentPathId.LocalPathId), + NIceDb::TUpdate<Schema::MigratedPaths::Name>(elem->Name), + NIceDb::TUpdate<Schema::MigratedPaths::PathType>(elem->PathType), + NIceDb::TUpdate<Schema::MigratedPaths::StepCreated>(elem->StepCreated), + NIceDb::TUpdate<Schema::MigratedPaths::CreateTxId>(elem->CreateTxId), + NIceDb::TUpdate<Schema::MigratedPaths::StepDropped>(elem->StepDropped), + NIceDb::TUpdate<Schema::MigratedPaths::DropTxId>(elem->DropTxId), + NIceDb::TUpdate<Schema::MigratedPaths::Owner>(elem->Owner), + NIceDb::TUpdate<Schema::MigratedPaths::ACL>(elem->ACL), + NIceDb::TUpdate<Schema::MigratedPaths::LastTxId>(elem->LastTxId), + NIceDb::TUpdate<Schema::MigratedPaths::DirAlterVersion>(elem->DirAlterVersion), + NIceDb::TUpdate<Schema::MigratedPaths::UserAttrsAlterVersion>(elem->UserAttrs->AlterVersion), + NIceDb::TUpdate<Schema::MigratedPaths::ACLVersion>(elem->ACLVersion) ); } } @@ -2119,7 +2119,7 @@ void TSchemeShard::PersistTxState(NIceDb::TNiceDb& db, const TOperationId opId) Y_VERIFY_S(PathsById.contains(pathId), "Path id " << pathId << " doesn't exist"); Y_VERIFY_S(PathsById.at(pathId)->IsTable(), "Path id " << pathId << " is not a table"); - Y_VERIFY_S(Tables.FindPtr(pathId), "Table " << pathId << " doen't exist"); + Y_VERIFY_S(Tables.FindPtr(pathId), "Table " << pathId << " doesn't exist"); TTableInfo::TPtr tableInfo = Tables.at(pathId); extraData = tableInfo->SerializeAlterExtraData(); @@ -3349,7 +3349,7 @@ void TSchemeShard::PersistRemoveKesusInfo(NIceDb::TNiceDb& db, TPathId pathId) } } -void TSchemeShard::PersistRevertedMirgration(NIceDb::TNiceDb& db, TPathId pathId, TTabletId abandonedSchemeShardId) { +void TSchemeShard::PersistRevertedMigration(NIceDb::TNiceDb& db, TPathId pathId, TTabletId abandonedSchemeShardId) { Y_VERIFY(IsLocalId(pathId)); db.Table<Schema::RevertedMigrations>().Key(pathId.LocalPathId, abandonedSchemeShardId).Update(); } @@ -3445,11 +3445,11 @@ void TSchemeShard::PersistRemoveTable(NIceDb::TNiceDb& db, TPathId pathId, const TabletCounters->Simple()[COUNTER_TTL_ENABLED_TABLE_COUNT].Sub(1); } - if (TablesWithSnaphots.contains(pathId)) { - const TTxId snapshotId = TablesWithSnaphots.at(pathId); + if (TablesWithSnapshots.contains(pathId)) { + const TTxId snapshotId = TablesWithSnapshots.at(pathId); PersistDropSnapshot(db, snapshotId, pathId); - TablesWithSnaphots.erase(pathId); + TablesWithSnapshots.erase(pathId); SnapshotTables.at(snapshotId).erase(pathId); if (SnapshotTables.at(snapshotId).empty()) { SnapshotTables.erase(snapshotId); @@ -3937,7 +3937,7 @@ void TSchemeShard::BreakTabletAndRestart(const TActorContext &ctx) { ctx.Send(Tablet(), new TEvents::TEvPoisonPill); } -bool TSchemeShard::IsShemeShardConfigured() const { +bool TSchemeShard::IsSchemeShardConfigured() const { Y_VERIFY(InitState != TTenantInitState::InvalidState); return InitState == TTenantInitState::Done || InitState == TTenantInitState::ReadOnlyPreview; } @@ -4047,7 +4047,7 @@ void TSchemeShard::Cleanup(const TActorContext &ctx) { void TSchemeShard::Enqueue(STFUNC_SIG) { Y_UNUSED(ctx); - Y_FAIL_S("No enqueue method emplemented." + Y_FAIL_S("No enqueue method implemented." << " unhandled event type: " << ev->GetTypeRewrite() << " event: " << (ev->HasEvent() ? ev->GetBase()->ToString().data() : "serialized?")); @@ -4392,14 +4392,14 @@ void TSchemeShard::ExamineTreeVFS(TPathId nodeId, std::function<void (TPathEleme " droppedTxId: " << node->DropTxId << " parent: " << node->ParentPathId); - // node droped and no hidden tx is in fly + // node dropped and no hidden tx is in fly if (node->Dropped() && !Operations.contains(node->DropTxId)) { LOG_DEBUG_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "ExamineTreeVFS skip path id " << nodeId); if (node->IsTable()) { //lets check indexes - for (auto chihldrenIt: node->GetChildren()) { - ExamineTreeVFS(chihldrenIt.second, func, ctx); + for (auto childrenIt: node->GetChildren()) { + ExamineTreeVFS(childrenIt.second, func, ctx); } } return; @@ -4410,24 +4410,24 @@ void TSchemeShard::ExamineTreeVFS(TPathId nodeId, std::function<void (TPathEleme func(node); - for (auto chihldrenIt: node->GetChildren()) { - ExamineTreeVFS(chihldrenIt.second, func, ctx); + for (auto childrenIt: node->GetChildren()) { + ExamineTreeVFS(childrenIt.second, func, ctx); } } THashSet<TPathId> TSchemeShard::ListSubTree(TPathId subdomain_root, const TActorContext &ctx) { - THashSet<TPathId> pathes; + THashSet<TPathId> paths; auto savePath = [&] (TPathElement::TPtr node) { - pathes.insert(node->PathId); + paths.insert(node->PathId); }; ExamineTreeVFS(subdomain_root, savePath, ctx); - return pathes; + return paths; } -THashSet<TTxId> TSchemeShard::GetRelatedTransactions(const THashSet<TPathId> &pathes, const TActorContext &ctx) { +THashSet<TTxId> TSchemeShard::GetRelatedTransactions(const THashSet<TPathId> &paths, const TActorContext &ctx) { Y_UNUSED(ctx); THashSet<TTxId> transactions; @@ -4435,7 +4435,7 @@ THashSet<TTxId> TSchemeShard::GetRelatedTransactions(const THashSet<TPathId> &pa TOperationId opId = txInFly.first; const TTxState& state = txInFly.second; - if (!pathes.contains(state.TargetPathId)) { + if (!paths.contains(state.TargetPathId)) { continue; } @@ -4445,21 +4445,21 @@ THashSet<TTxId> TSchemeShard::GetRelatedTransactions(const THashSet<TPathId> &pa return transactions; } -THashSet<TShardIdx> TSchemeShard::CollectAllShards(const THashSet<TPathId> &pathes) const { +THashSet<TShardIdx> TSchemeShard::CollectAllShards(const THashSet<TPathId> &paths) const { THashSet<TShardIdx> shards; for (const auto& shardItem: ShardInfos) { auto idx = shardItem.first; const TShardInfo& info = shardItem.second; - if (!pathes.contains(info.PathId)) { + if (!paths.contains(info.PathId)) { continue; } shards.insert(idx); } - for (const auto& pathId: pathes) { + for (const auto& pathId: paths) { Y_VERIFY(PathsById.contains(pathId)); TPathElement::TPtr path = PathsById.at(pathId); if (!path->IsSubDomainRoot()) { @@ -4536,7 +4536,7 @@ void TSchemeShard::UncountNode(TPathElement::TPtr node) { TabletCounters->Simple()[COUNTER_BLOB_DEPOT_COUNT].Sub(1); break; case TPathElement::EPathType::EPathTypeInvalid: - Y_FAIL("imposible path type"); + Y_FAIL("impossible path type"); } } @@ -4570,8 +4570,8 @@ void TSchemeShard::MarkAsDropping(TPathElement::TPtr node, TTxId txId, const TAc } } -void TSchemeShard::MarkAsDropping(const THashSet<TPathId> &pathes, TTxId txId, const TActorContext &ctx) { - for (auto id: pathes) { +void TSchemeShard::MarkAsDropping(const THashSet<TPathId> &paths, TTxId txId, const TActorContext &ctx) { + for (auto id: paths) { MarkAsDropping(PathsById.at(id), txId, ctx); } } @@ -4638,8 +4638,8 @@ void TSchemeShard::DropNode(TPathElement::TPtr node, TStepId step, TTxId txId, N PersistUserAttributes(db, node->PathId, node->UserAttrs, nullptr); } -void TSchemeShard::DropPathes(const THashSet<TPathId> &pathes, TStepId step, TTxId txId, NIceDb::TNiceDb &db, const TActorContext &ctx) { - for (auto id: pathes) { +void TSchemeShard::DropPaths(const THashSet<TPathId> &paths, TStepId step, TTxId txId, NIceDb::TNiceDb &db, const TActorContext &ctx) { + for (auto id: paths) { DropNode(PathsById.at(id), step, txId, db, ctx); } } @@ -4984,7 +4984,7 @@ void TSchemeShard::Handle(TEvHive::TEvCreateTabletReply::TPtr &ev, const TActorC LOG_WARN_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "Got TEvCreateTabletReply" << " for unknown txId: " << txId - << ", stardIdx: " << shardIdx + << ", shardIdx: " << shardIdx << ", tabletId: " << ev->Get()->Record.GetTabletID() << ", at schemeshard: " << TabletID()); return; @@ -4995,7 +4995,7 @@ void TSchemeShard::Handle(TEvHive::TEvCreateTabletReply::TPtr &ev, const TActorC LOG_WARN_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "Got TEvCreateTabletReply but partId in unknown" << ", for txId: " << txId - << ", stardIdx: " << shardIdx + << ", shardIdx: " << shardIdx << ", tabletId: " << ev->Get()->Record.GetTabletID() << ", at schemeshard: " << TabletID()); return; @@ -5022,7 +5022,7 @@ void TSchemeShard::Handle(TEvHive::TEvAdoptTabletReply::TPtr &ev, const TActorCo LOG_WARN_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "Got TEvAdoptTabletReply" << " for unknown txId " << txId - << " stardIdx " << shardIdx + << " shardIdx " << shardIdx << " tabletId " << ev->Get()->Record.GetTabletID()); return; @@ -5342,7 +5342,7 @@ void TSchemeShard::Handle(TEvSubDomain::TEvConfigureStatus::TPtr &ev, const TAct const auto& record = ev->Get()->Record; auto tabletId = TTabletId(record.GetOnTabletId()); - TOperationId opId = RouteIncomming(tabletId, ctx); + TOperationId opId = RouteIncoming(tabletId, ctx); if (!opId) { LOG_WARN_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "Got TEvSubDomain::TEvConfigureStatus," @@ -5416,7 +5416,7 @@ void TSchemeShard::Handle(TEvSchemeShard::TEvInitTenantSchemeShardResult::TPtr& const auto& record = ev->Get()->Record; auto tabletId = TTabletId(record.GetTenantSchemeShard()); - TOperationId opId = RouteIncomming(tabletId, ctx); + TOperationId opId = RouteIncoming(tabletId, ctx); if (!opId) { LOG_WARN_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "Got TEvSchemeShard::TEvInitTenantSchemeShardResult" @@ -5442,7 +5442,7 @@ void TSchemeShard::Handle(TEvSchemeShard::TEvPublishTenantAsReadOnlyResult::TPtr const auto& record = ev->Get()->Record; auto tabletId = TTabletId(record.GetTenantSchemeShard()); - TOperationId opId = RouteIncomming(tabletId, ctx); + TOperationId opId = RouteIncoming(tabletId, ctx); if (!opId) { LOG_WARN_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "Got TEvSchemeShard::TEvPublishTenantAsReadOnlyResult" @@ -5468,7 +5468,7 @@ void TSchemeShard::Handle(TEvSchemeShard::TEvPublishTenantResult::TPtr& ev, cons const auto& record = ev->Get()->Record; auto tabletId = TTabletId(record.GetTenantSchemeShard()); - TOperationId opId = RouteIncomming(tabletId, ctx); + TOperationId opId = RouteIncoming(tabletId, ctx); if (!opId) { LOG_WARN_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "Got TEvSchemeShard::TEvPublishTenantResult" @@ -5496,7 +5496,7 @@ void TSchemeShard::Handle(NKesus::TEvKesus::TEvSetConfigResult::TPtr& ev, const auto tabletId = TTabletId(record.GetTabletId()); - TOperationId opId = RouteIncomming(tabletId, ctx); + TOperationId opId = RouteIncoming(tabletId, ctx); if (!opId) { LOG_WARN_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "Got NKesus::TEvKesus::TEvSetConfigResult" @@ -5518,7 +5518,7 @@ void TSchemeShard::Handle(NKesus::TEvKesus::TEvSetConfigResult::TPtr& ev, const Execute(CreateTxOperationReply(opId, ev), ctx); } -TOperationId TSchemeShard::RouteIncomming(TTabletId tabletId, const TActorContext& ctx) { +TOperationId TSchemeShard::RouteIncoming(TTabletId tabletId, const TActorContext& ctx) { auto transactionIds = PipeTracker.FindTx(ui64(tabletId)); Y_VERIFY(transactionIds.size() <= 1); @@ -5594,7 +5594,7 @@ void TSchemeShard::Handle(NMon::TEvRemoteHttpInfo::TPtr& ev, const TActorContext void TSchemeShard::Handle(TEvSchemeShard::TEvCancelTx::TPtr& ev, const TActorContext& ctx) { if (IsReadOnlyMode) { LOG_ERROR_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, - "Ignoring messgage TEvSchemeShard::TEvCancelTx" << + "Ignoring message TEvSchemeShard::TEvCancelTx" << " reason# schemeshard in readonly" << " schemeshard# " << TabletID()); return; @@ -5614,7 +5614,7 @@ void TSchemeShard::Handle(TEvSchemeShard::TEvPublishTenant::TPtr &ev, const TAct void TSchemeShard::Handle(TEvSchemeShard::TEvMigrateSchemeShard::TPtr &ev, const TActorContext &ctx) { if (InitState != TTenantInitState::Inprogress) { LOG_ERROR_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, - "Ignoring messgage TEvSchemeShard::TEvMigrateSchemeShard:" << + "Ignoring message TEvSchemeShard::TEvMigrateSchemeShard:" << " reason# schemeshard not in TTenantInitState::Inprogress state" << " state is " << (ui64) InitState << " schemeshard# " << TabletID()); @@ -5627,7 +5627,7 @@ void TSchemeShard::Handle(TEvSchemeShard::TEvMigrateSchemeShardResult::TPtr &ev, const auto& record = ev->Get()->Record; auto tabletId = TTabletId(record.GetTenantSchemeShard()); - auto opId = RouteIncomming(tabletId, ctx); + auto opId = RouteIncoming(tabletId, ctx); if (!opId) { LOG_WARN_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "unable to resolve operation by tabletID: " << tabletId << @@ -5645,7 +5645,7 @@ void TSchemeShard::Handle(TEvDataShard::TEvMigrateSchemeShardResponse::TPtr &ev, const auto& record = ev->Get()->Record; auto tabletId = TTabletId(record.GetTabletId()); - auto opId = RouteIncomming(tabletId, ctx); + auto opId = RouteIncoming(tabletId, ctx); if (!opId) { LOG_WARN_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "unable to resolve operation by tabletID: " << tabletId << @@ -6345,7 +6345,7 @@ void TSchemeShard::ApplyConsoleConfigs(const NKikimrConfig::TAppConfig& appConfi } } - if (IsShemeShardConfigured()) { + if (IsSchemeShardConfigured()) { StartStopCompactionQueues(); } } @@ -6510,7 +6510,7 @@ void TSchemeShard::StartStopCompactionQueues() { void TSchemeShard::Handle(NConsole::TEvConfigsDispatcher::TEvSetConfigSubscriptionResponse::TPtr &, const TActorContext &ctx) { LOG_NOTICE_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, - "Subscribtion to Console has been set up" + "Subscription to Console has been set up" << ", schemeshardId: " << SelfTabletId()); } diff --git a/ydb/core/tx/schemeshard/schemeshard_impl.h b/ydb/core/tx/schemeshard/schemeshard_impl.h index 4c544e9a02d..c445c4b31b3 100644 --- a/ydb/core/tx/schemeshard/schemeshard_impl.h +++ b/ydb/core/tx/schemeshard/schemeshard_impl.h @@ -194,7 +194,7 @@ public: THashMap<TPathId, TReplicationInfo::TPtr> Replications; THashMap<TPathId, TBlobDepotInfo::TPtr> BlobDepots; - THashMap<TPathId, TTxId> TablesWithSnaphots; + THashMap<TPathId, TTxId> TablesWithSnapshots; THashMap<TTxId, TSet<TPathId>> SnapshotTables; THashMap<TTxId, TStepId> SnapshotsStepIds; @@ -386,7 +386,7 @@ public: void Clear(); void BreakTabletAndRestart(const TActorContext& ctx); - bool IsShemeShardConfigured() const; + bool IsSchemeShardConfigured() const; ui64 Generation() const; @@ -499,8 +499,8 @@ public: TPathId GetDomainKey(TPathElement::TPtr pathEl) const; TPathId GetDomainKey(TPathId pathId) const; - const NKikimrSubDomains::TProcessingParams& SelectProcessingPrarams(TPathId id) const; - const NKikimrSubDomains::TProcessingParams& SelectProcessingPrarams(TPathElement::TPtr pathEl) const; + const NKikimrSubDomains::TProcessingParams& SelectProcessingParams(TPathId id) const; + const NKikimrSubDomains::TProcessingParams& SelectProcessingParams(TPathElement::TPtr pathEl) const; TTabletId SelectCoordinator(TTxId txId, TPathId pathId) const; TTabletId SelectCoordinator(TTxId txId, TPathElement::TPtr pathEl) const; @@ -528,19 +528,19 @@ public: void DeleteSplitOp(TOperationId txId, TTxState& txState); bool ShardIsUnderSplitMergeOp(const TShardIdx& idx) const; - THashSet<TShardIdx> CollectAllShards(const THashSet<TPathId>& pathes) const; + THashSet<TShardIdx> CollectAllShards(const THashSet<TPathId>& paths) const; void ExamineTreeVFS(TPathId nodeId, std::function<void(TPathElement::TPtr)> func, const TActorContext& ctx); THashSet<TPathId> ListSubTree(TPathId subdomain_root, const TActorContext& ctx); - THashSet<TTxId> GetRelatedTransactions(const THashSet<TPathId>& pathes, const TActorContext &ctx); + THashSet<TTxId> GetRelatedTransactions(const THashSet<TPathId>& paths, const TActorContext &ctx); void MarkAsDropping(TPathElement::TPtr node, TTxId txId, const TActorContext& ctx); - void MarkAsDropping(const THashSet<TPathId>& pathes, TTxId txId, const TActorContext& ctx); + void MarkAsDropping(const THashSet<TPathId>& paths, TTxId txId, const TActorContext& ctx); void UncountNode(TPathElement::TPtr node); void MarkAsMigrated(TPathElement::TPtr node, const TActorContext& ctx); void DropNode(TPathElement::TPtr node, TStepId step, TTxId txId, NIceDb::TNiceDb& db, const TActorContext& ctx); - void DropPathes(const THashSet<TPathId>& pathes, TStepId step, TTxId txId, NIceDb::TNiceDb& db, const TActorContext& ctx); + void DropPaths(const THashSet<TPathId>& paths, TStepId step, TTxId txId, NIceDb::TNiceDb& db, const TActorContext& ctx); void DoShardsDeletion(const THashSet<TShardIdx>& shardIdx, const TActorContext& ctx); @@ -665,7 +665,7 @@ public: void PersistRemoveKesusInfo(NIceDb::TNiceDb& db, TPathId pathId); void PersistRemoveTableIndex(NIceDb::TNiceDb& db, TPathId tableId); void PersistRemoveTable(NIceDb::TNiceDb& db, TPathId tableId, const TActorContext& ctx); - void PersistRevertedMirgration(NIceDb::TNiceDb& db, TPathId pathId, TTabletId abandonedSchemeShardId); + void PersistRevertedMigration(NIceDb::TNiceDb& db, TPathId pathId, TTabletId abandonedSchemeShardId); // BlockStore void PersistBlockStorePartition(NIceDb::TNiceDb& db, TPathId pathId, ui32 partitionId, TShardIdx shardIdx, ui64 version); @@ -1001,7 +1001,7 @@ public: void RestartPipeTx(TTabletId tabletId, const TActorContext& ctx); - TOperationId RouteIncomming(TTabletId tabletId, const TActorContext& ctx); + TOperationId RouteIncoming(TTabletId tabletId, const TActorContext& ctx); // namespace NLongRunningCommon { struct TXxport { @@ -1124,7 +1124,7 @@ public: THashMap<TTxId, TIndexBuildId> TxIdToIndexBuilds; // do not share pipes with operations - // alse do not share pipes between IndexBuilds + // also do not share pipes between IndexBuilds struct TDedicatedPipePool { using TMessage = std::pair<ui32, TIntrusivePtr<TEventSerializedData>>; using TOwnerRec = std::pair<TIndexBuildId, TTabletId>; diff --git a/ydb/core/tx/schemeshard/schemeshard_info_types.cpp b/ydb/core/tx/schemeshard/schemeshard_info_types.cpp index ffec032654f..401d2dff5b3 100644 --- a/ydb/core/tx/schemeshard/schemeshard_info_types.cpp +++ b/ydb/core/tx/schemeshard/schemeshard_info_types.cpp @@ -392,31 +392,31 @@ NKikimrSchemeOp::TPartitionConfig TPartitionConfigMerger::DefaultConfig(const TA bool TPartitionConfigMerger::ApplyChanges( NKikimrSchemeOp::TPartitionConfig &result, const NKikimrSchemeOp::TPartitionConfig &src, const NKikimrSchemeOp::TPartitionConfig &changes, - const TAppData *appData, TString &errDesr) + const TAppData *appData, TString &errDescr) { result.CopyFrom(src); // inherit all data from src - if (!ApplyChangesInColumnFamilies(result, src, changes, errDesr)) { + if (!ApplyChangesInColumnFamilies(result, src, changes, errDescr)) { return false; } if (changes.StorageRoomsSize()) { - errDesr = TStringBuilder() + errDescr = TStringBuilder() << "StorageRooms should not be present in request."; return false; } if (changes.HasFreezeState()) { if (changes.GetFreezeState() == NKikimrSchemeOp::EFreezeState::Unspecified) { - errDesr = TStringBuilder() << "Unexpected freeze state"; + errDescr = TStringBuilder() << "Unexpected freeze state"; return false; } TVector<const NProtoBuf::FieldDescriptor*> fields; auto reflection = changes.GetReflection(); reflection->ListFields(changes, &fields); if (fields.size() > 1) { - errDesr = TStringBuilder() - << "Mix freeze cmd with other options is forbiden"; + errDescr = TStringBuilder() + << "Mix freeze cmd with other options is forbidden"; return false; } } @@ -429,12 +429,12 @@ bool TPartitionConfigMerger::ApplyChanges( if (changes.HasNamedCompactionPolicy()) { auto policyName = changes.GetNamedCompactionPolicy(); if (policyName.empty()) { - errDesr = "Empty compaction policy name, either set name or don't fill the section NamedCompactionPolicy"; + errDescr = "Empty compaction policy name, either set name or don't fill the section NamedCompactionPolicy"; return false; } if (!appData->DomainsInfo->NamedCompactionPolicies.contains(policyName)) { - errDesr = TStringBuilder() << "Invalid compaction policy name: " << policyName; + errDescr = TStringBuilder() << "Invalid compaction policy name: " << policyName; return false; } @@ -470,7 +470,7 @@ bool TPartitionConfigMerger::ApplyChanges( if (changes.HasCrossDataCenterFollowerCount()) { if (result.FollowerGroupsSize()) { - errDesr = TStringBuilder() << "Forbidded downgrade from FollowerGroup option to the HasCrossDataCenterFollowerCount option"; + errDescr = TStringBuilder() << "Downgrade from FollowerGroup option to the HasCrossDataCenterFollowerCount option is forbidden"; return false; } @@ -485,12 +485,12 @@ bool TPartitionConfigMerger::ApplyChanges( if (changes.HasFollowerCount()) { if (result.HasCrossDataCenterFollowerCount()) { - errDesr = TStringBuilder() << "Forbidded downgrade from CrossDataCenterFollowerCount option to the FollowerGroup option"; + errDescr = TStringBuilder() << "Downgrade from CrossDataCenterFollowerCount option to the FollowerGroup option is forbidden"; return false; } if (result.FollowerGroupsSize()) { - errDesr = TStringBuilder() << "Forbidded downgrade from FollowerGroup option to the FollowerGroup option"; + errDescr = TStringBuilder() << "Downgrade from FollowerGroup option to the FollowerGroup option is forbidden"; return false; } @@ -499,7 +499,7 @@ bool TPartitionConfigMerger::ApplyChanges( if (changes.HasAllowFollowerPromotion()) { if (result.FollowerGroupsSize()) { - errDesr = TStringBuilder() << "Forbidded downgrade from FollowerGroup option to the AllowFollowerPromotion option"; + errDescr = TStringBuilder() << "Downgrade from FollowerGroup option to the AllowFollowerPromotion option is forbidden"; return false; } @@ -596,7 +596,7 @@ bool TPartitionConfigMerger::ApplyChanges( bool TPartitionConfigMerger::ApplyChangesInColumnFamilies( NKikimrSchemeOp::TPartitionConfig &result, const NKikimrSchemeOp::TPartitionConfig &src, const NKikimrSchemeOp::TPartitionConfig &changes, - TString &errDesr) + TString &errDescr) { result.MutableColumnFamilies()->CopyFrom(src.GetColumnFamilies()); TColumnFamiliesMerger merger(result); @@ -606,13 +606,13 @@ bool TPartitionConfigMerger::ApplyChangesInColumnFamilies( for (const auto& changesFamily : changes.GetColumnFamilies()) { NKikimrSchemeOp::TFamilyDescription* cFamilyPtr = nullptr; if (changesFamily.HasId() && changesFamily.HasName()) { - cFamilyPtr = merger.AddOrGet(changesFamily.GetId(), changesFamily.GetName(), errDesr); + cFamilyPtr = merger.AddOrGet(changesFamily.GetId(), changesFamily.GetName(), errDescr); } else if (changesFamily.HasId()) { - cFamilyPtr = merger.AddOrGet(changesFamily.GetId(), errDesr); + cFamilyPtr = merger.AddOrGet(changesFamily.GetId(), errDescr); } else if (changesFamily.HasName()) { - cFamilyPtr = merger.AddOrGet(changesFamily.GetName(), errDesr); + cFamilyPtr = merger.AddOrGet(changesFamily.GetName(), errDescr); } else { - cFamilyPtr = merger.AddOrGet(0, errDesr); + cFamilyPtr = merger.AddOrGet(0, errDescr); } if (!cFamilyPtr) { @@ -624,13 +624,13 @@ bool TPartitionConfigMerger::ApplyChangesInColumnFamilies( const auto& familyName = dstFamily.GetName(); if (!changedCFamilies.insert(familyId).second) { - errDesr = TStringBuilder() + errDescr = TStringBuilder() << "Multiple changes for the same column family are not allowed. ColumnFamily id: " << familyId << " name: " << familyName; return false; } if (changesFamily.HasRoom() || changesFamily.HasCodec() || changesFamily.HasInMemory()) { - errDesr = TStringBuilder() + errDescr = TStringBuilder() << "Deprecated parameters in column family. ColumnFamily id: " << familyId << " name: " << familyName; return false; } @@ -640,7 +640,7 @@ bool TPartitionConfigMerger::ApplyChangesInColumnFamilies( KIKIMR_SCHEMESHARD_ALLOW_COLUMN_FAMILIES || AppData()->AllowColumnFamiliesForTest); if (!allowColumnFamilies) { - errDesr = TStringBuilder() + errDescr = TStringBuilder() << "Server support for column families is not yet available"; return false; } @@ -651,13 +651,13 @@ bool TPartitionConfigMerger::ApplyChangesInColumnFamilies( changesFamily.GetStorageConfig().HasLog() || changesFamily.GetStorageConfig().HasExternal()) { - errDesr = TStringBuilder() + errDescr = TStringBuilder() << "Unsupported StorageConfig settings found. Column Family id: " << familyId << " name: " << familyName; return false; } } if (changesFamily.HasStorage()) { - errDesr = TStringBuilder() + errDescr = TStringBuilder() << "Deprecated Storage parameter in column family. ColumnFamily id: " << familyId << " name: " << familyName; return false; } @@ -665,7 +665,7 @@ bool TPartitionConfigMerger::ApplyChangesInColumnFamilies( if (changesFamily.HasColumnCodec()) { if (changesFamily.GetColumnCodec() == NKikimrSchemeOp::EColumnCodec::ColumnCodecZSTD) { - errDesr = TStringBuilder() + errDescr = TStringBuilder() << "Unsupported ColumnCodec. ColumnFamily id: " << familyId << " name: " << familyName; return false; } @@ -886,7 +886,7 @@ bool TPartitionConfigMerger::VerifyCreateParams( if (fName == "default") { errDescr = TStringBuilder() << "Column family with id " << fId << " has name default" - << ", name default is reseved for family with id 0"; + << ", name default is reserved for family with id 0"; } } } @@ -1119,7 +1119,7 @@ bool TPartitionConfigMerger::VerifyCommandOnFrozenTable(const NKikimrSchemeOp::T srcConfig.GetFreezeState() == NKikimrSchemeOp::EFreezeState::Freeze) { if (dstConfig.HasFreezeState() && dstConfig.GetFreezeState() == NKikimrSchemeOp::EFreezeState::Unfreeze) { - // Only unfreeze cmd is allowd + // Only unfreeze cmd is allowed return true; } return false; @@ -1375,7 +1375,7 @@ void TAggregatedStats::UpdateShardStats(TShardIdx datashardIdx, const TPartition } } -void TTableInfo::RegisterSplitMegreOp(TOperationId opId, const TTxState& txState) { +void TTableInfo::RegisterSplitMergeOp(TOperationId opId, const TTxState& txState) { Y_VERIFY(txState.TxType == TTxState::TxSplitTablePartition || txState.TxType == TTxState::TxMergeTablePartition); Y_VERIFY(txState.SplitDescription); diff --git a/ydb/core/tx/schemeshard/schemeshard_info_types.h b/ydb/core/tx/schemeshard/schemeshard_info_types.h index ca9928e6cea..0ef5806640d 100644 --- a/ydb/core/tx/schemeshard/schemeshard_info_types.h +++ b/ydb/core/tx/schemeshard/schemeshard_info_types.h @@ -151,12 +151,12 @@ struct TPartitionConfigMerger { static bool ApplyChanges( NKikimrSchemeOp::TPartitionConfig& result, const NKikimrSchemeOp::TPartitionConfig& src, const NKikimrSchemeOp::TPartitionConfig& changes, - const TAppData* appData, TString& errDesr); + const TAppData* appData, TString& errDescr); static bool ApplyChangesInColumnFamilies( NKikimrSchemeOp::TPartitionConfig& result, const NKikimrSchemeOp::TPartitionConfig& src, const NKikimrSchemeOp::TPartitionConfig& changes, - TString& errDesr); + TString& errDescr); static THashMap<ui32, size_t> DeduplicateColumnFamiliesById(NKikimrSchemeOp::TPartitionConfig& config); static THashMap<ui32, size_t> DeduplicateStorageRoomsById(NKikimrSchemeOp::TPartitionConfig& config); @@ -578,7 +578,7 @@ public: void UpdateShardStats(TShardIdx datashardIdx, const TPartitionStats& newStats); - void RegisterSplitMegreOp(TOperationId txId, const TTxState& txState); + void RegisterSplitMergeOp(TOperationId txId, const TTxState& txState); bool IsShardInSplitMergeOp(TShardIdx idx) const; void FinishSplitMergeOp(TOperationId txId); @@ -1163,7 +1163,7 @@ struct TPersQueueGroupInfo : TSimpleRefCount<TPersQueueGroupInfo> { TString BootstrapConfig; THashMap<TShardIdx, TPQShardInfo::TPtr> Shards; // key - shardIdx TKeySchema KeySchema; - TPersQueueGroupInfo::TPtr AlterData; // changes to be applyed + TPersQueueGroupInfo::TPtr AlterData; // changes to be applied TTabletId BalancerTabletID = InvalidTabletId; TShardIdx BalancerShardIdx = InvalidShardIdx; @@ -2277,7 +2277,7 @@ struct TTableIndexInfo : public TSimpleRefCount<TTableIndexInfo> { static TPtr Create(const NKikimrSchemeOp::TIndexCreationConfig& config, TString& errMsg) { if (!config.KeyColumnNamesSize()) { - errMsg += TStringBuilder() << "no key colums in index creation config"; + errMsg += TStringBuilder() << "no key columns in index creation config"; return nullptr; } diff --git a/ydb/core/tx/schemeshard/schemeshard_path.cpp b/ydb/core/tx/schemeshard/schemeshard_path.cpp index a98c9aa6dbf..b94a2fb4563 100644 --- a/ydb/core/tx/schemeshard/schemeshard_path.cpp +++ b/ydb/core/tx/schemeshard/schemeshard_path.cpp @@ -873,8 +873,8 @@ TPath::operator bool() const { bool TPath::operator ==(const TPath& another) const { // likely O(1) complexity, but might be O(path length) if (Y_LIKELY(IsResolved() && another.IsResolved())) { - return Base()->PathId == another.Base()->PathId; // check pathids is the only right way to compare - } // PathStrings could be false equeal due operation Init form deleted path element + return Base()->PathId == another.Base()->PathId; // check path ids is the only right way to compare + } // PathStrings could be false equal due operation Init form deleted path element if (IsResolved() || another.IsResolved()) { return false; } @@ -966,7 +966,7 @@ TPath TPath::FirstExistedParent() const { } TString TPath::GetDomainPathString() const { - // TODO: not effective because of creating vectors in Init() method. should keep subdomain path somethere in struct TSubDomainInfo + // TODO: not effective because of creating vectors in Init() method. should keep subdomain path somewhere in struct TSubDomainInfo return Init(GetPathIdForDomain(), SS).PathString(); } @@ -997,7 +997,7 @@ bool TPath::IsDomain() const { } TPath& TPath::Dive(const TString& name) { - if (!SS->IsShemeShardConfigured()) { + if (!SS->IsSchemeShardConfigured()) { NameParts.push_back(name); return *this; } @@ -1151,20 +1151,20 @@ bool TPath::IsUnderOperation() const { bool result = Base()->PathState != NKikimrSchemeOp::EPathState::EPathStateNoChanges; if (result) { - ui32 summ = (ui32)IsUnderCreating() + ui32 sum = (ui32)IsUnderCreating() + (ui32)IsUnderAltering() + (ui32)IsUnderCopying() - + (ui32)IsUnderBackuping() + + (ui32)IsUnderBackingUp() + (ui32)IsUnderRestoring() + (ui32)IsUnderDeleting() + (ui32)IsUnderDomainUpgrade() + (ui32)IsUnderMoving(); - Y_VERIFY_S(summ == 1, + Y_VERIFY_S(sum == 1, "only one operation at the time" << " pathId: " << Base()->PathId << " path state: " << NKikimrSchemeOp::EPathState_Name(Base()->PathState) << " path: " << PathString() - << " sum is: " << summ); + << " sum is: " << sum); } return result; } @@ -1222,7 +1222,7 @@ bool TPath::IsUnderCopying() const { return Base()->PathState == NKikimrSchemeOp::EPathState::EPathStateCopying; } -bool TPath::IsUnderBackuping() const { +bool TPath::IsUnderBackingUp() const { Y_VERIFY(IsResolved()); return Base()->PathState == NKikimrSchemeOp::EPathState::EPathStateBackup; @@ -1433,8 +1433,8 @@ bool TPath::IsValidLeafName(TString& explain) const { return false; } - if (!SS->IsShemeShardConfigured()) { - explain += "cluster don't have inited root yet"; + if (!SS->IsSchemeShardConfigured()) { + explain += "cluster don't have initialized root yet"; return false; } @@ -1557,11 +1557,11 @@ void TPath::MaterializeLeaf(const TString& owner, const TPathId& newPathId, bool Y_FAIL_S("strange result for materialization: " << result); break; - case EAttachChildResult::RejectAsInactve: + case EAttachChildResult::RejectAsInactive: if (allowInactivePath) { Y_VERIFY(!SS->PathIsActive(newPathId)); } else { - Y_FAIL_S("MaterializeLeaf do not accept shadow pathes, use allowInactivePath = true"); + Y_FAIL_S("MaterializeLeaf do not accept shadow paths, use allowInactivePath = true"); } break; diff --git a/ydb/core/tx/schemeshard/schemeshard_path.h b/ydb/core/tx/schemeshard/schemeshard_path.h index 61a7dda1e7e..fa328fe1bd2 100644 --- a/ydb/core/tx/schemeshard/schemeshard_path.h +++ b/ydb/core/tx/schemeshard/schemeshard_path.h @@ -135,7 +135,7 @@ public: bool IsUnderAltering() const; bool IsUnderDomainUpgrade() const; bool IsUnderCopying() const; - bool IsUnderBackuping() const; + bool IsUnderBackingUp() const; bool IsUnderRestoring() const; bool IsUnderDeleting() const; bool IsUnderMoving() const; diff --git a/ydb/core/tx/schemeshard/schemeshard_path_describer.cpp b/ydb/core/tx/schemeshard/schemeshard_path_describer.cpp index 7397b6f013d..b7709e7ca1b 100644 --- a/ydb/core/tx/schemeshard/schemeshard_path_describer.cpp +++ b/ydb/core/tx/schemeshard/schemeshard_path_describer.cpp @@ -63,13 +63,13 @@ void TPathDescriber::FillChildDescr(NKikimrSchemeOp::TDirEntry* descr, TPathElem descr->SetSchemeshardId(pathEl->PathId.OwnerId); descr->SetPathId(pathEl->PathId.LocalPathId); - descr->SetParentPathId(pathEl->ParentPathId.LocalPathId); //???? ParnetPathOwnerId + descr->SetParentPathId(pathEl->ParentPathId.LocalPathId); //???? ParentPathOwnerId descr->SetPathType(pathEl->PathType); descr->SetOwner(pathEl->Owner); descr->SetPathState(pathEl->PathState); // ???? can't be consistent KIKIMR-8861 - descr->SetCreateFinished(createFinished); // use this insted PathState + descr->SetCreateFinished(createFinished); // use this instead of PathState descr->SetCreateTxId(ui64(pathEl->CreateTxId)); if (createFinished) { @@ -447,7 +447,7 @@ void TPathDescriber::DescribePersQueueGroup(TPathId pathId, TPathElement::TPtr p const auto& desc = descriptions.at(pqId); auto& partition = *entry->AddPartitions(); - Y_VERIFY_S(desc.TabletId, "Unassigned tabetId for partition: " << pqId); + Y_VERIFY_S(desc.TabletId, "Unassigned tabletId for partition: " << pqId); Y_VERIFY_S(desc.Info, "Empty info for partition: " << pqId); partition.SetPartitionId(pqId); @@ -889,7 +889,7 @@ THolder<TEvSchemeShard::TEvDescribeSchemeResultBuilder> TPathDescriber::Describe } } else { // here we do not full any object specific information, like table description - // nevertheless, chindren list should be set even when dir or children is being created right now + // nevertheless, children list should be set even when dir or children is being created right now DescribeChildren(path); } @@ -1157,7 +1157,7 @@ void TSchemeShard::FillTableBoundaries(const TTableInfo::TPtr tableInfo, google: const auto& c = endKey.GetCells()[ki]; auto type = tableInfo->Columns[tableInfo->KeyColumnIds[ki]].PType; bool ok = NMiniKQL::CellToValue(type, c, *boundary->AddTuple(), errStr); - Y_VERIFY(ok, "Failed to build key tuple at postition %" PRIu32 " error: %s", ki, errStr.data()); + Y_VERIFY(ok, "Failed to build key tuple at position %" PRIu32 " error: %s", ki, errStr.data()); } } } diff --git a/ydb/core/tx/schemeshard/schemeshard_path_element.h b/ydb/core/tx/schemeshard/schemeshard_path_element.h index 9844676d02a..f18bb9eca6d 100644 --- a/ydb/core/tx/schemeshard/schemeshard_path_element.h +++ b/ydb/core/tx/schemeshard/schemeshard_path_element.h @@ -173,7 +173,7 @@ struct TUserAttributes: TSimpleRefCount<TUserAttributes> { bool CheckLimits(TString& errStr) const { const ui64 bytes = Bytes(); if (bytes > TUserAttributesLimits::MaxBytes) { - errStr = Sprintf("UserArttibutes::CheckLimits: user attributes too big: %" PRIu64, bytes); + errStr = Sprintf("UserAttributes::CheckLimits: user attributes too big: %" PRIu64, bytes); return false; } @@ -187,13 +187,13 @@ struct TUserAttributes: TSimpleRefCount<TUserAttributes> { } if (name.size() > TUserAttributesLimits::MaxNameLen) { - errStr = Sprintf("UserArttibutes: name too long, name# '%s' value# '%s'" + errStr = Sprintf("UserAttributes: name too long, name# '%s' value# '%s'" , name.c_str(), value.c_str()); return false; } if (value.size() > TUserAttributesLimits::MaxValueLen) { - errStr = Sprintf("UserArttibutes: value too long, name# '%s' value# '%s'" + errStr = Sprintf("UserAttributes: value too long, name# '%s' value# '%s'" , name.c_str(), value.c_str()); return false; } @@ -255,7 +255,7 @@ struct TUserAttributes: TSimpleRefCount<TUserAttributes> { static bool CheckAttributeStringWithWeakCheck(const TString& name, const TString& value, TString& errStr) { if (!IsValidPathName_WeakCheck(value)) { - errStr = Sprintf("UserArttibutes: attribute '%s' has invalid value '%s', forbidden symbols are found", + errStr = Sprintf("UserAttributes: attribute '%s' has invalid value '%s', forbidden symbols are found", name.c_str(), value.c_str()); return false; } diff --git a/ydb/core/tx/schemeshard/schemeshard_schema.h b/ydb/core/tx/schemeshard/schemeshard_schema.h index d74cdb771c6..ed451025d63 100644 --- a/ydb/core/tx/schemeshard/schemeshard_schema.h +++ b/ydb/core/tx/schemeshard/schemeshard_schema.h @@ -1057,7 +1057,7 @@ struct Schema : NIceDb::Schema { >; }; - struct TxDependenciesV2 : Table<43> { // has dieded before release + struct TxDependenciesV2 : Table<43> { // has died before release struct TxId : Column<1, NScheme::NTypeIds::Uint64> { using Type = TTxId; }; struct TxPartId : Column<2, NScheme::NTypeIds::Uint32> { using Type = TSubTxId; }; struct DependentTxId : Column<3, NScheme::NTypeIds::Uint64> { using Type = TTxId; }; diff --git a/ydb/core/tx/schemeshard/schemeshard_tables_storage.cpp b/ydb/core/tx/schemeshard/schemeshard_tables_storage.cpp index 22c28a1225d..38e0670675b 100644 --- a/ydb/core/tx/schemeshard/schemeshard_tables_storage.cpp +++ b/ydb/core/tx/schemeshard/schemeshard_tables_storage.cpp @@ -5,7 +5,7 @@ namespace NKikimr::NSchemeShard { void TTablesStorage::OnAddObject(const TPathId& pathId, TColumnTableInfo::TPtr object) { const TString& tieringId = object->Description.GetTtlSettings().GetUseTiering(); if (!!tieringId) { - PathesByTieringId[tieringId].emplace(pathId); + PathsByTieringId[tieringId].emplace(pathId); } } @@ -14,19 +14,19 @@ void TTablesStorage::OnRemoveObject(const TPathId& pathId, TColumnTableInfo::TPt if (!tieringId) { return; } - auto it = PathesByTieringId.find(tieringId); - if (PathesByTieringId.end() == it) { + auto it = PathsByTieringId.find(tieringId); + if (PathsByTieringId.end() == it) { return; } it->second.erase(pathId); if (it->second.empty()) { - PathesByTieringId.erase(it); + PathsByTieringId.erase(it); } } const std::set<NKikimr::TPathId>& TTablesStorage::GetTablesWithTiering(const TString& tieringId) const { - auto it = PathesByTieringId.find(tieringId); - if (it != PathesByTieringId.end()) { + auto it = PathsByTieringId.find(tieringId); + if (it != PathsByTieringId.end()) { return it->second; } else { return Default<std::set<TPathId>>(); diff --git a/ydb/core/tx/schemeshard/schemeshard_tables_storage.h b/ydb/core/tx/schemeshard/schemeshard_tables_storage.h index e89af0067a7..e76bad7590a 100644 --- a/ydb/core/tx/schemeshard/schemeshard_tables_storage.h +++ b/ydb/core/tx/schemeshard/schemeshard_tables_storage.h @@ -7,7 +7,7 @@ namespace NKikimr::NSchemeShard { class TTablesStorage { private: THashMap<TPathId, TColumnTableInfo::TPtr> Tables; - THashMap<TString, std::set<TPathId>> PathesByTieringId; + THashMap<TString, std::set<TPathId>> PathsByTieringId; void OnAddObject(const TPathId& pathId, TColumnTableInfo::TPtr object); void OnRemoveObject(const TPathId& pathId, TColumnTableInfo::TPtr object); diff --git a/ydb/core/tx/schemeshard/schemeshard_tx_infly.h b/ydb/core/tx/schemeshard/schemeshard_tx_infly.h index 112595c65c6..d7a30ef4ef5 100644 --- a/ydb/core/tx/schemeshard/schemeshard_tx_infly.h +++ b/ydb/core/tx/schemeshard/schemeshard_tx_infly.h @@ -14,7 +14,7 @@ namespace NKikimr { namespace NSchemeShard { -struct TNotifyes { +struct TNotifications { TTxId TxId = InvalidTxId; THashSet<TActorId> Actors; @@ -24,9 +24,9 @@ struct TNotifyes { Actors.insert(actor); } - void Swap(TNotifyes& notifyes) { - std::swap(TxId, notifyes.TxId); - Actors.swap(notifyes.Actors); + void Swap(TNotifications& notifications) { + std::swap(TxId, notifications.TxId); + Actors.swap(notifications.Actors); } bool Empty() const { return Actors.empty(); } @@ -263,7 +263,7 @@ struct TTxState { TMessageSeqNo SchemeOpSeqNo; // For SS -> DS propose events -// TNotifyes Notify; // volatile set of actors that requested completion notification +// TNotifications Notify; // volatile set of actors that requested completion notification TInstant StartTime = TInstant::Zero(); TTxState() @@ -386,7 +386,7 @@ struct TTxState { case TxMoveTableIndex: return true; case TxInvalid: - Y_VERIFY_DEBUG("UNREACHEBLE"); + Y_VERIFY_DEBUG("UNREACHABLE"); Y_UNREACHABLE(); } } @@ -472,7 +472,7 @@ struct TTxState { case TxMoveTableIndex: return false; case TxInvalid: - Y_VERIFY_DEBUG("UNREACHEBLE"); + Y_VERIFY_DEBUG("UNREACHABLE"); Y_UNREACHABLE(); } } @@ -558,7 +558,7 @@ struct TTxState { case TxAlterBlobDepot: return false; case TxInvalid: - Y_VERIFY_DEBUG("UNREACHEBLE"); + Y_VERIFY_DEBUG("UNREACHABLE"); Y_UNREACHABLE(); } } diff --git a/ydb/core/tx/schemeshard/schemeshard_types.h b/ydb/core/tx/schemeshard/schemeshard_types.h index d6a06db9dfe..b3fc236c084 100644 --- a/ydb/core/tx/schemeshard/schemeshard_types.h +++ b/ydb/core/tx/schemeshard/schemeshard_types.h @@ -59,8 +59,8 @@ struct TGlobalTimestamp { } bool operator < (const TGlobalTimestamp& ts) const { - Y_VERIFY_DEBUG(Step, "Comparing with unset timestemp"); - Y_VERIFY_DEBUG(ts.Step, "Comparing with unset timestemp"); + Y_VERIFY_DEBUG(Step, "Comparing with unset timestamp"); + Y_VERIFY_DEBUG(ts.Step, "Comparing with unset timestamp"); return Step < ts.Step || Step == ts.Step && TxId < ts.TxId; } @@ -100,7 +100,7 @@ enum class EAttachChildResult : ui32 { RejectAsOlderActual, AttachedAsCreatedActual, - RejectAsInactve, + RejectAsInactive, AttachedAsOlderUnCreated, RejectAsNewerUnCreated diff --git a/ydb/core/tx/schemeshard/schemeshard_utils.cpp b/ydb/core/tx/schemeshard/schemeshard_utils.cpp index 44618276f98..56ba5d161d9 100644 --- a/ydb/core/tx/schemeshard/schemeshard_utils.cpp +++ b/ydb/core/tx/schemeshard/schemeshard_utils.cpp @@ -159,7 +159,7 @@ void TSelfPinger::Handle(TEvSchemeShard::TEvMeasureSelfResponseTime::TPtr &ev, c if (responseTime > SELF_PING_INTERVAL) { DoSelfPing(ctx); } else { - SheduleSelfPingWakeup(ctx); + ScheduleSelfPingWakeup(ctx); } } @@ -190,7 +190,7 @@ void TSelfPinger::DoSelfPing(const NActors::TActorContext &ctx) { SelfPingInFlight = true; } -void TSelfPinger::SheduleSelfPingWakeup(const NActors::TActorContext &ctx) { +void TSelfPinger::ScheduleSelfPingWakeup(const NActors::TActorContext &ctx) { if (SelfPingWakeupScheduled) return; @@ -203,12 +203,12 @@ void TSelfPinger::SheduleSelfPingWakeup(const NActors::TActorContext &ctx) { namespace NTableIndex { -TTableColumns ExtractInfo(const NKikimrSchemeOp::TTableDescription &tableDesrc) { +TTableColumns ExtractInfo(const NKikimrSchemeOp::TTableDescription &tableDescr) { NTableIndex::TTableColumns result; - for (auto& column: tableDesrc.GetColumns()) { + for (auto& column: tableDescr.GetColumns()) { result.Columns.insert(column.GetName()); } - for (auto& keyName: tableDesrc.GetKeyColumnNames()) { + for (auto& keyName: tableDescr.GetKeyColumnNames()) { result.Keys.push_back(keyName); } return result; @@ -320,7 +320,7 @@ NKikimrSchemeOp::TTableDescription CalcImplTableDesc( } NKikimrSchemeOp::TTableDescription CalcImplTableDesc( - const NKikimrSchemeOp::TTableDescription &baseTableDesrc, + const NKikimrSchemeOp::TTableDescription &baseTableDescr, const TTableColumns &implTableColumns, const NKikimrSchemeOp::TTableDescription &indexTableDesc) { @@ -336,7 +336,7 @@ NKikimrSchemeOp::TTableDescription CalcImplTableDesc( result.MutableSplitBoundary()->CopyFrom(indexTableDesc.GetSplitBoundary()); } - *result.MutablePartitionConfig() = PartitionConfigForIndexes(baseTableDesrc, indexTableDesc); + *result.MutablePartitionConfig() = PartitionConfigForIndexes(baseTableDescr, indexTableDesc); //Columns and KeyColumnNames order is really important //the order of implTableColumns.Keys is the right one @@ -347,7 +347,7 @@ NKikimrSchemeOp::TTableDescription CalcImplTableDesc( } result.ClearColumns(); - for (auto& column: baseTableDesrc.GetColumns()) { + for (auto& column: baseTableDescr.GetColumns()) { auto& columnName = column.GetName(); if (implTableColumns.Columns.contains(columnName)) { auto item = result.AddColumns(); @@ -469,17 +469,17 @@ NKikimrSchemeOp::TPartitionConfig PartitionConfigForIndexes( } NKikimrSchemeOp::TPartitionConfig PartitionConfigForIndexes( - const NKikimrSchemeOp::TTableDescription& baseTableDesrc, + const NKikimrSchemeOp::TTableDescription& baseTableDescr, const NKikimrSchemeOp::TTableDescription& indexTableDesc) { - return PartitionConfigForIndexes(baseTableDesrc.GetPartitionConfig(), indexTableDesc); + return PartitionConfigForIndexes(baseTableDescr.GetPartitionConfig(), indexTableDesc); } -bool ExtractTypes(const NKikimrSchemeOp::TTableDescription& baseTableDesrc, TColumnTypes& columnTypes, TString& explain) { +bool ExtractTypes(const NKikimrSchemeOp::TTableDescription& baseTableDescr, TColumnTypes& columnTypes, TString& explain) { const NScheme::TTypeRegistry* typeRegistry = AppData()->TypeRegistry; Y_VERIFY(typeRegistry); - for (auto& column: baseTableDesrc.GetColumns()) { + for (auto& column: baseTableDescr.GetColumns()) { auto& columnName = column.GetName(); auto typeName = NMiniKQL::AdaptLegacyYqlType(column.GetType()); const NScheme::IType* type = typeRegistry->GetType(typeName); @@ -498,11 +498,11 @@ bool ExtractTypes(const NKikimrSchemeOp::TTableDescription& baseTableDesrc, TCol return true; } -bool ExtractTypes(const NSchemeShard::TTableInfo::TPtr& baseTableInfo, TColumnTypes& columsTypes, TString& explain) { +bool ExtractTypes(const NSchemeShard::TTableInfo::TPtr& baseTableInfo, TColumnTypes& columnsTypes, TString& explain) { Y_UNUSED(explain); for (const auto& [_, column] : baseTableInfo->Columns) { - columsTypes[column.Name] = column.PType; + columnsTypes[column.Name] = column.PType; } return true; diff --git a/ydb/core/tx/schemeshard/schemeshard_utils.h b/ydb/core/tx/schemeshard/schemeshard_utils.h index 2569be3e8af..4bdba6701eb 100644 --- a/ydb/core/tx/schemeshard/schemeshard_utils.h +++ b/ydb/core/tx/schemeshard/schemeshard_utils.h @@ -110,7 +110,7 @@ public: void Handle(TEvSchemeShard::TEvWakeupToMeasureSelfResponseTime::TPtr &ev, const TActorContext &ctx); void OnAnyEvent(const TActorContext &ctx); void DoSelfPing(const TActorContext &ctx); - void SheduleSelfPingWakeup(const TActorContext &ctx); + void ScheduleSelfPingWakeup(const TActorContext &ctx); private: const TTabletId TabletId; @@ -151,11 +151,11 @@ TIndexColumns ExtractInfo(const NKikimrSchemeOp::TIndexCreationConfig& indexDesc using TColumnTypes = THashMap<TString, NScheme::TTypeInfo>; -bool ExtractTypes(const NSchemeShard::TTableInfo::TPtr& baseTableInfo, TColumnTypes& columsTypes, TString& explain); -bool ExtractTypes(const NKikimrSchemeOp::TTableDescription& baseTableDesc, TColumnTypes& columsTypes, TString& explain); +bool ExtractTypes(const NSchemeShard::TTableInfo::TPtr& baseTableInfo, TColumnTypes& columnsTypes, TString& explain); +bool ExtractTypes(const NKikimrSchemeOp::TTableDescription& baseTableDesc, TColumnTypes& columnsTypes, TString& explain); bool IsCompatibleKeyTypes( - const TColumnTypes& baseTableColumsTypes, + const TColumnTypes& baseTableColumnsTypes, const TTableColumns& implTableColumns, bool uniformTable, TString& explain); @@ -170,7 +170,7 @@ bool CommonCheck(const TTableDesc& tableDesc, const NKikimrSchemeOp::TIndexCreat if (indexKeys.KeyColumns.empty()) { status = NKikimrScheme::EStatus::StatusInvalidParameter; - error = "No key colums in index creation config"; + error = "No key columns in index creation config"; return false; } @@ -200,9 +200,9 @@ bool CommonCheck(const TTableDesc& tableDesc, const NKikimrSchemeOp::TIndexCreat if (implTableColumns.Keys.size() > schemeLimits.MaxTableKeyColumns) { status = NKikimrScheme::EStatus::StatusSchemeError; error = TStringBuilder() - << "Too many keys indexed, index table reaches the limit of the maximum key colums count" - << ": indexing colums: " << indexKeys.KeyColumns.size() - << ", requested keys colums for index table: " << implTableColumns.Keys.size() + << "Too many keys indexed, index table reaches the limit of the maximum key columns count" + << ": indexing columns: " << indexKeys.KeyColumns.size() + << ", requested keys columns for index table: " << implTableColumns.Keys.size() << ", limit: " << schemeLimits.MaxTableKeyColumns; return false; } diff --git a/ydb/core/tx/schemeshard/ut_allocate_pq.cpp b/ydb/core/tx/schemeshard/ut_allocate_pq.cpp index 6db54cb71fa..5fa6d478226 100644 --- a/ydb/core/tx/schemeshard/ut_allocate_pq.cpp +++ b/ydb/core/tx/schemeshard/ut_allocate_pq.cpp @@ -49,7 +49,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardAllocatePQTest) { ); { - auto balancerDescr = GetDescibeFromPQBalancer(runtime, 9437197); + auto balancerDescr = GetDescribeFromPQBalancer(runtime, 9437197); TString expected = R"(TopicName: "PQGroup" Version: 2 Config { PartitionConfig { LifetimeSeconds: 10 } YdbDatabasePath: "/MyRoot" } PartitionPerTablet: 4 Partitions { Partition: 0 TabletId: 9437194 } Partitions { Partition: 1 TabletId: 9437194 } Partitions { Partition: 2 TabletId: 9437195 } Partitions { Partition: 3 TabletId: 9437194 } Partitions { Partition: 4 TabletId: 9437196 } Partitions { Partition: 5 TabletId: 9437195 } Partitions { Partition: 6 TabletId: 9437194 } Partitions { Partition: 7 TabletId: 9437195 } Partitions { Partition: 8 TabletId: 9437195 } Partitions { Partition: 9 TabletId: 9437196 } SchemeShardId: 8751008 BalancerTabletId: 9437197 SecurityObject: "\022\000")"; UNIT_ASSERT_NO_DIFF(expected, balancerDescr.ShortUtf8DebugString()); } @@ -110,7 +110,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardAllocatePQTest) { {NLs::CheckPartCount("PQGroup", 10, 4, 3, 10)}); { - auto balancerDescr = GetDescibeFromPQBalancer(runtime, 9437197); + auto balancerDescr = GetDescribeFromPQBalancer(runtime, 9437197); TString expected = R"(TopicName: "PQGroup" Version: 3 Config { PartitionConfig { LifetimeSeconds: 10 } YdbDatabasePath: "/MyRoot/Database" } PartitionPerTablet: 4 Partitions { Partition: 0 TabletId: 9437194 } Partitions { Partition: 1 TabletId: 9437194 } Partitions { Partition: 2 TabletId: 9437195 } Partitions { Partition: 3 TabletId: 9437194 } Partitions { Partition: 4 TabletId: 9437196 } Partitions { Partition: 5 TabletId: 9437195 } Partitions { Partition: 6 TabletId: 9437194 } Partitions { Partition: 7 TabletId: 9437195 } Partitions { Partition: 8 TabletId: 9437195 } Partitions { Partition: 9 TabletId: 9437196 } SchemeShardId: 9437198 BalancerTabletId: 9437197 SecurityObject: "\022\000")"; UNIT_ASSERT_NO_DIFF(expected, balancerDescr.ShortUtf8DebugString()); } diff --git a/ydb/core/tx/schemeshard/ut_allocate_reboot_pq.cpp b/ydb/core/tx/schemeshard/ut_allocate_reboot_pq.cpp index f9129e17cc5..9f3df2c99a6 100644 --- a/ydb/core/tx/schemeshard/ut_allocate_reboot_pq.cpp +++ b/ydb/core/tx/schemeshard/ut_allocate_reboot_pq.cpp @@ -95,7 +95,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardAllocatePQRebootTest) { { TInactiveZone inactive(activeZone); - auto balancerDescr = GetDescibeFromPQBalancer(runtime, 9437195); + auto balancerDescr = GetDescribeFromPQBalancer(runtime, 9437195); Cerr << balancerDescr.ShortUtf8DebugString(); TString expected = R"(TopicName: "PQGroup" Version: 1 Config { PartitionConfig { LifetimeSeconds: 10 } YdbDatabasePath: "/MyRoot/Database" } PartitionPerTablet: 10 Partitions { Partition: 0 TabletId: 9437194 } Partitions { Partition: 1 TabletId: 9437194 } Partitions { Partition: 2 TabletId: 9437194 } Partitions { Partition: 3 TabletId: 9437194 } Partitions { Partition: 4 TabletId: 9437194 } Partitions { Partition: 5 TabletId: 9437194 } Partitions { Partition: 6 TabletId: 9437194 } Partitions { Partition: 7 TabletId: 9437194 } Partitions { Partition: 8 TabletId: 9437194 } Partitions { Partition: 9 TabletId: 9437194 } SchemeShardId: 9437198 BalancerTabletId: 9437195 SecurityObject: "\022\000")"; UNIT_ASSERT_NO_DIFF(expected, balancerDescr.ShortUtf8DebugString()); diff --git a/ydb/core/tx/schemeshard/ut_async_index.cpp b/ydb/core/tx/schemeshard/ut_async_index.cpp index e49ce644856..97ae68c13c0 100644 --- a/ydb/core/tx/schemeshard/ut_async_index.cpp +++ b/ydb/core/tx/schemeshard/ut_async_index.cpp @@ -40,7 +40,7 @@ Y_UNIT_TEST_SUITE(TAsyncIndexTests) { )"); env.TestWaitNotification(runtime, txId); - TestBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", TBuildIndexConfig{ + TestBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", TBuildIndexConfig{ "UserDefinedIndex", NKikimrSchemeOp::EIndexTypeGlobalAsync, {"indexed"}, {} }); env.TestWaitNotification(runtime, txId); diff --git a/ydb/core/tx/schemeshard/ut_base.cpp b/ydb/core/tx/schemeshard/ut_base.cpp index 16fc52e7837..7d3f2bb600d 100644 --- a/ydb/core/tx/schemeshard/ut_base.cpp +++ b/ydb/core/tx/schemeshard/ut_base.cpp @@ -191,20 +191,20 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { input.ApplyDiff(diff); { - NACLib::TACL connonic; - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "2@staff", NACLib::InheritObject); - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "4@staff", NACLib::InheritOnly); - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "5@staff", NACLib::InheritObject | NACLib::InheritOnly); - - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::ConnectDatabase, "1@staff", NACLib::InheritNone); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "3@staff", NACLib::InheritContainer); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "6@staff", NACLib::InheritContainer | NACLib::InheritOnly); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer | NACLib::InheritOnly); - - Cerr << "canonic: " << connonic.DebugString() << Endl; + NACLib::TACL canonic; + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "2@staff", NACLib::InheritObject); + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "4@staff", NACLib::InheritOnly); + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "5@staff", NACLib::InheritObject | NACLib::InheritOnly); + + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::ConnectDatabase, "1@staff", NACLib::InheritNone); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "3@staff", NACLib::InheritContainer); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "6@staff", NACLib::InheritContainer | NACLib::InheritOnly); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer | NACLib::InheritOnly); + + Cerr << "canonic: " << canonic.DebugString() << Endl; Cerr << "result: " << input.DebugString() << Endl; - UNIT_ASSERT_NO_DIFF(connonic.DebugString(), input.DebugString()); + UNIT_ASSERT_NO_DIFF(canonic.DebugString(), input.DebugString()); } Y_ASSERT(!firstACL); @@ -216,46 +216,46 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { // InheritOnly is not filtered from self effective. // Record with InheritOnly doesn't counted at CheckAccess // InheritOnly flag is eliminated on inheriting - NACLib::TACL connonic; - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "2@staff", NACLib::InheritObject); - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "4@staff", NACLib::InheritOnly); - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "5@staff", NACLib::InheritObject | NACLib::InheritOnly); + NACLib::TACL canonic; + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "2@staff", NACLib::InheritObject); + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "4@staff", NACLib::InheritOnly); + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "5@staff", NACLib::InheritObject | NACLib::InheritOnly); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::ConnectDatabase, "1@staff", NACLib::InheritNone); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "3@staff", NACLib::InheritContainer); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "6@staff", NACLib::InheritContainer | NACLib::InheritOnly); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer | NACLib::InheritOnly); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::ConnectDatabase, "1@staff", NACLib::InheritNone); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "3@staff", NACLib::InheritContainer); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "6@staff", NACLib::InheritContainer | NACLib::InheritOnly); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer | NACLib::InheritOnly); - Cerr << "canonic: " << connonic.DebugString() << Endl; + Cerr << "canonic: " << canonic.DebugString() << Endl; Cerr << "result: " << NACLib::TACL(firstACL.GetForSelf()).DebugString() << Endl; - UNIT_ASSERT_NO_DIFF(connonic.DebugString(), NACLib::TACL(firstACL.GetForSelf()).DebugString()); + UNIT_ASSERT_NO_DIFF(canonic.DebugString(), NACLib::TACL(firstACL.GetForSelf()).DebugString()); } { - NACLib::TACL connonic; - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "3@staff", NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "6@staff", NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); + NACLib::TACL canonic; + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "3@staff", NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "6@staff", NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); - Cerr << "canonic: " << connonic.DebugString() << Endl; + Cerr << "canonic: " << canonic.DebugString() << Endl; Cerr << "result: " << NACLib::TACL(firstACL.GetForChildren(/*isContainer=*/ true)).DebugString() << Endl; - UNIT_ASSERT_NO_DIFF(connonic.DebugString(), NACLib::TACL(firstACL.GetForChildren(/*isContainer=*/ true)).DebugString()); + UNIT_ASSERT_NO_DIFF(canonic.DebugString(), NACLib::TACL(firstACL.GetForChildren(/*isContainer=*/ true)).DebugString()); } { - NACLib::TACL connonic; - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "2@staff", NACLib::InheritObject); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "5@staff", NACLib::InheritObject); connonic.MutableACE()->rbegin()->SetInherited(true); + NACLib::TACL canonic; + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "2@staff", NACLib::InheritObject); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "5@staff", NACLib::InheritObject); canonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); - Cerr << "canonic: " << connonic.DebugString() << Endl; + Cerr << "canonic: " << canonic.DebugString() << Endl; Cerr << "result: " << NACLib::TACL(firstACL.GetForChildren(/*isContainer=*/ false)).DebugString() << Endl; - UNIT_ASSERT_NO_DIFF(connonic.DebugString(), NACLib::TACL(firstACL.GetForChildren(/*isContainer=*/ false)).DebugString()); + UNIT_ASSERT_NO_DIFF(canonic.DebugString(), NACLib::TACL(firstACL.GetForChildren(/*isContainer=*/ false)).DebugString()); } { @@ -281,59 +281,59 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { } { - NACLib::TACL connonic; - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "22@staff", NACLib::InheritObject); - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "44@staff", NACLib::InheritOnly); - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "55@staff", NACLib::InheritObject | NACLib::InheritOnly); + NACLib::TACL canonic; + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "22@staff", NACLib::InheritObject); + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "44@staff", NACLib::InheritOnly); + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "55@staff", NACLib::InheritObject | NACLib::InheritOnly); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "3@staff", NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "6@staff", NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "3@staff", NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "6@staff", NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "00@staff"); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::ConnectDatabase, "11@staff", NACLib::InheritNone); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "33@staff", NACLib::InheritContainer); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "66@staff", NACLib::InheritContainer | NACLib::InheritOnly); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "77@staff", NACLib::InheritObject | NACLib::InheritContainer | NACLib::InheritOnly); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "00@staff"); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::ConnectDatabase, "11@staff", NACLib::InheritNone); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "33@staff", NACLib::InheritContainer); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "66@staff", NACLib::InheritContainer | NACLib::InheritOnly); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "77@staff", NACLib::InheritObject | NACLib::InheritContainer | NACLib::InheritOnly); - Cerr << "canonic: " << connonic.DebugString() << Endl; + Cerr << "canonic: " << canonic.DebugString() << Endl; Cerr << "result: " << NACLib::TACL(secondACL.GetForSelf()).DebugString() << Endl; - UNIT_ASSERT_NO_DIFF(connonic.DebugString(), NACLib::TACL(secondACL.GetForSelf()).DebugString()); + UNIT_ASSERT_NO_DIFF(canonic.DebugString(), NACLib::TACL(secondACL.GetForSelf()).DebugString()); } { - NACLib::TACL connonic; - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "3@staff", NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "6@staff", NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); - - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "00@staff"); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "33@staff", NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "66@staff", NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "77@staff", NACLib::InheritObject | NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); - - Cerr << "canonic: " << connonic.DebugString() << Endl; + NACLib::TACL canonic; + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "3@staff", NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "6@staff", NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); + + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "00@staff"); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "33@staff", NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "66@staff", NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "77@staff", NACLib::InheritObject | NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); + + Cerr << "canonic: " << canonic.DebugString() << Endl; Cerr << "result: " << NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ true)).DebugString() << Endl; - UNIT_ASSERT_NO_DIFF(connonic.DebugString(), NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ true)).DebugString()); + UNIT_ASSERT_NO_DIFF(canonic.DebugString(), NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ true)).DebugString()); } { - NACLib::TACL connonic; - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "22@staff", NACLib::InheritObject); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "55@staff", NACLib::InheritObject); connonic.MutableACE()->rbegin()->SetInherited(true); + NACLib::TACL canonic; + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "22@staff", NACLib::InheritObject); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "55@staff", NACLib::InheritObject); canonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "00@staff"); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "77@staff", NACLib::InheritObject | NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "00@staff"); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "77@staff", NACLib::InheritObject | NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); - Cerr << "canonic: " << connonic.DebugString() << Endl; + Cerr << "canonic: " << canonic.DebugString() << Endl; Cerr << "result: " << NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ false)).DebugString() << Endl; - UNIT_ASSERT_NO_DIFF(connonic.DebugString(), NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ false)).DebugString()); + UNIT_ASSERT_NO_DIFF(canonic.DebugString(), NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ false)).DebugString()); } } @@ -360,60 +360,60 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { } { - NACLib::TACL connonic; - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "2@staff", NACLib::InheritObject); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "5@staff", NACLib::InheritObject); connonic.MutableACE()->rbegin()->SetInherited(true); + NACLib::TACL canonic; + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "2@staff", NACLib::InheritObject); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "5@staff", NACLib::InheritObject); canonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "22@staff", NACLib::InheritObject); - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "44@staff", NACLib::InheritOnly); - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "55@staff", NACLib::InheritObject | NACLib::InheritOnly); + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "22@staff", NACLib::InheritObject); + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "44@staff", NACLib::InheritOnly); + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "55@staff", NACLib::InheritObject | NACLib::InheritOnly); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "00@staff"); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::ConnectDatabase, "11@staff", NACLib::InheritNone); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "33@staff", NACLib::InheritContainer); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "66@staff", NACLib::InheritContainer | NACLib::InheritOnly); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "77@staff", NACLib::InheritObject | NACLib::InheritContainer | NACLib::InheritOnly); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "00@staff"); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::ConnectDatabase, "11@staff", NACLib::InheritNone); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "33@staff", NACLib::InheritContainer); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "66@staff", NACLib::InheritContainer | NACLib::InheritOnly); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "77@staff", NACLib::InheritObject | NACLib::InheritContainer | NACLib::InheritOnly); - Cerr << "canonic: " << connonic.DebugString() << Endl; + Cerr << "canonic: " << canonic.DebugString() << Endl; Cerr << "result: " << NACLib::TACL(secondACL.GetForSelf()).DebugString() << Endl; - UNIT_ASSERT_NO_DIFF(connonic.DebugString(), NACLib::TACL(secondACL.GetForSelf()).DebugString()); + UNIT_ASSERT_NO_DIFF(canonic.DebugString(), NACLib::TACL(secondACL.GetForSelf()).DebugString()); } { - NACLib::TACL connonic; - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); + NACLib::TACL canonic; + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "00@staff"); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "33@staff", NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "66@staff", NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "77@staff", NACLib::InheritObject | NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "00@staff"); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "33@staff", NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "66@staff", NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "77@staff", NACLib::InheritObject | NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); - Cerr << "canonic: " << connonic.DebugString() << Endl; + Cerr << "canonic: " << canonic.DebugString() << Endl; Cerr << "result: " << NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ true)).DebugString() << Endl; - UNIT_ASSERT_NO_DIFF(connonic.DebugString(), NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ true)).DebugString()); + UNIT_ASSERT_NO_DIFF(canonic.DebugString(), NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ true)).DebugString()); } { - NACLib::TACL connonic; - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "2@staff", NACLib::InheritObject); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "5@staff", NACLib::InheritObject); connonic.MutableACE()->rbegin()->SetInherited(true); + NACLib::TACL canonic; + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "2@staff", NACLib::InheritObject); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "5@staff", NACLib::InheritObject); canonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "22@staff", NACLib::InheritObject); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "55@staff", NACLib::InheritObject); connonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "22@staff", NACLib::InheritObject); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "55@staff", NACLib::InheritObject); canonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "00@staff"); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "77@staff", NACLib::InheritObject | NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "00@staff"); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "77@staff", NACLib::InheritObject | NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); - Cerr << "canonic: " << connonic.DebugString() << Endl; + Cerr << "canonic: " << canonic.DebugString() << Endl; Cerr << "result: " << NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ false)).DebugString() << Endl; - UNIT_ASSERT_NO_DIFF(connonic.DebugString(), NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ false)).DebugString()); + UNIT_ASSERT_NO_DIFF(canonic.DebugString(), NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ false)).DebugString()); } } @@ -427,40 +427,40 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { Y_ASSERT(secondACL); { - NACLib::TACL connonic; - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "3@staff", NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "6@staff", NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); + NACLib::TACL canonic; + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "3@staff", NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "6@staff", NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); - Cerr << "canonic: " << connonic.DebugString() << Endl; + Cerr << "canonic: " << canonic.DebugString() << Endl; Cerr << "result: " << NACLib::TACL(secondACL.GetForSelf()).DebugString() << Endl; - UNIT_ASSERT_NO_DIFF(connonic.DebugString(), NACLib::TACL(secondACL.GetForSelf()).DebugString()); + UNIT_ASSERT_NO_DIFF(canonic.DebugString(), NACLib::TACL(secondACL.GetForSelf()).DebugString()); } { - NACLib::TACL connonic; - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "3@staff", NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "6@staff", NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); + NACLib::TACL canonic; + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "3@staff", NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "6@staff", NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); - Cerr << "canonic: " << connonic.DebugString() << Endl; + Cerr << "canonic: " << canonic.DebugString() << Endl; Cerr << "result: " << NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ true)).DebugString() << Endl; - UNIT_ASSERT_NO_DIFF(connonic.DebugString(), NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ true)).DebugString()); + UNIT_ASSERT_NO_DIFF(canonic.DebugString(), NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ true)).DebugString()); } { - NACLib::TACL connonic; - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "2@staff", NACLib::InheritObject); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "5@staff", NACLib::InheritObject); connonic.MutableACE()->rbegin()->SetInherited(true); + NACLib::TACL canonic; + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "2@staff", NACLib::InheritObject); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "5@staff", NACLib::InheritObject); canonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); - Cerr << "canonic: " << connonic.DebugString() << Endl; + Cerr << "canonic: " << canonic.DebugString() << Endl; Cerr << "result: " << NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ false)).DebugString() << Endl; - UNIT_ASSERT_NO_DIFF(connonic.DebugString(), NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ false)).DebugString()); + UNIT_ASSERT_NO_DIFF(canonic.DebugString(), NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ false)).DebugString()); } } @@ -474,40 +474,40 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { Y_ASSERT(secondACL); { - NACLib::TACL connonic; - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "2@staff", NACLib::InheritObject); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "5@staff", NACLib::InheritObject); connonic.MutableACE()->rbegin()->SetInherited(true); + NACLib::TACL canonic; + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "2@staff", NACLib::InheritObject); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "5@staff", NACLib::InheritObject); canonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); - Cerr << "canonic: " << connonic.DebugString() << Endl; + Cerr << "canonic: " << canonic.DebugString() << Endl; Cerr << "result: " << NACLib::TACL(secondACL.GetForSelf()).DebugString() << Endl; - UNIT_ASSERT_NO_DIFF(connonic.DebugString(), NACLib::TACL(secondACL.GetForSelf()).DebugString()); } + UNIT_ASSERT_NO_DIFF(canonic.DebugString(), NACLib::TACL(secondACL.GetForSelf()).DebugString()); } { - NACLib::TACL connonic; - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "3@staff", NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "6@staff", NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); + NACLib::TACL canonic; + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "3@staff", NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "6@staff", NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); - Cerr << "canonic: " << connonic.DebugString() << Endl; + Cerr << "canonic: " << canonic.DebugString() << Endl; Cerr << "result: " << NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ true)).DebugString() << Endl; - UNIT_ASSERT_NO_DIFF(connonic.DebugString(), NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ true)).DebugString()); + UNIT_ASSERT_NO_DIFF(canonic.DebugString(), NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ true)).DebugString()); } { - NACLib::TACL connonic; - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "2@staff", NACLib::InheritObject); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "5@staff", NACLib::InheritObject); connonic.MutableACE()->rbegin()->SetInherited(true); + NACLib::TACL canonic; + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericUse, "2@staff", NACLib::InheritObject); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Deny, NACLib::GenericRead, "5@staff", NACLib::InheritObject); canonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); connonic.MutableACE()->rbegin()->SetInherited(true); - connonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); connonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericUse, "0@staff"); canonic.MutableACE()->rbegin()->SetInherited(true); + canonic.AddAccess(NACLib::EAccessType::Allow, NACLib::GenericRead, "7@staff", NACLib::InheritObject | NACLib::InheritContainer); canonic.MutableACE()->rbegin()->SetInherited(true); - Cerr << "canonic: " << connonic.DebugString() << Endl; + Cerr << "canonic: " << canonic.DebugString() << Endl; Cerr << "result: " << NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ false)).DebugString() << Endl; - UNIT_ASSERT_NO_DIFF(connonic.DebugString(), NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ false)).DebugString()); + UNIT_ASSERT_NO_DIFF(canonic.DebugString(), NACLib::TACL(secondACL.GetForChildren(/*isContainer=*/ false)).DebugString()); } } @@ -1700,7 +1700,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { )"); env.TestWaitNotification(runtime, txId); - //simonteniously + //simultaneously AsyncDropTable(runtime, ++txId, "/MyRoot/DirA", "dst1"); AsyncDropTable(runtime, ++txId, "/MyRoot/DirA", "dst2"); AsyncConsistentCopyTables(runtime, ++txId, "/", R"( @@ -2315,7 +2315,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { env.TestWaitTabletDeletion(runtime, xrange(TTestTxConfig::FakeHiveTablets, TTestTxConfig::FakeHiveTablets + 5)); } - Y_UNIT_TEST(CreateIndexedTableAndForceDropSimonteniously) { //+ + Y_UNIT_TEST(CreateIndexedTableAndForceDropSimultaneously) { //+ TTestBasicRuntime runtime; TTestEnv env(runtime); ui64 txId = 100; @@ -2357,7 +2357,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { env.TestWaitTabletDeletion(runtime, xrange(TTestTxConfig::FakeHiveTablets, TTestTxConfig::FakeHiveTablets + 5)); } - Y_UNIT_TEST(DropIndexedTableAndForceDropSimonteniously) { //+ + Y_UNIT_TEST(DropIndexedTableAndForceDropSimultaneously) { //+ TTestBasicRuntime runtime; TTestEnv env(runtime); ui64 txId = 100; @@ -2524,7 +2524,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { NLs::ShardsInsideDomain(20)}); } - Y_UNIT_TEST(CreateTableWithSplitBounadaries) { //+ + Y_UNIT_TEST(CreateTableWithSplitBoundaries) { //+ TTestBasicRuntime runtime; TTestEnv env(runtime); ui64 txId = 123; @@ -2868,7 +2868,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { // Try to Copy over existing table TestCopyTable(runtime, ++txId, "/MyRoot", "Table", "/MyRoot/NewTable", NKikimrScheme::StatusAlreadyExists); - // Try to Copy over exisitng dir + // Try to Copy over existing dir AsyncMkDir(runtime, ++txId, "/MyRoot", "Dir"); AsyncCopyTable(runtime, ++txId, "/MyRoot", "Dir", "/MyRoot/Table"); TestModificationResult(runtime, txId-1, NKikimrScheme::StatusAccepted); @@ -3364,7 +3364,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { CopyFromTable: "/MyRoot/Table")"); env.TestWaitNotification(runtime, txId); - auto checher = [] (NKikimrSchemeOp::EColumnCache cacheType, size_t families = 1) { + auto checker = [] (NKikimrSchemeOp::EColumnCache cacheType, size_t families = 1) { return [=] (const NKikimrSchemeOp::TTableDescription& tableDescription) { auto partConfig = tableDescription.GetPartitionConfig(); Cdbg << "-----------" << Endl << partConfig.DebugString() << "\n~~~~~~\n" << Endl; @@ -3383,25 +3383,25 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { // /Root/Table for (ui64 tabletId : {TTestTxConfig::FakeHiveTablets, TTestTxConfig::FakeHiveTablets+1, TTestTxConfig::FakeHiveTablets+2}) { NKikimrSchemeOp::TTableDescription tableDescription = GetDatashardSchema(runtime, tabletId, 2); - checher(NKikimrSchemeOp::EColumnCache::ColumnCacheEver)(tableDescription); + checker(NKikimrSchemeOp::EColumnCache::ColumnCacheEver)(tableDescription); } // /Root/CopyTable for (ui64 tabletId : {TTestTxConfig::FakeHiveTablets+3, TTestTxConfig::FakeHiveTablets+4, TTestTxConfig::FakeHiveTablets+5}) { NKikimrSchemeOp::TTableDescription tableDescription = GetDatashardSchema(runtime, tabletId, 3); - checher(NKikimrSchemeOp::EColumnCache::ColumnCacheOnce)(tableDescription); + checker(NKikimrSchemeOp::EColumnCache::ColumnCacheOnce)(tableDescription); } // /Root/CopyTable2 for (ui64 tabletId : {TTestTxConfig::FakeHiveTablets+6, TTestTxConfig::FakeHiveTablets+7, TTestTxConfig::FakeHiveTablets+8}) { NKikimrSchemeOp::TTableDescription tableDescription = GetDatashardSchema(runtime, tabletId, 4); - checher(NKikimrSchemeOp::EColumnCache::ColumnCacheNone, 2)(tableDescription); + checker(NKikimrSchemeOp::EColumnCache::ColumnCacheNone, 2)(tableDescription); } // /Root/CopyTable3 for (ui64 tabletId : {TTestTxConfig::FakeHiveTablets+9, TTestTxConfig::FakeHiveTablets+10, TTestTxConfig::FakeHiveTablets+11}) { NKikimrSchemeOp::TTableDescription tableDescription = GetDatashardSchema(runtime, tabletId, 5); - checher(NKikimrSchemeOp::EColumnCache::ColumnCacheEver)(tableDescription); + checker(NKikimrSchemeOp::EColumnCache::ColumnCacheEver)(tableDescription); } auto descrChecker = [] (size_t families) { @@ -4901,7 +4901,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { } } - Y_UNIT_TEST(DefaulColumnFamiliesWithNonCanonicName) { //+ + Y_UNIT_TEST(DefaultColumnFamiliesWithNonCanonicName) { //+ TTestBasicRuntime runtime; TTestEnv env(runtime); ui64 txId = 100; @@ -5347,14 +5347,14 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { }); } - NLs::TCheckFunc CheckCompactionPolicy(NKikimr::NLocalDb::TCompactionPolicyPtr expecedPolicy) { + NLs::TCheckFunc CheckCompactionPolicy(NKikimr::NLocalDb::TCompactionPolicyPtr expectedPolicy) { return [=] (const NKikimrScheme::TEvDescribeSchemeResult& describeRec) { NKikimr::NLocalDb::TCompactionPolicy realPolicy(describeRec.GetPathDescription().GetTable().GetPartitionConfig().GetCompactionPolicy()); - UNIT_ASSERT(realPolicy == *expecedPolicy); + UNIT_ASSERT(realPolicy == *expectedPolicy); }; } - Y_UNIT_TEST(AlterTableComapctionPolicy) { //+ + Y_UNIT_TEST(AlterTableCompactionPolicy) { //+ TTestBasicRuntime runtime; TTestEnv env(runtime); ui64 txId = 100; @@ -6010,7 +6010,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { checkSchema({ 0, 1, 2 }, { "Key", "Value" }); - // Alter table adding more volumns + // Alter table adding more volumes TestAlterTable(runtime, ++txId, "/MyRoot", R"( Name: "Table1" Columns { Name: "Add1" Type: "Uint32" } @@ -7187,7 +7187,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { TTestEnv env(runtime); ui64 txId = 123; - auto tableDesrc = [=] (const TString& name) { + auto tableDescr = [=] (const TString& name) { return Sprintf(R"(Name: "%s" Columns { Name: "RowId" Type: "Uint64" } KeyColumnNames: ["RowId"] @@ -7198,16 +7198,16 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { env.TestWaitNotification(runtime, txId); TestMkDir(runtime, ++txId, "/MyRoot", "DirA", {NKikimrScheme::StatusAlreadyExists}); - TestCreateTable(runtime, ++txId, "/MyRoot", tableDesrc("DirA"), {NKikimrScheme::StatusNameConflict}); + TestCreateTable(runtime, ++txId, "/MyRoot", tableDescr("DirA"), {NKikimrScheme::StatusNameConflict}); TestMkDir(runtime, ++txId, "/MyRoot/DirA/SubDirA", "AAA", {NKikimrScheme::StatusPathDoesNotExist}); - AsyncCreateTable(runtime, ++txId, "/MyRoot/DirA", tableDesrc("Table1")); - AsyncCreateTable(runtime, ++txId, "/MyRoot/DirA/", tableDesrc("Table1")); + AsyncCreateTable(runtime, ++txId, "/MyRoot/DirA", tableDescr("Table1")); + AsyncCreateTable(runtime, ++txId, "/MyRoot/DirA/", tableDescr("Table1")); TestModificationResult(runtime, txId-1, NKikimrScheme::StatusAccepted); TestModificationResult(runtime, txId, NKikimrScheme::StatusMultipleModifications); env.TestWaitNotification(runtime, {txId, txId-1}); - TestCreateTable(runtime, ++txId, "/MyRoot/DirA/", tableDesrc("Table1"), {NKikimrScheme::StatusAlreadyExists}); + TestCreateTable(runtime, ++txId, "/MyRoot/DirA/", tableDescr("Table1"), {NKikimrScheme::StatusAlreadyExists}); TestMkDir(runtime, ++txId, "/MyRoot/DirA", "Table1", {NKikimrScheme::StatusNameConflict}); TestMkDir(runtime, ++txId, "/MyRoot/DirA/Table1", "CCC", {NKikimrScheme::StatusPathIsNotDirectory}); @@ -7219,9 +7219,9 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { {NLs::IsTable, NLs::Finished}); - TestCreateTable(runtime, ++txId, "/MyRoot/DirA", tableDesrc("/WrongPath"), {NKikimrScheme::StatusSchemeError}); - TestCreateTable(runtime, ++txId, "/MyRoot/DirA", tableDesrc("WrongPath/"), {NKikimrScheme::StatusSchemeError}); - TestCreateTable(runtime, ++txId, "/MyRoot/DirA", tableDesrc("Table1/WrongPath"), {NKikimrScheme::StatusPathIsNotDirectory}); + TestCreateTable(runtime, ++txId, "/MyRoot/DirA", tableDescr("/WrongPath"), {NKikimrScheme::StatusSchemeError}); + TestCreateTable(runtime, ++txId, "/MyRoot/DirA", tableDescr("WrongPath/"), {NKikimrScheme::StatusSchemeError}); + TestCreateTable(runtime, ++txId, "/MyRoot/DirA", tableDescr("Table1/WrongPath"), {NKikimrScheme::StatusPathIsNotDirectory}); } Y_UNIT_TEST(SchemeErrors) { //+ @@ -7367,26 +7367,26 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { {NLs::Finished}); } - class TSuppresPlanStepObserver : public TNonCopyable { + class TSuppressPlanStepObserver : public TNonCopyable { public: - typedef std::function<void(TTestActorRuntime& runtime, bool& suppres)> TEventInjection; + typedef std::function<void(TTestActorRuntime& runtime, bool& suppress)> TEventInjection; private: ui64 Coordinator; ui64 Shard; - TEventInjection InjectionUnderSuppres; + TEventInjection InjectionUnderSuppress; bool Injected; - bool Suppres; + bool Suppress; public: - TSuppresPlanStepObserver(ui64 fromCoordinator, + TSuppressPlanStepObserver(ui64 fromCoordinator, ui64 toShard, TEventInjection injection) : Coordinator(fromCoordinator) , Shard(toShard) - , InjectionUnderSuppres(injection) + , InjectionUnderSuppress(injection) , Injected(false) - , Suppres(true) + , Suppress(true) { } @@ -7421,11 +7421,11 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { if (!Injected) { Cerr << "!Do injection!\n"; Injected = true; - InjectionUnderSuppres(runtime, Suppres); + InjectionUnderSuppress(runtime, Suppress); Cerr << "!Do injection DONE!\n"; } - if (Suppres) { + if (Suppress) { Cerr << "!Suppress planStep event!\n"; return TTestActorRuntime::EEventAction::DROP; } @@ -9199,7 +9199,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { } } - Y_UNIT_TEST(SimultaneousDropFroceDrop) { //+ + Y_UNIT_TEST(SimultaneousDropForceDrop) { //+ TTestBasicRuntime runtime; TTestEnv env(runtime); ui64 txId = 100; @@ -9587,7 +9587,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { } )", {NKikimrScheme::StatusInvalidParameter}); - // Drop the table and wait for everytTFamilyDescriptionhing to be cleaned up + // Drop the table and wait for every TFamilyDescription to be cleaned up TestDropTable(runtime, ++txId, "/MyRoot/USER_0", "Table"); env.TestWaitNotification(runtime, txId); env.TestWaitTabletDeletion(runtime, xrange(TTestTxConfig::FakeHiveTablets+2, TTestTxConfig::FakeHiveTablets+10)); @@ -9876,20 +9876,20 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { TTestEnv env(runtime); ui64 txId = 100; - TVector<THolder<IEventHandle>> supressed; - auto defOberver = SetSuppressObserver(runtime, supressed, TEvTxProcessing::EvPlanStep); + TVector<THolder<IEventHandle>> suppressed; + auto defObserver = SetSuppressObserver(runtime, suppressed, TEvTxProcessing::EvPlanStep); TestMkDir(runtime, ++txId, "/MyRoot", "Dir"); - WaitForSuppressed(runtime, supressed, 1, defOberver); + WaitForSuppressed(runtime, suppressed, 1, defObserver); TestDescribeResult(DescribePath(runtime, "/MyRoot/Dir"), {NLs::NotFinished, NLs::PathVersionEqual(2), NLs::ChildrenCount(0)}); - for (auto &msg : supressed) { + for (auto &msg : suppressed) { runtime.Send(msg.Release()); } - supressed.clear(); + suppressed.clear(); env.TestWaitNotification(runtime, txId); @@ -9904,8 +9904,8 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { TTestEnv env(runtime); ui64 txId = 100; - TVector<THolder<IEventHandle>> supressed; - auto defOberver = SetSuppressObserver(runtime, supressed, TEvTxProcessing::EvPlanStep); + TVector<THolder<IEventHandle>> suppressed; + auto defObserver = SetSuppressObserver(runtime, suppressed, TEvTxProcessing::EvPlanStep); TestCreateIndexedTable(runtime, ++txId, "/MyRoot", R"( TableDescription { @@ -9920,7 +9920,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { Type: EIndexTypeGlobalAsync } )"); - WaitForSuppressed(runtime, supressed, 1, defOberver); + WaitForSuppressed(runtime, suppressed, 1, defObserver); TestDescribeResult(DescribePath(runtime, "/MyRoot"), {NLs::Finished, @@ -9948,10 +9948,10 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { NLs::PathVersionEqual(1), NLs::ChildrenCount(0)}); - for (auto &msg : supressed) { + for (auto &msg : suppressed) { runtime.Send(msg.Release()); } - supressed.clear(); + suppressed.clear(); env.TestWaitNotification(runtime, txId); @@ -10014,10 +10014,10 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { fnWriteRow(TTestTxConfig::FakeHiveTablets, 0); } - TestBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table1", "Sync", {"value"}); + TestBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table1", "Sync", {"value"}); env.TestWaitNotification(runtime, txId, TTestTxConfig::SchemeShard); - auto descr = TestGetBuilIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", txId); + auto descr = TestGetBuildIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", txId); Y_ASSERT(descr.GetIndexBuild().GetState() == Ydb::Table::IndexBuildState::STATE_DONE); TestCopyTable(runtime, ++txId, "/MyRoot", "Copy1", "/MyRoot/Table1"); @@ -10098,8 +10098,8 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { env.TestWaitNotification(runtime, txId); { - TVector<THolder<IEventHandle>> supressed; - auto defOberver = SetSuppressObserver(runtime, supressed, TEvDataShard::EvInitSplitMergeDestination); + TVector<THolder<IEventHandle>> suppressed; + auto defObserver = SetSuppressObserver(runtime, suppressed, TEvDataShard::EvInitSplitMergeDestination); ++txId; TestSplitTable(runtime, 103, "/MyRoot/Table", R"( @@ -10115,12 +10115,12 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { Columns { Name: "add_1" Type: "Uint32"} )"); - WaitForSuppressed(runtime, supressed, 2, defOberver); + WaitForSuppressed(runtime, suppressed, 2, defObserver); } { - TVector<THolder<IEventHandle>> supressed; - auto defOberver = SetSuppressObserver(runtime, supressed, TEvTxProcessing::EvPlanStep); + TVector<THolder<IEventHandle>> suppressed; + auto defObserver = SetSuppressObserver(runtime, suppressed, TEvTxProcessing::EvPlanStep); RebootTablet(runtime, TTestTxConfig::SchemeShard, runtime.AllocateEdgeActor()); @@ -10132,7 +10132,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { DstPath: "/MyRoot/copy" })", {NKikimrScheme::StatusMultipleModifications}); - WaitForSuppressed(runtime, supressed, 3, defOberver); + WaitForSuppressed(runtime, suppressed, 3, defObserver); } } @@ -10205,15 +10205,15 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { NLs::PathVersionEqual(3)}); { - TestBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/table", "indexByValue", {"value"}); - ui64 builIndexId = txId; + TestBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/table", "indexByValue", {"value"}); + ui64 buildIndexId = txId; - auto listing = TestListBuilIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot"); + auto listing = TestListBuildIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot"); Y_ASSERT(listing.EntriesSize() == 1); - env.TestWaitNotification(runtime, builIndexId, TTestTxConfig::SchemeShard); + env.TestWaitNotification(runtime, buildIndexId, TTestTxConfig::SchemeShard); - auto descr = TestGetBuilIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", builIndexId); + auto descr = TestGetBuildIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", buildIndexId); Y_ASSERT(descr.GetIndexBuild().GetState() == Ydb::Table::IndexBuildState::STATE_DONE); } @@ -10327,7 +10327,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { bool itIsEnough = false; - auto desrc = DescribePath(runtime, "/MyRoot/table/indexByValue/indexImplTable", true, true, true); + auto descr = DescribePath(runtime, "/MyRoot/table/indexByValue/indexImplTable", true, true, true); NLs::TCheckFunc checkPartitionCount = [&] (const NKikimrScheme::TEvDescribeSchemeResult& record) { if (record.GetPathDescription().TablePartitionsSize() == 1) { @@ -10335,13 +10335,13 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) { } }; - auto pathVersion = TestDescribeResult(desrc, {checkPartitionCount}); + auto pathVersion = TestDescribeResult(descr, {checkPartitionCount}); if (itIsEnough) { break; } - for (const auto& tPart: desrc.GetPathDescription().GetTablePartitions()) { + for (const auto& tPart: descr.GetPathDescription().GetTablePartitions()) { TActorId sender = runtime.AllocateEdgeActor(); auto evTx = new TEvDataShard::TEvCompactBorrowed(pathVersion.PathId); ForwardToTablet(runtime, tPart.GetDatashardId(), sender, evTx); diff --git a/ydb/core/tx/schemeshard/ut_base_reboots.cpp b/ydb/core/tx/schemeshard/ut_base_reboots.cpp index 704df1911da..89d0fe9b8d5 100644 --- a/ydb/core/tx/schemeshard/ut_base_reboots.cpp +++ b/ydb/core/tx/schemeshard/ut_base_reboots.cpp @@ -915,7 +915,7 @@ Y_UNIT_TEST_SUITE(TTablesWithReboots) { }); } - Y_UNIT_TEST(SimultaneousDropFroceDrop) { //+ + Y_UNIT_TEST(SimultaneousDropForceDrop) { //+ TTestWithReboots t; t.Run([&](TTestActorRuntime& runtime, bool& activeZone) { TestCreateTable(runtime, ++t.TxId, "/MyRoot", R"( diff --git a/ydb/core/tx/schemeshard/ut_compaction.cpp b/ydb/core/tx/schemeshard/ut_compaction.cpp index b18b6e8d0c3..d0357ca3a7b 100644 --- a/ydb/core/tx/schemeshard/ut_compaction.cpp +++ b/ydb/core/tx/schemeshard/ut_compaction.cpp @@ -1338,7 +1338,7 @@ Y_UNIT_TEST_SUITE(TSchemeshardCompactionQueueTest) { UNIT_ASSERT_VALUES_EQUAL(queue.Size(), 0UL); } - Y_UNIT_TEST(EnqueuBelowSearchHeightThreshold) { + Y_UNIT_TEST(EnqueueBelowSearchHeightThreshold) { TCompactionQueueImpl::TConfig config; config.SearchHeightThreshold = 10; config.RowDeletesThreshold = 10; diff --git a/ydb/core/tx/schemeshard/ut_helpers/helpers.cpp b/ydb/core/tx/schemeshard/ut_helpers/helpers.cpp index 763ca1875be..bcbc7ba1735 100644 --- a/ydb/core/tx/schemeshard/ut_helpers/helpers.cpp +++ b/ydb/core/tx/schemeshard/ut_helpers/helpers.cpp @@ -1382,7 +1382,7 @@ namespace NSchemeShardUT_Private { return d.GetByKeyFilter(); } } - UNIT_ASSERT_C(false, "ByKeyFilte delta record not found"); + UNIT_ASSERT_C(false, "ByKeyFilter delta record not found"); return false; } @@ -1446,7 +1446,7 @@ namespace NSchemeShardUT_Private { } - TString EscapedDoubleQoute(const TString src) { + TString EscapedDoubleQuote(const TString src) { auto result = src; auto pos = src.find('"'); @@ -1462,7 +1462,7 @@ namespace NSchemeShardUT_Private { const ui64 domainId = 1; NKikimrMiniKQL::TResult result; TString err; - auto escapedStr = EscapedDoubleQoute(limits.ExtraPathSymbolsAllowed); + auto escapedStr = EscapedDoubleQuote(limits.ExtraPathSymbolsAllowed); TString prog = Sprintf(R"( ( (let key '('('PathId (Uint64 '%lu)))) # RootPathId @@ -1663,25 +1663,25 @@ namespace NSchemeShardUT_Private { return result; } - void AsyncBuilIndex(TTestActorRuntime& runtime, ui64 id, ui64 schemeShard, const TString &dbName, const TString &src, const TBuildIndexConfig &cfg) { + void AsyncBuildIndex(TTestActorRuntime& runtime, ui64 id, ui64 schemeShard, const TString &dbName, const TString &src, const TBuildIndexConfig &cfg) { auto sender = runtime.AllocateEdgeActor(); auto request = CreateBuildIndexRequest(id, dbName, src, cfg); ForwardToTablet(runtime, schemeShard, sender, request); } - void AsyncBuilIndex(TTestActorRuntime& runtime, ui64 id, ui64 schemeShard, const TString &dbName, + void AsyncBuildIndex(TTestActorRuntime& runtime, ui64 id, ui64 schemeShard, const TString &dbName, const TString &src, const TString &name, TVector<TString> columns, TVector<TString> dataColumns) { - AsyncBuilIndex(runtime, id, schemeShard, dbName, src, TBuildIndexConfig{ + AsyncBuildIndex(runtime, id, schemeShard, dbName, src, TBuildIndexConfig{ name, NKikimrSchemeOp::EIndexTypeGlobal, columns, dataColumns }); } - void TestBuilIndex(TTestActorRuntime& runtime, ui64 id, ui64 schemeShard, const TString &dbName, + void TestBuildIndex(TTestActorRuntime& runtime, ui64 id, ui64 schemeShard, const TString &dbName, const TString &src, const TBuildIndexConfig& cfg, Ydb::StatusIds::StatusCode expectedStatus) { - AsyncBuilIndex(runtime, id, schemeShard, dbName, src, cfg); + AsyncBuildIndex(runtime, id, schemeShard, dbName, src, cfg); TAutoPtr<IEventHandle> handle; TEvIndexBuilder::TEvCreateResponse* event = runtime.GrabEdgeEvent<TEvIndexBuilder::TEvCreateResponse>(handle); @@ -1695,11 +1695,11 @@ namespace NSchemeShardUT_Private { << " issues was " << PrintIssues(event->Record.GetIssues())); } - void TestBuilIndex(TTestActorRuntime& runtime, ui64 id, ui64 schemeShard, const TString &dbName, + void TestBuildIndex(TTestActorRuntime& runtime, ui64 id, ui64 schemeShard, const TString &dbName, const TString &src, const TString &name, TVector<TString> columns, Ydb::StatusIds::StatusCode expectedStatus) { - TestBuilIndex(runtime, id, schemeShard, dbName, src, TBuildIndexConfig{ + TestBuildIndex(runtime, id, schemeShard, dbName, src, TBuildIndexConfig{ name, NKikimrSchemeOp::EIndexTypeGlobal, columns, {} }, expectedStatus); } @@ -1748,7 +1748,7 @@ namespace NSchemeShardUT_Private { return new TEvIndexBuilder::TEvListRequest(dbName, 100, ""); } - NKikimrIndexBuilder::TEvListResponse TestListBuilIndex(TTestActorRuntime& runtime, ui64 schemeShard, const TString &dbName) { + NKikimrIndexBuilder::TEvListResponse TestListBuildIndex(TTestActorRuntime& runtime, ui64 schemeShard, const TString &dbName) { auto sender = runtime.AllocateEdgeActor(); auto request = ListBuildIndexRequest(dbName); @@ -1767,7 +1767,7 @@ namespace NSchemeShardUT_Private { return new TEvIndexBuilder::TEvGetRequest(dbName, id); } - NKikimrIndexBuilder::TEvGetResponse TestGetBuilIndex(TTestActorRuntime& runtime, ui64 schemeShard, const TString &dbName, ui64 id) { + NKikimrIndexBuilder::TEvGetResponse TestGetBuildIndex(TTestActorRuntime& runtime, ui64 schemeShard, const TString &dbName, ui64 id) { auto sender = runtime.AllocateEdgeActor(); auto request = GetBuildIndexRequest(dbName, id); @@ -1786,7 +1786,7 @@ namespace NSchemeShardUT_Private { return new TEvIndexBuilder::TEvForgetRequest(id, dbName, buildIndexId); } - NKikimrIndexBuilder::TEvForgetResponse TestForgetBuilIndex( + NKikimrIndexBuilder::TEvForgetResponse TestForgetBuildIndex( TTestActorRuntime& runtime, const ui64 id, const ui64 schemeShard, @@ -2177,7 +2177,7 @@ namespace NSchemeShardUT_Private { return ev->Get()->Record; } - NKikimrPQ::TDescribeResponse GetDescibeFromPQBalancer(TTestActorRuntime& runtime, ui64 balancerId) { + NKikimrPQ::TDescribeResponse GetDescribeFromPQBalancer(TTestActorRuntime& runtime, ui64 balancerId) { TActorId edge = runtime.AllocateEdgeActor(); TAutoPtr<IEventHandle> handle; runtime.SendToPipe(balancerId, edge, new TEvPersQueue::TEvDescribe(), 0, GetPipeConfigWithRetries()); diff --git a/ydb/core/tx/schemeshard/ut_helpers/helpers.h b/ydb/core/tx/schemeshard/ut_helpers/helpers.h index 878df633764..f7786d1538c 100644 --- a/ydb/core/tx/schemeshard/ut_helpers/helpers.h +++ b/ydb/core/tx/schemeshard/ut_helpers/helpers.h @@ -319,18 +319,18 @@ namespace NSchemeShardUT_Private { }; TEvIndexBuilder::TEvCreateRequest* CreateBuildIndexRequest(ui64 id, const TString& dbName, const TString& src, const TBuildIndexConfig& cfg); - void AsyncBuilIndex(TTestActorRuntime& runtime, ui64 id, ui64 schemeShard, const TString &dbName, const TString &src, const TBuildIndexConfig &cfg); - void AsyncBuilIndex(TTestActorRuntime& runtime, ui64 id, ui64 schemeShard, const TString &dbName, const TString &src, const TString &name, TVector<TString> columns, TVector<TString> dataColumns = {}); - void TestBuilIndex(TTestActorRuntime& runtime, ui64 id, ui64 schemeShard, const TString &dbName, const TString &src, const TBuildIndexConfig &cfg, Ydb::StatusIds::StatusCode expectedStatus = Ydb::StatusIds::SUCCESS); - void TestBuilIndex(TTestActorRuntime& runtime, ui64 id, ui64 schemeShard, const TString &dbName, const TString &src, const TString &name, TVector<TString> columns, Ydb::StatusIds::StatusCode expectedStatus = Ydb::StatusIds::SUCCESS); + void AsyncBuildIndex(TTestActorRuntime& runtime, ui64 id, ui64 schemeShard, const TString &dbName, const TString &src, const TBuildIndexConfig &cfg); + void AsyncBuildIndex(TTestActorRuntime& runtime, ui64 id, ui64 schemeShard, const TString &dbName, const TString &src, const TString &name, TVector<TString> columns, TVector<TString> dataColumns = {}); + void TestBuildIndex(TTestActorRuntime& runtime, ui64 id, ui64 schemeShard, const TString &dbName, const TString &src, const TBuildIndexConfig &cfg, Ydb::StatusIds::StatusCode expectedStatus = Ydb::StatusIds::SUCCESS); + void TestBuildIndex(TTestActorRuntime& runtime, ui64 id, ui64 schemeShard, const TString &dbName, const TString &src, const TString &name, TVector<TString> columns, Ydb::StatusIds::StatusCode expectedStatus = Ydb::StatusIds::SUCCESS); TEvIndexBuilder::TEvCancelRequest* CreateCancelBuildIndexRequest(const ui64 id, const TString& dbName, const ui64 buildIndexId); NKikimrIndexBuilder::TEvCancelResponse TestCancelBuildIndex(TTestActorRuntime& runtime, const ui64 id, const ui64 schemeShard, const TString &dbName, const ui64 buildIndexId, const TVector<Ydb::StatusIds::StatusCode>& expectedStatuses = {Ydb::StatusIds::SUCCESS}); TEvIndexBuilder::TEvListRequest* ListBuildIndexRequest(const TString& dbName); - NKikimrIndexBuilder::TEvListResponse TestListBuilIndex(TTestActorRuntime& runtime, ui64 schemeShard, const TString &dbName); + NKikimrIndexBuilder::TEvListResponse TestListBuildIndex(TTestActorRuntime& runtime, ui64 schemeShard, const TString &dbName); TEvIndexBuilder::TEvGetRequest* GetBuildIndexRequest(const TString& dbName, ui64 id); - NKikimrIndexBuilder::TEvGetResponse TestGetBuilIndex(TTestActorRuntime& runtime, ui64 schemeShard, const TString &dbName, ui64 id); + NKikimrIndexBuilder::TEvGetResponse TestGetBuildIndex(TTestActorRuntime& runtime, ui64 schemeShard, const TString &dbName, ui64 id); TEvIndexBuilder::TEvForgetRequest* ForgetBuildIndexRequest(const ui64 id, const TString &dbName, const ui64 buildIndexId); - NKikimrIndexBuilder::TEvForgetResponse TestForgetBuilIndex(TTestActorRuntime& runtime, const ui64 id, const ui64 schemeShard, const TString &dbName, const ui64 buildIndexId, Ydb::StatusIds::StatusCode expectedStatus = Ydb::StatusIds::SUCCESS); + NKikimrIndexBuilder::TEvForgetResponse TestForgetBuildIndex(TTestActorRuntime& runtime, const ui64 id, const ui64 schemeShard, const TString &dbName, const ui64 buildIndexId, Ydb::StatusIds::StatusCode expectedStatus = Ydb::StatusIds::SUCCESS); ////////// export void AsyncExport(TTestActorRuntime& runtime, ui64 schemeshardId, ui64 id, const TString& dbName, const TString& requestStr, const TString& userSID = ""); @@ -398,7 +398,7 @@ namespace NSchemeShardUT_Private { void SetSchemeshardSchemaLimits(TTestActorRuntime& runtime, NSchemeShard::TSchemeLimits limits); void SetSchemeshardSchemaLimits(TTestActorRuntime& runtime, NSchemeShard::TSchemeLimits limits, ui64 schemeShard); void SetSchemeshardDatabaseQuotas(TTestActorRuntime& runtime, Ydb::Cms::DatabaseQuotas databaseQuotas, ui64 domainId); - void SetSchemeshardDatabaseQuotas(TTestActorRuntime& runtime, Ydb::Cms::DatabaseQuotas databaseQuotas, ui64 dimainId, ui64 schemeShard); + void SetSchemeshardDatabaseQuotas(TTestActorRuntime& runtime, Ydb::Cms::DatabaseQuotas databaseQuotas, ui64 domainId, ui64 schemeShard); NKikimrSchemeOp::TTableDescription GetDatashardSchema(TTestActorRuntime& runtime, ui64 tabletId, ui64 tid); @@ -521,6 +521,6 @@ namespace NSchemeShardUT_Private { NKikimrTxDataShard::TEvCompactTableResult CompactTable( TTestActorRuntime& runtime, ui64 shardId, const TTableId& tableId, bool compactBorrowed = false); - NKikimrPQ::TDescribeResponse GetDescibeFromPQBalancer(TTestActorRuntime& runtime, ui64 balancerId); + NKikimrPQ::TDescribeResponse GetDescribeFromPQBalancer(TTestActorRuntime& runtime, ui64 balancerId); } //NSchemeShardUT_Private diff --git a/ydb/core/tx/schemeshard/ut_helpers/ls_checks.cpp b/ydb/core/tx/schemeshard/ut_helpers/ls_checks.cpp index 4699f09e350..657d02ee6bf 100644 --- a/ydb/core/tx/schemeshard/ut_helpers/ls_checks.cpp +++ b/ydb/core/tx/schemeshard/ut_helpers/ls_checks.cpp @@ -144,7 +144,7 @@ TCheckFunc SubDomainVersion(ui64 descrVersion) { const auto& pathDescr = record.GetPathDescription(); const auto& processingParams = pathDescr.GetDomainDescription().GetProcessingParams(); UNIT_ASSERT_EQUAL_C(processingParams.GetVersion(), descrVersion, - "subdomain version mistmach" + "subdomain version mismatch" << ", path id " << pathDescr.GetSelf().GetPathId() << ", domain id " << pathDescr.GetDomainDescription().GetDomainKey().GetPathId() << ", has version " << processingParams.GetVersion() @@ -326,8 +326,8 @@ TCheckFunc UserAttrsEqual(TUserAttrs attrs) { UNIT_ASSERT_VALUES_EQUAL(record.GetStatus(), NKikimrScheme::StatusSuccess); const auto& pathDescr = record.GetPathDescription(); - TUserAttrs requered = attrs; - std::sort(requered.begin(), requered.end()); + TUserAttrs required = attrs; + std::sort(required.begin(), required.end()); TUserAttrs present; for (const auto& item: pathDescr.GetUserAttributes()) { @@ -337,7 +337,7 @@ TCheckFunc UserAttrsEqual(TUserAttrs attrs) { TUserAttrs diff; std::set_difference(present.begin(), present.end(), - requered.begin(), requered.end(), + required.begin(), required.end(), std::back_inserter(diff)); UNIT_ASSERT_C(diff.empty(), diff.size() << " items are different, for example" << @@ -346,7 +346,7 @@ TCheckFunc UserAttrsEqual(TUserAttrs attrs) { " the item is extra or has a different value in listing"); diff.clear(); - std::set_difference(requered.begin(), requered.end(), + std::set_difference(required.begin(), required.end(), present.begin(), present.end(), std::back_inserter(diff)); UNIT_ASSERT_C(diff.empty(), @@ -362,8 +362,8 @@ TCheckFunc UserAttrsHas(TUserAttrs attrs) { UNIT_ASSERT_VALUES_EQUAL(record.GetStatus(), NKikimrScheme::StatusSuccess); const auto& pathDescr = record.GetPathDescription(); - TUserAttrs requered = attrs; - std::sort(requered.begin(), requered.end()); + TUserAttrs required = attrs; + std::sort(required.begin(), required.end()); TUserAttrs present; for (const auto& item: pathDescr.GetUserAttributes()) { @@ -372,7 +372,7 @@ TCheckFunc UserAttrsHas(TUserAttrs attrs) { std::sort(present.begin(), present.end()); TUserAttrs diff; - std::set_difference(requered.begin(), requered.end(), + std::set_difference(required.begin(), required.end(), present.begin(), present.end(), std::back_inserter(diff)); UNIT_ASSERT_C(diff.empty(), @@ -524,7 +524,7 @@ TCheckFunc PathVersionEqual(ui64 version) { const auto& curVersion = self.GetPathVersion(); UNIT_ASSERT_EQUAL_C(curVersion, version, - "path version mistmach, path with id " << self.GetPathId() << + "path version mismatch, path with id " << self.GetPathId() << " has version " << curVersion << " but expected " << version); }; @@ -538,7 +538,7 @@ TCheckFunc PathVersionOneOf(TSet<ui64> versions) { const auto& curVersion = self.GetPathVersion(); UNIT_ASSERT_C(versions.count(curVersion) > 0, - "path version mistmach, path with id " << self.GetPathId() << + "path version mismatch, path with id " << self.GetPathId() << " has version " << curVersion << " but expected one of set"); }; @@ -579,7 +579,7 @@ TCheckFunc PathsInsideDomain(ui64 count) { const auto& curCount = domain.GetPathsInside(); UNIT_ASSERT_EQUAL_C(curCount, count, - "paths inside domain count mistmach, domain with id " << domain.GetDomainKey().GetPathId() << + "paths inside domain count mismatch, domain with id " << domain.GetDomainKey().GetPathId() << " has count " << curCount << " but expected " << count); }; @@ -594,7 +594,7 @@ TCheckFunc PQPartitionsInsideDomain(ui64 count) { const auto& curCount = domain.GetPQPartitionsInside(); UNIT_ASSERT_EQUAL_C(curCount, count, - "pq partitions inside domain count mistmach, domain with id " << domain.GetDomainKey().GetPathId() << + "pq partitions inside domain count mismatch, domain with id " << domain.GetDomainKey().GetPathId() << " has count " << curCount << " but expected " << count); }; @@ -609,7 +609,7 @@ TCheckFunc PathsInsideDomainOneOf(TSet<ui64> variants) { const auto& curCount = domain.GetPathsInside(); UNIT_ASSERT_C(variants.count(curCount) > 0, - "paths inside domain count mistmach, domain with id " << domain.GetDomainKey().GetPathId() << + "paths inside domain count mismatch, domain with id " << domain.GetDomainKey().GetPathId() << " has version " << curCount << " but expected one of set"); }; @@ -624,8 +624,8 @@ TCheckFunc ShardsInsideDomain(ui64 count) { const auto& curCount = domain.GetShardsInside(); UNIT_ASSERT_C(count == curCount, - "shards inside domain count mistmach, domain with id " << domain.GetDomainKey().GetPathId() << - " has shardsInsize " << curCount << + "shards inside domain count mismatch, domain with id " << domain.GetDomainKey().GetPathId() << + " has shardsInside " << curCount << " but expected " << count); }; } @@ -639,7 +639,7 @@ TCheckFunc ShardsInsideDomainOneOf(TSet<ui64> variants) { const auto& curCount = domain.GetShardsInside(); UNIT_ASSERT_C(variants.count(curCount) > 0, - "paths inside domain count mistmach, domain with id " << domain.GetDomainKey().GetPathId() << + "paths inside domain count mismatch, domain with id " << domain.GetDomainKey().GetPathId() << " has shards " << curCount << " but expected one of set"); }; @@ -655,17 +655,17 @@ TCheckFunc DomainLimitsIs(ui64 maxPaths, ui64 maxShards, ui64 maxPQPartitions) { const auto& pqPartitionsLimit = domain.GetPQPartitionsLimit(); UNIT_ASSERT_C(pathLimit == maxPaths, - "paths limit mistmach, domain with id " << domain.GetDomainKey().GetPathId() << + "paths limit mismatch, domain with id " << domain.GetDomainKey().GetPathId() << " has limit " << pathLimit << " but expected " << maxPaths); UNIT_ASSERT_C(shardsLimit == maxShards, - "shards limit mistmach, domain with id " << domain.GetDomainKey().GetPathId() << + "shards limit mismatch, domain with id " << domain.GetDomainKey().GetPathId() << " has limit " << shardsLimit << " but expected " << maxShards); UNIT_ASSERT_C(!maxPQPartitions || pqPartitionsLimit == maxPQPartitions, - "pq partitions limit mistmach, domain with id " << domain.GetDomainKey().GetPathId() << + "pq partitions limit mismatch, domain with id " << domain.GetDomainKey().GetPathId() << " has limit " << pqPartitionsLimit << " but expected " << maxPQPartitions); }; @@ -1000,14 +1000,14 @@ void CheckEffectiveRight(const NKikimrScheme::TEvDescribeSchemeResult& record, c NACLib::TSecurityObject required; required.FromString(right); - for (const auto& requeriedAce : required.GetACL().GetACE()) { + for (const auto& requiredAce : required.GetACL().GetACE()) { bool has = false; for (const auto& srcAce: src.GetACL().GetACE()) { - if (srcAce.GetAccessType() == requeriedAce.GetAccessType() && - srcAce.GetAccessRight() == requeriedAce.GetAccessRight() && - srcAce.GetSID() == requeriedAce.GetSID() && - srcAce.GetInheritanceType() == requeriedAce.GetInheritanceType()) + if (srcAce.GetAccessType() == requiredAce.GetAccessType() && + srcAce.GetAccessRight() == requiredAce.GetAccessRight() && + srcAce.GetSID() == requiredAce.GetSID() && + srcAce.GetInheritanceType() == requiredAce.GetInheritanceType()) { has = true; } @@ -1048,7 +1048,7 @@ TCheckFunc DatabaseQuotas(ui64 dataStreamShards) { const auto count = domain.GetDatabaseQuotas().data_stream_shards_quota(); UNIT_ASSERT_C(count == dataStreamShards, - "data stream shards inside domain count mistmach, domain with id " << domain.GetDomainKey().GetPathId() << + "data stream shards inside domain count mismatch, domain with id " << domain.GetDomainKey().GetPathId() << " has data stream shards " << count << " but expected " << dataStreamShards); }; diff --git a/ydb/core/tx/schemeshard/ut_helpers/test_env.cpp b/ydb/core/tx/schemeshard/ut_helpers/test_env.cpp index 5759ec4d797..57ec087e990 100644 --- a/ydb/core/tx/schemeshard/ut_helpers/test_env.cpp +++ b/ydb/core/tx/schemeshard/ut_helpers/test_env.cpp @@ -230,10 +230,10 @@ private: if (!SchemeTxWaiters.contains(txId)) return; - // Notifify all waiters and forget TxId + // Notify all waiters and forget TxId for (TActorId waiter : SchemeTxWaiters[txId]) { LOG_DEBUG_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, - "tests -- TTxNotificationSubscriber satisfy subsriber" + "tests -- TTxNotificationSubscriber satisfy subscriber" << ", waiter: " << waiter << ", txId: " << txId); ctx.Send(waiter, new TEvSchemeShard::TEvNotifyTxCompletionResult(txId)); @@ -324,7 +324,7 @@ public: {} private: - using TPreSerialisedMessage = std::pair<ui32, TIntrusivePtr<TEventSerializedData>>; // ui32 it's a type + using TPreSerializedMessage = std::pair<ui32, TIntrusivePtr<TEventSerializedData>>; // ui32 it's a type private: void StateWork(TAutoPtr<NActors::IEventHandle> &ev, const NActors::TActorContext &ctx) { @@ -379,7 +379,7 @@ private: // Save TxId, forward to schemeshard SchemeTxWaiters[txId] = ev->Sender; - OnlineRequests[txId] = GetSerialisedMessage(ev->ReleaseBase()); + OnlineRequests[txId] = GetSerializedMessage(ev->ReleaseBase()); SendToSchemeshard(txId, ctx); } @@ -440,8 +440,8 @@ private: SchemeShardPipe = ctx.Register(NTabletPipe::CreateClient(ctx.SelfID, SchemeshardTabletId, GetPipeConfigWithRetries())); } - TPreSerialisedMessage& preSerialisedMessages = OnlineRequests[txId]; - NTabletPipe::SendData(ctx, SchemeShardPipe, preSerialisedMessages.first, preSerialisedMessages.second, 0); + TPreSerializedMessage& preSerializedMessages = OnlineRequests[txId]; + NTabletPipe::SendData(ctx, SchemeShardPipe, preSerializedMessages.first, preSerializedMessages.second, 0); } void Handle(TEvents::TEvPoisonPill::TPtr, const TActorContext &ctx) { @@ -451,18 +451,18 @@ private: Die(ctx); } - TPreSerialisedMessage GetSerialisedMessage(TAutoPtr<IEventBase> message) { + TPreSerializedMessage GetSerializedMessage(TAutoPtr<IEventBase> message) { TAllocChunkSerializer serializer; const bool success = message->SerializeToArcadiaStream(&serializer); Y_VERIFY(success); TIntrusivePtr<TEventSerializedData> data = serializer.Release(message->IsExtendedFormat()); - return TPreSerialisedMessage(message->Type(), data); + return TPreSerializedMessage(message->Type(), data); } private: ui64 SchemeshardTabletId; TActorId SchemeShardPipe; - THashMap<ui64, TPreSerialisedMessage> OnlineRequests; + THashMap<ui64, TPreSerializedMessage> OnlineRequests; THashMap<ui64, TActorId> SchemeTxWaiters; }; @@ -691,11 +691,11 @@ void NSchemeShardUT_Private::TestWaitNotification(NActors::TTestActorRuntime &ru } void NSchemeShardUT_Private::TTestEnv::TestWaitNotification(NActors::TTestActorRuntime &runtime, TSet<ui64> txIds, ui64 schemeshardId) { - if (!TxNotificationSubcribers.contains(schemeshardId)) { - TxNotificationSubcribers[schemeshardId] = CreateNotificationSubscriber(runtime, schemeshardId); + if (!TxNotificationSubscribers.contains(schemeshardId)) { + TxNotificationSubscribers[schemeshardId] = CreateNotificationSubscriber(runtime, schemeshardId); } - NSchemeShardUT_Private::TestWaitNotification(runtime, txIds, TxNotificationSubcribers.at(schemeshardId)); + NSchemeShardUT_Private::TestWaitNotification(runtime, txIds, TxNotificationSubscribers.at(schemeshardId)); } void NSchemeShardUT_Private::TTestEnv::TestWaitNotification(TTestActorRuntime &runtime, int txId, ui64 schemeshardId) { diff --git a/ydb/core/tx/schemeshard/ut_helpers/test_env.h b/ydb/core/tx/schemeshard/ut_helpers/test_env.h index f40df8b2c29..be8256a4a95 100644 --- a/ydb/core/tx/schemeshard/ut_helpers/test_env.h +++ b/ydb/core/tx/schemeshard/ut_helpers/test_env.h @@ -61,7 +61,7 @@ namespace NSchemeShardUT_Private { TFakeHiveState::TPtr HiveState; TFakeCoordinator::TState::TPtr CoordinatorState; TAutoPtr<ITabletScheduledEventsGuard> EnableSchemeshardPipeRetriesGuard; - TMap<ui64, TActorId> TxNotificationSubcribers; + TMap<ui64, TActorId> TxNotificationSubscribers; TActorId TxReliablePropose; ui32 ChannelsCount; TActorId MeteringFake; diff --git a/ydb/core/tx/schemeshard/ut_index_build.cpp b/ydb/core/tx/schemeshard/ut_index_build.cpp index 7aaec7fe479..540ecba8806 100644 --- a/ydb/core/tx/schemeshard/ut_index_build.cpp +++ b/ydb/core/tx/schemeshard/ut_index_build.cpp @@ -271,7 +271,7 @@ Y_UNIT_TEST_SUITE(IndexBuildTest) { auto grabMeteringMessage = [&meteringMessages](TTestActorRuntimeBase&, TAutoPtr<IEventHandle> &ev) -> auto { if (ev->Type == NMetering::TEvMetering::TEvWriteMeteringJson::EventType) { auto *msg = ev->Get<NMetering::TEvMetering::TEvWriteMeteringJson>(); - Cerr << "grabMeteringMessage has happend" << Endl; + Cerr << "grabMeteringMessage has happened" << Endl; meteringMessages << msg->MeteringJson; } @@ -280,15 +280,15 @@ Y_UNIT_TEST_SUITE(IndexBuildTest) { runtime.SetObserverFunc(grabMeteringMessage); - TestBuilIndex(runtime, ++txId, tenantSchemeShard, "/MyRoot/ServerLessDB", "/MyRoot/ServerLessDB/Table", "index1", {"index"}); - ui64 builIndexId = txId; + TestBuildIndex(runtime, ++txId, tenantSchemeShard, "/MyRoot/ServerLessDB", "/MyRoot/ServerLessDB/Table", "index1", {"index"}); + ui64 buildIndexId = txId; - auto listing = TestListBuilIndex(runtime, tenantSchemeShard, "/MyRoot/ServerLessDB"); + auto listing = TestListBuildIndex(runtime, tenantSchemeShard, "/MyRoot/ServerLessDB"); Y_ASSERT(listing.EntriesSize() == 1); env.TestWaitNotification(runtime, txId, tenantSchemeShard); - auto descr = TestGetBuilIndex(runtime, tenantSchemeShard, "/MyRoot/ServerLessDB", txId); + auto descr = TestGetBuildIndex(runtime, tenantSchemeShard, "/MyRoot/ServerLessDB", txId); Y_ASSERT(descr.GetIndexBuild().GetState() == Ydb::Table::IndexBuildState::STATE_DONE); const TString meteringData = R"({"usage":{"start":0,"quantity":179,"finish":0,"unit":"request_unit","type":"delta"},"tags":{},"id":"106-9437197-2-101-1818-101-1818","cloud_id":"CLOUD_ID_VAL","source_wt":0,"source_id":"sless-docapi-ydb-ss","resource_id":"DATABASE_ID_VAL","schema":"ydb.serverless.requests.v1","folder_id":"FOLDER_ID_VAL","version":"1.0.0"})"; @@ -304,8 +304,8 @@ Y_UNIT_TEST_SUITE(IndexBuildTest) { {NLs::PathExist, NLs::IndexState(NKikimrSchemeOp::EIndexState::EIndexStateReady)}); - TestForgetBuilIndex(runtime, ++txId, tenantSchemeShard, "/MyRoot/ServerLessDB", builIndexId); - listing = TestListBuilIndex(runtime, tenantSchemeShard, "/MyRoot/ServerLessDB"); + TestForgetBuildIndex(runtime, ++txId, tenantSchemeShard, "/MyRoot/ServerLessDB", buildIndexId); + listing = TestListBuildIndex(runtime, tenantSchemeShard, "/MyRoot/ServerLessDB"); Y_ASSERT(listing.EntriesSize() == 0); TestDropTableIndex(runtime, tenantSchemeShard, ++txId, "/MyRoot/ServerLessDB", R"( @@ -335,7 +335,7 @@ Y_UNIT_TEST_SUITE(IndexBuildTest) { )"); env.TestWaitNotification(runtime, txId, tenantSchemeShard); - TestBuilIndex(runtime, ++txId, tenantSchemeShard, "/MyRoot/ServerLessDB", "/MyRoot/ServerLessDB/Table", "index2", {"index"}); + TestBuildIndex(runtime, ++txId, tenantSchemeShard, "/MyRoot/ServerLessDB", "/MyRoot/ServerLessDB/Table", "index2", {"index"}); env.TestWaitNotification(runtime, txId, tenantSchemeShard); // CommonDB @@ -384,15 +384,15 @@ Y_UNIT_TEST_SUITE(IndexBuildTest) { return TTestActorRuntime::EEventAction::PROCESS; }); - TestBuilIndex(runtime, ++txId, tenantSchemeShard, "/MyRoot/CommonDB", "/MyRoot/CommonDB/Table", "index1", {"index"}); - builIndexId = txId; + TestBuildIndex(runtime, ++txId, tenantSchemeShard, "/MyRoot/CommonDB", "/MyRoot/CommonDB/Table", "index1", {"index"}); + buildIndexId = txId; - listing = TestListBuilIndex(runtime, tenantSchemeShard, "/MyRoot/CommonDB"); + listing = TestListBuildIndex(runtime, tenantSchemeShard, "/MyRoot/CommonDB"); Y_ASSERT(listing.EntriesSize() == 1); env.TestWaitNotification(runtime, txId, tenantSchemeShard); - descr = TestGetBuilIndex(runtime, tenantSchemeShard, "/MyRoot/CommonDB", txId); + descr = TestGetBuildIndex(runtime, tenantSchemeShard, "/MyRoot/CommonDB", txId); Y_ASSERT(descr.GetIndexBuild().GetState() == Ydb::Table::IndexBuildState::STATE_DONE); UNIT_ASSERT(billRecords.empty()); @@ -458,7 +458,7 @@ Y_UNIT_TEST_SUITE(IndexBuildTest) { indexTableDescr.MutablePartitionConfig()->MutablePartitioningPolicy()->SetSizeToSplit(10); indexTableDescr.MutablePartitionConfig()->MutablePartitioningPolicy()->SetMaxPartitionsCount(10); - Cerr << "upgradeEvent has happend" << Endl; + Cerr << "upgradeEvent has happened" << Endl; } } @@ -495,14 +495,14 @@ Y_UNIT_TEST_SUITE(IndexBuildTest) { << " got " << Ydb::StatusIds::StatusCode_Name(event->Record.GetStatus()) << " expected " << Ydb::StatusIds::StatusCode_Name(Ydb::StatusIds::SUCCESS)); } - ui64 builIndexId = txId; + ui64 buildIndexId = txId; - auto listing = TestListBuilIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot"); + auto listing = TestListBuildIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot"); Y_ASSERT(listing.EntriesSize() == 1); env.TestWaitNotification(runtime, txId); - auto descr = TestGetBuilIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", txId); + auto descr = TestGetBuildIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", txId); UNIT_ASSERT_EQUAL(descr.GetIndexBuild().GetState(),Ydb::Table::IndexBuildState::STATE_REJECTED); TestDescribeResult(DescribePath(runtime, "/MyRoot/Table"), @@ -513,20 +513,20 @@ Y_UNIT_TEST_SUITE(IndexBuildTest) { TestDescribeResult(DescribePath(runtime, "/MyRoot/Table/index1", true, true, true), {NLs::PathNotExist}); - TestForgetBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", builIndexId); - listing = TestListBuilIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot"); + TestForgetBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", buildIndexId); + listing = TestListBuildIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot"); Y_ASSERT(listing.EntriesSize() == 0); } - Y_UNIT_TEST(CancelationNoTable) { + Y_UNIT_TEST(CancellationNoTable) { TTestBasicRuntime runtime; TTestEnv env(runtime); ui64 txId = 100; - TestBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "index1", {"index"}, Ydb::StatusIds::BAD_REQUEST); + TestBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "index1", {"index"}, Ydb::StatusIds::BAD_REQUEST); env.TestWaitNotification(runtime, txId); - NKikimrIndexBuilder::TEvListResponse listing = TestListBuilIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot"); + NKikimrIndexBuilder::TEvListResponse listing = TestListBuildIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot"); Y_ASSERT(listing.EntriesSize() == 0); } @@ -550,12 +550,12 @@ Y_UNIT_TEST_SUITE(IndexBuildTest) { )"); env.TestWaitNotification(runtime, txId); - TestBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/WithFollowers", "UserDefinedIndexByValue0", {"value0"}); + TestBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/WithFollowers", "UserDefinedIndexByValue0", {"value0"}); env.TestWaitNotification(runtime, txId); ui64 buildId = txId; - auto descr = TestGetBuilIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", buildId); + auto descr = TestGetBuildIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", buildId); Y_ASSERT(descr.GetIndexBuild().GetState() == Ydb::Table::IndexBuildState::STATE_DONE); TestDescribeResult(DescribePath(runtime, "/MyRoot/WithFollowers"), @@ -567,8 +567,8 @@ Y_UNIT_TEST_SUITE(IndexBuildTest) { {NLs::PathExist, NLs::IndexState(NKikimrSchemeOp::EIndexState::EIndexStateReady)}); - TestForgetBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", buildId); - auto listing = TestListBuilIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot"); + TestForgetBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", buildId); + auto listing = TestListBuildIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot"); Y_ASSERT(listing.EntriesSize() == 0); TestDropTableIndex(runtime, ++txId, "/MyRoot", R"( @@ -588,13 +588,13 @@ Y_UNIT_TEST_SUITE(IndexBuildTest) { TTestEnv env(runtime, TTestEnvOptions().EnableProtoSourceIdInfo(true)); ui64 txId = 100; - TestBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/NotExist", "index1", {"index"}, Ydb::StatusIds::BAD_REQUEST); + TestBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/NotExist", "index1", {"index"}, Ydb::StatusIds::BAD_REQUEST); env.TestWaitNotification(runtime, txId); TestMkDir(runtime, TTestTxConfig::SchemeShard, ++txId, "/MyRoot", "DIR"); env.TestWaitNotification(runtime, txId); - TestBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/DIR", "index1", {"index"}, Ydb::StatusIds::BAD_REQUEST); + TestBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/DIR", "index1", {"index"}, Ydb::StatusIds::BAD_REQUEST); env.TestWaitNotification(runtime, txId); TestCreateIndexedTable(runtime, ++txId, "/MyRoot", R"( @@ -628,16 +628,16 @@ Y_UNIT_TEST_SUITE(IndexBuildTest) { )"); env.TestWaitNotification(runtime, txId); - TestBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "UserDefinedIndexByValue0", {"value0"}, Ydb::StatusIds::BAD_REQUEST); + TestBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "UserDefinedIndexByValue0", {"value0"}, Ydb::StatusIds::BAD_REQUEST); env.TestWaitNotification(runtime, txId); - TestBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "UserDefinedIndexByValue0", {"value1"}, Ydb::StatusIds::BAD_REQUEST); + TestBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "UserDefinedIndexByValue0", {"value1"}, Ydb::StatusIds::BAD_REQUEST); env.TestWaitNotification(runtime, txId); - TestBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "nameOK", {"NotExist"}, Ydb::StatusIds::BAD_REQUEST); + TestBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "nameOK", {"NotExist"}, Ydb::StatusIds::BAD_REQUEST); env.TestWaitNotification(runtime, txId); - TestBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "nameOK", {"valueFloat"}, Ydb::StatusIds::BAD_REQUEST); + TestBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "nameOK", {"valueFloat"}, Ydb::StatusIds::BAD_REQUEST); env.TestWaitNotification(runtime, txId); TSchemeLimits lowLimits; @@ -645,25 +645,25 @@ Y_UNIT_TEST_SUITE(IndexBuildTest) { lowLimits.ExtraPathSymbolsAllowed = "_-."; lowLimits.MaxTableIndices = 2; SetSchemeshardSchemaLimits(runtime, lowLimits); - TestBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "!name!", {"value0"}, Ydb::StatusIds::BAD_REQUEST); + TestBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "!name!", {"value0"}, Ydb::StatusIds::BAD_REQUEST); env.TestWaitNotification(runtime, txId); lowLimits.MaxTableIndices = 2; SetSchemeshardSchemaLimits(runtime, lowLimits); - TestBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "nameOK", {"value0", "value1"}, Ydb::StatusIds::PRECONDITION_FAILED); + TestBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "nameOK", {"value0", "value1"}, Ydb::StatusIds::PRECONDITION_FAILED); env.TestWaitNotification(runtime, txId); lowLimits.MaxTableIndices = 3; lowLimits.MaxChildrenInDir = 3; SetSchemeshardSchemaLimits(runtime, lowLimits); - TestBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "nameOK", {"value0", "value1"}, Ydb::StatusIds::PRECONDITION_FAILED); + TestBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "nameOK", {"value0", "value1"}, Ydb::StatusIds::PRECONDITION_FAILED); env.TestWaitNotification(runtime, txId); lowLimits.MaxTableIndices = 3; lowLimits.MaxChildrenInDir = 4; SetSchemeshardSchemaLimits(runtime, lowLimits); - TestBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "nameOK", {"value0", "value1"}, Ydb::StatusIds::SUCCESS); - TestBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "nameOK", {"value0", "value1"}, Ydb::StatusIds::OVERLOADED); + TestBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "nameOK", {"value0", "value1"}, Ydb::StatusIds::SUCCESS); + TestBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "nameOK", {"value0", "value1"}, Ydb::StatusIds::OVERLOADED); env.TestWaitNotification(runtime, {txId, txId - 1}); } @@ -682,8 +682,8 @@ Y_UNIT_TEST_SUITE(IndexBuildTest) { )"); env.TestWaitNotification(runtime, txId); - TestBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "nameOK", {"index"}); - ui64 builIndexId = txId; + TestBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "nameOK", {"index"}); + ui64 buildIndexId = txId; TestAlterTable(runtime, ++txId, "/MyRoot", R"( Name: "Table" @@ -703,7 +703,7 @@ Y_UNIT_TEST_SUITE(IndexBuildTest) { env.TestWaitNotification(runtime, txId); - env.TestWaitNotification(runtime, builIndexId); + env.TestWaitNotification(runtime, buildIndexId); TestDescribeResult(DescribePath(runtime, "/MyRoot/Table"), {NLs::PathExist, @@ -713,7 +713,7 @@ Y_UNIT_TEST_SUITE(IndexBuildTest) { {NLs::PathExist, NLs::IndexState(NKikimrSchemeOp::EIndexState::EIndexStateReady)}); - NKikimrIndexBuilder::TEvGetResponse descr = TestGetBuilIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", builIndexId); + NKikimrIndexBuilder::TEvGetResponse descr = TestGetBuildIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", buildIndexId); Y_ASSERT(descr.GetIndexBuild().GetState() == Ydb::Table::IndexBuildState::STATE_DONE); // KIKIMR-9945 @@ -916,17 +916,17 @@ Y_UNIT_TEST_SUITE(IndexBuildTest) { NLs::IndexesCount(0), NLs::PathVersionEqual(3)}); - TestBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "index1", {"index"}); + TestBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "index1", {"index"}); ui64 buildIndexId = txId; - auto listing = TestListBuilIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot"); + auto listing = TestListBuildIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot"); Y_ASSERT(listing.EntriesSize() == 1); TestCancelBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", buildIndexId); env.TestWaitNotification(runtime, buildIndexId); - auto descr = TestGetBuilIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", buildIndexId); + auto descr = TestGetBuildIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", buildIndexId); Y_ASSERT(descr.GetIndexBuild().GetState() == Ydb::Table::IndexBuildState::STATE_CANCELLED); TestDescribeResult(DescribePath(runtime, "/MyRoot/Table"), @@ -979,11 +979,11 @@ Y_UNIT_TEST_SUITE(IndexBuildTest) { NLs::IndexesCount(0), NLs::PathVersionEqual(3)}); - TestBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "index1", {"index"}); + TestBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "index1", {"index"}); ui64 buildIndexId = txId; { - auto descr = TestGetBuilIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", buildIndexId); + auto descr = TestGetBuildIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", buildIndexId); Y_ASSERT(descr.GetIndexBuild().GetState() == Ydb::Table::IndexBuildState::STATE_PREPARING); } @@ -996,7 +996,7 @@ Y_UNIT_TEST_SUITE(IndexBuildTest) { TestCancelBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", buildIndexId, TVector<Ydb::StatusIds::StatusCode>{Ydb::StatusIds::PRECONDITION_FAILED}); { - auto descr = TestGetBuilIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", buildIndexId); + auto descr = TestGetBuildIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", buildIndexId); Y_ASSERT(descr.GetIndexBuild().GetState() == Ydb::Table::IndexBuildState::STATE_DONE); } diff --git a/ydb/core/tx/schemeshard/ut_index_build_reboots.cpp b/ydb/core/tx/schemeshard/ut_index_build_reboots.cpp index 3cff74817fc..8f613510597 100644 --- a/ydb/core/tx/schemeshard/ut_index_build_reboots.cpp +++ b/ydb/core/tx/schemeshard/ut_index_build_reboots.cpp @@ -110,18 +110,18 @@ Y_UNIT_TEST_SUITE(IndexBuildTestReboots) { } } - AsyncBuilIndex(runtime, ++t.TxId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/dir/Table", "index1", {"index"}); + AsyncBuildIndex(runtime, ++t.TxId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/dir/Table", "index1", {"index"}); ui64 buildIndexId = t.TxId; { - auto descr = TestGetBuilIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", buildIndexId); + auto descr = TestGetBuildIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", buildIndexId); UNIT_ASSERT_VALUES_EQUAL((ui64)descr.GetIndexBuild().GetState(), (ui64)Ydb::Table::IndexBuildState::STATE_PREPARING); } t.TestEnv->TestWaitNotification(runtime, buildIndexId); { - auto descr = TestGetBuilIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", buildIndexId); + auto descr = TestGetBuildIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", buildIndexId); UNIT_ASSERT_VALUES_EQUAL((ui64)descr.GetIndexBuild().GetState(), (ui64)Ydb::Table::IndexBuildState::STATE_DONE); } @@ -181,18 +181,18 @@ Y_UNIT_TEST_SUITE(IndexBuildTestReboots) { } } - AsyncBuilIndex(runtime, ++t.TxId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/dir/Table", "index1", {"index"}, {"value"}); + AsyncBuildIndex(runtime, ++t.TxId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/dir/Table", "index1", {"index"}, {"value"}); ui64 buildIndexId = t.TxId; { - auto descr = TestGetBuilIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", buildIndexId); + auto descr = TestGetBuildIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", buildIndexId); UNIT_ASSERT_VALUES_EQUAL((ui64)descr.GetIndexBuild().GetState(), (ui64)Ydb::Table::IndexBuildState::STATE_PREPARING); } t.TestEnv->TestWaitNotification(runtime, buildIndexId); { - auto descr = TestGetBuilIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", buildIndexId); + auto descr = TestGetBuildIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", buildIndexId); UNIT_ASSERT_VALUES_EQUAL((ui64)descr.GetIndexBuild().GetState(), (ui64)Ydb::Table::IndexBuildState::STATE_DONE); } @@ -411,7 +411,7 @@ Y_UNIT_TEST_SUITE(IndexBuildTestReboots) { fnWriteRow(TTestTxConfig::FakeHiveTablets, 1 + delta, 100 + delta); } - TestBuilIndex(runtime, ++t.TxId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/dir/Table", "index1", {"index"}); + TestBuildIndex(runtime, ++t.TxId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/dir/Table", "index1", {"index"}); } ui64 buildId = t.TxId; @@ -422,7 +422,7 @@ Y_UNIT_TEST_SUITE(IndexBuildTestReboots) { t.TestEnv->TestWaitNotification(runtime, t.TxId); t.TestEnv->TestWaitNotification(runtime, buildId); - auto descr = TestGetBuilIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", buildId); + auto descr = TestGetBuildIndex(runtime, TTestTxConfig::SchemeShard, "/MyRoot", buildId); if (response.GetStatus() == Ydb::StatusIds::SUCCESS) { Y_ASSERT(descr.GetIndexBuild().GetState() == Ydb::Table::IndexBuildState::STATE_CANCELLED); @@ -446,7 +446,7 @@ Y_UNIT_TEST_SUITE(IndexBuildTestReboots) { {NLs::PathExist}); } - TestForgetBuilIndex(runtime, ++t.TxId, TTestTxConfig::SchemeShard, "/MyRoot", buildId); + TestForgetBuildIndex(runtime, ++t.TxId, TTestTxConfig::SchemeShard, "/MyRoot", buildId); }); } diff --git a/ydb/core/tx/schemeshard/ut_move.cpp b/ydb/core/tx/schemeshard/ut_move.cpp index 5d3f270468c..812877f90ae 100644 --- a/ydb/core/tx/schemeshard/ut_move.cpp +++ b/ydb/core/tx/schemeshard/ut_move.cpp @@ -181,7 +181,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardMoveTest) { {NLs::PathNotExist}); { - //seccess op + //success op ++txId; auto first = MoveTableRequest(txId, "/MyRoot/Table2", "/MyRoot/Moved2"); auto second = MoveTableRequest(txId, "/MyRoot/Table1", "/MyRoot/Table2"); @@ -988,7 +988,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardMoveTest) { )"); env.TestWaitNotification(runtime, txId); - AsyncBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "Sync", {"value0"}); + AsyncBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/Table", "Sync", {"value0"}); TVector<THolder<IEventHandle>> suppressed; auto id = txId; @@ -1061,13 +1061,13 @@ Y_UNIT_TEST_SUITE(TSchemeShardMoveTest) { UNIT_ASSERT(req1.GetErrors().empty()); { - TVector<THolder<IEventHandle>> supressed; - auto defOberver = SetSuppressObserver(runtime, supressed, NDataShard::TEvChangeExchange::EvApplyRecords); + TVector<THolder<IEventHandle>> suppressed; + auto defObserver = SetSuppressObserver(runtime, suppressed, NDataShard::TEvChangeExchange::EvApplyRecords); req1.Plan(TTestTxConfig::Coordinator); - WaitForSuppressed(runtime, supressed, 1, defOberver); - UNIT_ASSERT(supressed.size() == 1); + WaitForSuppressed(runtime, suppressed, 1, defObserver); + UNIT_ASSERT(suppressed.size() == 1); } { diff --git a/ydb/core/tx/schemeshard/ut_reboots.cpp b/ydb/core/tx/schemeshard/ut_reboots.cpp index ad263398930..fffa33bf102 100644 --- a/ydb/core/tx/schemeshard/ut_reboots.cpp +++ b/ydb/core/tx/schemeshard/ut_reboots.cpp @@ -525,7 +525,7 @@ Y_UNIT_TEST_SUITE(TConsistentOpsWithReboots) { }); } - Y_UNIT_TEST(CreateIndexedTableAndForceDropSimonteniously) { + Y_UNIT_TEST(CreateIndexedTableAndForceDropSimultaneously) { TTestWithReboots t; t.Run([&](TTestActorRuntime& runtime, bool& activeZone) { TPathVersion dirAVersion; @@ -566,7 +566,7 @@ Y_UNIT_TEST_SUITE(TConsistentOpsWithReboots) { }); } - Y_UNIT_TEST(DropIndexedTableAndForceDropSimonteniously) { + Y_UNIT_TEST(DropIndexedTableAndForceDropSimultaneously) { TTestWithReboots t; t.Run([&](TTestActorRuntime& runtime, bool& activeZone) { TPathVersion dirAVersion; diff --git a/ydb/core/tx/schemeshard/ut_rtmr.cpp b/ydb/core/tx/schemeshard/ut_rtmr.cpp index 8ecff10e02a..8f101cab543 100644 --- a/ydb/core/tx/schemeshard/ut_rtmr.cpp +++ b/ydb/core/tx/schemeshard/ut_rtmr.cpp @@ -6,7 +6,7 @@ using namespace NKikimrSchemeOp; using namespace NSchemeShardUT_Private; Y_UNIT_TEST_SUITE(TRtmrTest) { - Y_UNIT_TEST(CreataWithoutTimeCastBuckets) { + Y_UNIT_TEST(CreateWithoutTimeCastBuckets) { TTestBasicRuntime runtime; TTestEnv env(runtime); ui64 txId = 100; diff --git a/ydb/core/tx/schemeshard/ut_serverless.cpp b/ydb/core/tx/schemeshard/ut_serverless.cpp index 76d0d9d2136..25d36229eaf 100644 --- a/ydb/core/tx/schemeshard/ut_serverless.cpp +++ b/ydb/core/tx/schemeshard/ut_serverless.cpp @@ -34,7 +34,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardServerLess) { "Mediators: 1 " "TimeCastBucketsPerMediator: 2 " "ExternalSchemeShard: true " - "ExternalHive: false " // ExternalHive is imposible in that enviroment yet + "ExternalHive: false " // ExternalHive is impossible in that environment yet "Name: \"SharedDB\""); env.TestWaitNotification(runtime, txId); @@ -200,7 +200,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardServerLess) { auto grabMeteringMessage = [&meteringMessages](TTestActorRuntimeBase&, TAutoPtr<IEventHandle> &ev) -> auto { if (ev->Type == NMetering::TEvMetering::TEvWriteMeteringJson::EventType) { auto *msg = ev->Get<NMetering::TEvMetering::TEvWriteMeteringJson>(); - Cerr << "grabMeteringMessage has happend" << Endl; + Cerr << "grabMeteringMessage has happened" << Endl; meteringMessages << msg->MeteringJson; } diff --git a/ydb/core/tx/schemeshard/ut_split_merge.cpp b/ydb/core/tx/schemeshard/ut_split_merge.cpp index 9b70c3c73bf..52c490efd54 100644 --- a/ydb/core/tx/schemeshard/ut_split_merge.cpp +++ b/ydb/core/tx/schemeshard/ut_split_merge.cpp @@ -274,7 +274,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardSplitTest) { suppressed.clear(); env.TestWaitTabletDeletion(runtime, xrange(TTestTxConfig::FakeHiveTablets, TTestTxConfig::FakeHiveTablets+111)); - // test requeres more txids than cached at start + // test requires more txids than cached at start } Y_UNIT_TEST(AutoMergeInOne) { @@ -327,7 +327,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardSplitTest) { } void TryMergeWithInflyLimit(TTestActorRuntime &runtime, TTestEnv &env, const ui64 mergeNum, const ui64 remainMergeNum, const ui64 acceptedMergeNum, ui64 &txId) { - const ui64 shardsNum = mergeNum * 2; + const ui64 shardsNum = mergeNum * 2; const ui64 startMergePart = mergeNum - remainMergeNum; TSet<ui64> txIds; ui64 startTxId = txId; @@ -352,7 +352,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardSplitTest) { }; void AsyncMergeWithInflyLimit(const ui64 mergeNum, const ui64 mergeLimit) { - const ui64 shardsNum = mergeNum * 2; + const ui64 shardsNum = mergeNum * 2; TTestBasicRuntime runtime; TTestEnv env(runtime); ui64 txId = 123; @@ -406,4 +406,4 @@ Y_UNIT_TEST_SUITE(TSchemeShardSplitTest) { AsyncMergeWithInflyLimit(20, 0); } -}
\ No newline at end of file +} diff --git a/ydb/core/tx/schemeshard/ut_split_merge_reboots.cpp b/ydb/core/tx/schemeshard/ut_split_merge_reboots.cpp index c1524ee5912..140236fa6b2 100644 --- a/ydb/core/tx/schemeshard/ut_split_merge_reboots.cpp +++ b/ydb/core/tx/schemeshard/ut_split_merge_reboots.cpp @@ -54,16 +54,16 @@ Y_UNIT_TEST_SUITE(TSchemeShardSplitTestReboots) { auto prevObserver = runtime.SetObserverFunc(defObserver); - TVector<THolder<IEventHandle>> supressed; - auto supressEvent = [&](TTestActorRuntimeBase& runtime, TAutoPtr<IEventHandle> &ev) -> auto { + TVector<THolder<IEventHandle>> suppressed; + auto suppressEvent = [&](TTestActorRuntimeBase& runtime, TAutoPtr<IEventHandle> &ev) -> auto { if (ev->GetTypeRewrite() == TEvDataShard::TEvStateChanged::EventType) { auto *msg = ev->Get<TEvDataShard::TEvStateChanged>(); auto state = msg->Record.GetState(); - Cerr << "TEvStateChanged has happend " << state << Endl; + Cerr << "TEvStateChanged has happened " << state << Endl; if (state == NDataShard::TShardState::Offline) { - Cerr << "supressEvent has happend" << Endl; - supressed.push_back(std::move(ev)); + Cerr << "suppressEvent has happened" << Endl; + suppressed.push_back(std::move(ev)); return TTestActorRuntime::EEventAction::DROP; } } @@ -71,7 +71,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardSplitTestReboots) { return prevObserver(runtime, ev); }; - runtime.SetObserverFunc(supressEvent); + runtime.SetObserverFunc(suppressEvent); TestSplitTable(runtime, ++t.TxId, "/MyRoot/Table", R"( SourceTabletId: 9437194 @@ -87,10 +87,10 @@ Y_UNIT_TEST_SUITE(TSchemeShardSplitTestReboots) { t.TestEnv->TestWaitNotification(runtime, t.TxId); runtime.SetObserverFunc(prevObserver); - for (auto& ev : supressed) { + for (auto& ev : suppressed) { runtime.Send(ev.Release(), 0, /* via actor system */ true); } - supressed.clear(); + suppressed.clear(); t.TestEnv->TestWaitTabletDeletion(runtime, xrange(TTestTxConfig::FakeHiveTablets, TTestTxConfig::FakeHiveTablets+1)); @@ -851,7 +851,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardSplitTestReboots) { }, false); } - Y_UNIT_TEST(ForceDropAndCopyInParallelAllPathesAreLocked) { //+ + Y_UNIT_TEST(ForceDropAndCopyInParallelAllPathsAreLocked) { //+ TTestWithReboots t(true); t.Run([&](TTestActorRuntime& runtime, bool& activeZone) { { diff --git a/ydb/core/tx/schemeshard/ut_stats.cpp b/ydb/core/tx/schemeshard/ut_stats.cpp index f0c986fa347..d2fbcaf251a 100644 --- a/ydb/core/tx/schemeshard/ut_stats.cpp +++ b/ydb/core/tx/schemeshard/ut_stats.cpp @@ -234,7 +234,7 @@ Y_UNIT_TEST_SUITE(TSchemeshardStatsBatchingTest) { })"); env.TestWaitNotification(runtime, txId); - // we need this to fullfill batch so that actual split happens + // we need this to fullfil batch so that actual split happens CreateTable(runtime, env, "/MyRoot", "Simple2", 1, txId); while (statsCount <= statsCountBefore + batchSize) { diff --git a/ydb/core/tx/schemeshard/ut_subdomain.cpp b/ydb/core/tx/schemeshard/ut_subdomain.cpp index 4a48cb69004..f07c58c2dec 100644 --- a/ydb/core/tx/schemeshard/ut_subdomain.cpp +++ b/ydb/core/tx/schemeshard/ut_subdomain.cpp @@ -862,7 +862,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardSubDomainTest) { } - Y_UNIT_TEST(SimultaneousCreateTableFroceDrop) { + Y_UNIT_TEST(SimultaneousCreateTableForceDrop) { TTestBasicRuntime runtime; TTestEnv env(runtime); ui64 txId = 100; @@ -900,7 +900,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardSubDomainTest) { UNIT_ASSERT(!CheckLocalRowExists(runtime, TTestTxConfig::SchemeShard, "Paths", "Id", 2)); } - Y_UNIT_TEST(SimultaneousCreateTenantTableFroceDrop) { + Y_UNIT_TEST(SimultaneousCreateTenantTableForceDrop) { TTestBasicRuntime runtime; TTestEnv env(runtime); ui64 txId = 100; @@ -2745,7 +2745,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardSubDomainTest) { KeyColumnNames: ["key"] )", {NKikimrScheme::StatusAccepted}); - // Quotas consuption is persistent, on reboot they should stay consumed + // Quotas consumption is persistent, on reboot they should stay consumed { TActorId sender = runtime.AllocateEdgeActor(); RebootTablet(runtime, TTestTxConfig::SchemeShard, sender); diff --git a/ydb/core/tx/schemeshard/ut_subdomain_reboots.cpp b/ydb/core/tx/schemeshard/ut_subdomain_reboots.cpp index 8d867909d90..890a48d9089 100644 --- a/ydb/core/tx/schemeshard/ut_subdomain_reboots.cpp +++ b/ydb/core/tx/schemeshard/ut_subdomain_reboots.cpp @@ -831,7 +831,7 @@ Y_UNIT_TEST_SUITE(ForceDropWithReboots) { }); } - Y_UNIT_TEST(PathesAndShardsCountersSimultaneousAlterSubDomain) { + Y_UNIT_TEST(PathsAndShardsCountersSimultaneousAlterSubDomain) { TTestWithReboots t; t.Run([&](TTestActorRuntime& runtime, bool& activeZone) { { diff --git a/ydb/core/tx/schemeshard/ut_ttl.cpp b/ydb/core/tx/schemeshard/ut_ttl.cpp index 51dcd327b48..6eaf99e5e22 100644 --- a/ydb/core/tx/schemeshard/ut_ttl.cpp +++ b/ydb/core/tx/schemeshard/ut_ttl.cpp @@ -362,7 +362,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardTTLTests) { env.TestWaitNotification(runtime, txId); CheckTTLSettings(runtime); - TestBuilIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/TTLEnabledTable", + TestBuildIndex(runtime, ++txId, TTestTxConfig::SchemeShard, "/MyRoot", "/MyRoot/TTLEnabledTable", TBuildIndexConfig{"UserDefinedIndexByValue", indexType, {"value"}, {}}); env.TestWaitNotification(runtime, txId); |