return grandchildren flag

ydb/core/protos/flat_scheme_op.proto

@@ -1862,6 +1862,7 @@ message TDirEntry {
     optional uint64 PathVersion = 13;
     optional EPathSubType PathSubType = 14;
     optional TPathVersion Version = 15;
+    optional bool ChildrenExist = 16;
 
     optional uint64 BalancerTabletID = 999; //temporary optimization for old PQ read/write protocol. Must be removed later
 }

ydb/core/tx/schemeshard/olap/operations/create_store.cpp

@@ -503,7 +503,7 @@ class TCreateOlapStore: public TSubOperation {
         dstPath.DomainInfo()->IncPathsInside();
         dstPath.DomainInfo()->AddInternalShards(txState);
         dstPath.Base()->IncShardsInside(shardsToCreate);
-        parentPath.Base()->IncAliveChildren();
+        IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
 
         SetState(NextState());
         return result;

ydb/core/tx/schemeshard/olap/operations/create_table.cpp

@@ -866,7 +866,7 @@ class TCreateColumnTable: public TSubOperation {
             dstPath.DomainInfo()->AddInternalShards(txState);
             dstPath.Base()->IncShardsInside(tableInfo->GetOwnedColumnShardsVerified().size());
         }
-        parentPath.Base()->IncAliveChildren();
+        IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
 
         SetState(NextState(!!storeInfo));
         return result;

ydb/core/tx/schemeshard/olap/operations/drop_store.cpp

@@ -93,7 +93,7 @@ class TPropose: public TSubOperationState {
 
         auto domainInfo = context.SS->ResolveDomainInfo(pathId);
         domainInfo->DecPathsInside();
-        parentDir->DecAliveChildren();
+        DecAliveChildrenDirect(OperationId, parentDir, context); // for correct discard of ChildrenExist prop
 
         context.SS->TabletCounters->Simple()[COUNTER_USER_ATTRIBUTES_COUNT].Sub(path->UserAttrs->Size());
         context.SS->PersistUserAttributes(db, path->PathId, path->UserAttrs, nullptr);

ydb/core/tx/schemeshard/olap/operations/drop_table.cpp

@@ -132,7 +132,7 @@ class TPropose: public TSubOperationState {
 
         auto domainInfo = context.SS->ResolveDomainInfo(pathId);
         domainInfo->DecPathsInside();
-        parentDir->DecAliveChildren();
+        DecAliveChildrenDirect(OperationId, parentDir, context); // for correct discard of ChildrenExist prop
 
         context.SS->TabletCounters->Simple()[COUNTER_USER_ATTRIBUTES_COUNT].Sub(path->UserAttrs->Size());
         context.SS->PersistUserAttributes(db, path->PathId, path->UserAttrs, nullptr);

ydb/core/tx/schemeshard/schemeshard__init.cpp

@@ -4112,7 +4112,7 @@ struct TSchemeShard::TTxInit : public TTransactionBase<TSchemeShard> {
 
             if (!path->IsRoot()) {
                 const bool isBackupTable = Self->IsBackupTable(item.first);
-                parent->IncAliveChildren(1, isBackupTable);
+                parent->IncAliveChildrenPrivate(isBackupTable);
                 inclusiveDomainInfo->IncPathsInside(1, isBackupTable);
             }
 

ydb/core/tx/schemeshard/schemeshard__operation_blob_depot.cpp

@@ -93,7 +93,7 @@ namespace NKikimr::NSchemeShard {
 
                     return !txState->ShardsInProgress;
                 }
-                
+
                 TString DebugHint() const override {
                     return TStringBuilder() << "TConfigureBlobDepotParts id# " << OperationId;
                 }
@@ -377,10 +377,10 @@ namespace NKikimr::NSchemeShard {
                 dstPath.DomainInfo()->IncPathsInside();
                 dstPath.DomainInfo()->AddInternalShards(txState);
                 dstPath->IncShardsInside();
-                parentPath->IncAliveChildren();
+                IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
 
                 SetState(TTxState::CreateParts);
-                
+
                 auto resp = MakeHolder<TProposeResponse>(NKikimrScheme::StatusAccepted, txId, ssId);
                 resp->SetPathId(pathId.LocalPathId);
                 return resp;

ydb/core/tx/schemeshard/schemeshard__operation_common.cpp

@@ -1170,6 +1170,53 @@ void IncParentDirAlterVersionWithRepublish(const TOperationId& opId, const TPath
     }
 }
 
+void IncAliveChildrenSafeWithUndo(const TOperationId& opId, const TPath& parentPath, TOperationContext& context, bool isBackup) {
+    parentPath.Base()->IncAliveChildrenPrivate(isBackup);
+    if (parentPath.Base()->GetAliveChildren() == 1 && !parentPath.Base()->IsDomainRoot()) {
+        auto grandParent = parentPath.Parent();
+        if (grandParent.Base()->IsDirectory() || grandParent.Base()->IsDomainRoot()) {
+            ++grandParent.Base()->DirAlterVersion;
+            context.DbChanges.PersistPath(grandParent.Base()->PathId);
+        }
+
+        if (grandParent.IsActive()) {
+            context.SS->ClearDescribePathCaches(grandParent.Base());
+            context.OnComplete.PublishToSchemeBoard(opId, grandParent->PathId);
+        }
+    }
+}
+
+void IncAliveChildrenDirect(const TOperationId& opId, const TPath& parentPath, TOperationContext& context, bool isBackup) {
+    parentPath.Base()->IncAliveChildrenPrivate(isBackup);
+    if (parentPath.Base()->GetAliveChildren() == 1 && !parentPath.Base()->IsDomainRoot()) {
+        auto grandParent = parentPath.Parent();
+        if (grandParent.Base()->IsDirectory() || grandParent.Base()->IsDomainRoot()) {
+            ++grandParent.Base()->DirAlterVersion;
+            NIceDb::TNiceDb db(context.GetDB());
+            context.SS->PersistPathDirAlterVersion(db, grandParent.Base());
+        }
+
+        if (grandParent.IsActive()) {
+            context.SS->ClearDescribePathCaches(grandParent.Base());
+            context.OnComplete.PublishToSchemeBoard(opId, grandParent->PathId);
+        }
+    }
+}
+
+void DecAliveChildrenDirect(const TOperationId& opId, TPathElement::TPtr parentPath, TOperationContext& context, bool isBackup) {
+    parentPath->DecAliveChildrenPrivate(isBackup);
+    if (parentPath->GetAliveChildren() == 0 && !parentPath->IsDomainRoot()) {
+        auto grandParentDir = context.SS->PathsById.at(parentPath->ParentPathId);
+        if (grandParentDir->IsDirectory() || grandParentDir->IsDomainRoot()) {
+            ++grandParentDir->DirAlterVersion;
+            NIceDb::TNiceDb db(context.GetDB());
+            context.SS->PersistPathDirAlterVersion(db, grandParentDir);
+            context.SS->ClearDescribePathCaches(grandParentDir);
+            context.OnComplete.PublishToSchemeBoard(opId, grandParentDir->PathId);
+        }
+    }
+}
+
 NKikimrSchemeOp::TModifyScheme MoveTableTask(NKikimr::NSchemeShard::TPath& src, NKikimr::NSchemeShard::TPath& dst) {
     NKikimrSchemeOp::TModifyScheme scheme;
 

ydb/core/tx/schemeshard/schemeshard__operation_common.h

@@ -20,6 +20,11 @@ TSet<ui32> AllIncomingEvents();
 void IncParentDirAlterVersionWithRepublishSafeWithUndo(const TOperationId& opId, const TPath& path, TSchemeShard* ss, TSideEffects& onComplete);
 void IncParentDirAlterVersionWithRepublish(const TOperationId& opId, const TPath& path, TOperationContext& context);
 
+void IncAliveChildrenSafeWithUndo(const TOperationId& opId, const TPath& parentPath, TOperationContext& context, bool isBackup = false);
+void IncAliveChildrenDirect(const TOperationId& opId, const TPath& parentPath, TOperationContext& context, bool isBackup = false);
+void DecAliveChildrenDirect(const TOperationId& opId, TPathElement::TPtr parentPath, TOperationContext& context, bool isBackup = false);
+
+
 NKikimrSchemeOp::TModifyScheme MoveTableTask(NKikimr::NSchemeShard::TPath& src, NKikimr::NSchemeShard::TPath& dst);
 NKikimrSchemeOp::TModifyScheme MoveTableIndexTask(NKikimr::NSchemeShard::TPath& src, NKikimr::NSchemeShard::TPath& dst);
 

ydb/core/tx/schemeshard/schemeshard__operation_copy_sequence.cpp

@@ -732,7 +732,7 @@ class TCopySequence: public TSubOperation {
         context.OnComplete.PublishToSchemeBoard(OperationId, dstPath->PathId);
 
         domainInfo->IncPathsInside();
-        parentPath->IncAliveChildren();
+        IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
 
         SetState(NextState());
         return result;

ydb/core/tx/schemeshard/schemeshard__operation_copy_table.cpp

@@ -715,7 +715,7 @@ class TCopyTable: public TSubOperation {
         dstPath.DomainInfo()->IncPathsInside(1, isBackup);
         dstPath.DomainInfo()->AddInternalShards(txState, isBackup);
         dstPath.Base()->IncShardsInside(shardsToCreate);
-        parent.Base()->IncAliveChildren(1, isBackup);
+        IncAliveChildrenSafeWithUndo(OperationId, parent, context, isBackup);
 
         LOG_TRACE_S(context.Ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
                 "TCopyTable Propose creating new table"

ydb/core/tx/schemeshard/schemeshard__operation_create_backup_collection.cpp

@@ -111,11 +111,6 @@ class TCreateBackupCollection : public TSubOperation {
         return backupCollection;
     }
 
-    static void UpdatePathSizeCounts(const TPath& parentPath, const TPath& dstPath) {
-        dstPath.DomainInfo()->IncPathsInside();
-        parentPath.Base()->IncAliveChildren();
-    }
-
 public:
     using TSubOperation::TSubOperation;
 
@@ -177,7 +172,7 @@ class TCreateBackupCollection : public TSubOperation {
         AddPathInSchemeShard(result, dstPath, owner);
         auto pathEl = CreateBackupCollectionPathElement(dstPath);
 
-        rootPath->IncAliveChildren();
+        IncAliveChildrenDirect(OperationId, rootPath, context); // for correct discard of ChildrenExist prop
         rootPath.DomainInfo()->IncPathsInside();
 
         auto backupCollection = TBackupCollectionInfo::Create(desc);
@@ -220,7 +215,8 @@ class TCreateBackupCollection : public TSubOperation {
                                                           context.SS,
                                                           context.OnComplete);
 
-        UpdatePathSizeCounts(rootPath, dstPath);
+        dstPath.DomainInfo()->IncPathsInside();
+        IncAliveChildrenDirect(OperationId, rootPath, context); // for correct discard of ChildrenExist prop
 
         SetState(NextState());
         return result;

ydb/core/tx/schemeshard/schemeshard__operation_create_bsv.cpp

@@ -365,7 +365,7 @@ class TCreateBlockStoreVolume: public TSubOperation {
         dstPath.DomainInfo()->IncPathsInside();
         dstPath.DomainInfo()->AddInternalShards(txState);
         dstPath.Base()->IncShardsInside(shardsToCreate);
-        parentPath.Base()->IncAliveChildren();
+        IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
 
         SetState(NextState());
         return result;

ydb/core/tx/schemeshard/schemeshard__operation_create_cdc_stream.cpp

@@ -325,7 +325,7 @@ class TNewCdcStream: public TSubOperation {
         context.SS->IncrementPathDbRefCount(pathId);
 
         streamPath.DomainInfo()->IncPathsInside();
-        tablePath.Base()->IncAliveChildren();
+        IncAliveChildrenSafeWithUndo(OperationId, tablePath, context); // for correct discard of ChildrenExist prop
 
         context.OnComplete.ActivateTx(OperationId);
 

ydb/core/tx/schemeshard/schemeshard__operation_create_external_data_source.cpp

@@ -216,11 +216,6 @@ class TCreateExternalDataSource : public TSubOperation {
         context.SS->PersistTxState(db, OperationId);
     }
 
-    static void UpdatePathSizeCounts(const TPath& parentPath, const TPath& dstPath) {
-        dstPath.DomainInfo()->IncPathsInside();
-        parentPath.Base()->IncAliveChildren();
-    }
-
 public:
     using TSubOperation::TSubOperation;
 
@@ -283,7 +278,8 @@ class TCreateExternalDataSource : public TSubOperation {
                                                           context.SS,
                                                           context.OnComplete);
 
-        UpdatePathSizeCounts(parentPath, dstPath);
+        dstPath.DomainInfo()->IncPathsInside();
+        IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
 
         SetState(NextState());
         return result;

ydb/core/tx/schemeshard/schemeshard__operation_create_external_table.cpp

@@ -285,12 +285,6 @@ class TCreateExternalTable: public TSubOperation {
         context.SS->PersistTxState(db, OperationId);
     }
 
-    static void UpdatePathSizeCounts(const TPath& parentPath,
-                                     const TPath& dstPath) {
-        dstPath.DomainInfo()->IncPathsInside();
-        parentPath.Base()->IncAliveChildren();
-    }
-
 public:
     using TSubOperation::TSubOperation;
 
@@ -376,7 +370,8 @@ class TCreateExternalTable: public TSubOperation {
                                                           context.SS,
                                                           context.OnComplete);
 
-        UpdatePathSizeCounts(parentPath, dstPath);
+        dstPath.DomainInfo()->IncPathsInside();
+        IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
 
         SetState(NextState());
         return result;

ydb/core/tx/schemeshard/schemeshard__operation_create_extsubdomain.cpp

@@ -262,7 +262,7 @@ class TCreateExtSubDomain: public TSubOperation {
 
         Y_ABORT_UNLESS(0 == txState.Shards.size());
         parentPath.DomainInfo()->IncPathsInside();
-        parentPath.Base()->IncAliveChildren();
+        IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
 
         SetState(NextState());
         return result;

ydb/core/tx/schemeshard/schemeshard__operation_create_fs.cpp

@@ -431,7 +431,7 @@ THolder<TProposeResponse> TCreateFileStore::Propose(
     dstPath.DomainInfo()->IncPathsInside();
     dstPath.DomainInfo()->AddInternalShards(txState);
     dstPath.Base()->IncShardsInside(shardsToCreate);
-    parentPath.Base()->IncAliveChildren();
+    IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
 
     SetState(NextState());
     return result;

ydb/core/tx/schemeshard/schemeshard__operation_create_index.cpp

@@ -246,7 +246,7 @@ class TCreateTableIndex: public TSubOperation {
         context.OnComplete.ActivateTx(OperationId);
 
         dstPath.DomainInfo()->IncPathsInside();
-        parentPath.Base()->IncAliveChildren();
+        IncAliveChildrenSafeWithUndo(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
 
         SetState(NextState());
         return result;

ydb/core/tx/schemeshard/schemeshard__operation_create_kesus.cpp

@@ -406,7 +406,7 @@ class TCreateKesus: public TSubOperation {
         dstPath.DomainInfo()->AddInternalShards(txState);
 
         dstPath.Base()->IncShardsInside();
-        parentPath.Base()->IncAliveChildren();
+        IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
 
         SetState(NextState());
         return result;

ydb/core/tx/schemeshard/schemeshard__operation_create_pq.cpp

@@ -558,7 +558,7 @@ class TCreatePQ: public TSubOperation {
         context.SS->TabletCounters->Simple()[COUNTER_STREAM_SHARDS_COUNT].Add(StreamShardsCountChange);
 
         dstPath.Base()->IncShardsInside(shardsToCreate);
-        parentPath.Base()->IncAliveChildren();
+        IncAliveChildrenSafeWithUndo(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
 
         SetState(NextState());
         return result;

ydb/core/tx/schemeshard/schemeshard__operation_create_replication.cpp

@@ -397,7 +397,7 @@ class TCreateReplication: public TSubOperation {
         result->SetPathId(path->PathId.LocalPathId);
 
         context.SS->IncrementPathDbRefCount(path->PathId);
-        parentPath->IncAliveChildren();
+        IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
         parentPath.DomainInfo()->IncPathsInside();
 
         if (desc.GetConfig().GetSrcConnectionParams().GetCredentialsCase() == NKikimrReplication::TConnectionParams::CREDENTIALS_NOT_SET) {

ydb/core/tx/schemeshard/schemeshard__operation_create_resource_pool.cpp

@@ -138,11 +138,6 @@ class TCreateResourcePool : public TSubOperation {
         return resourcePool;
     }
 
-    static void UpdatePathSizeCounts(const TPath& parentPath, const TPath& dstPath) {
-        dstPath.DomainInfo()->IncPathsInside();
-        parentPath.Base()->IncAliveChildren();
-    }
-
 public:
     using TSubOperation::TSubOperation;
 
@@ -187,7 +182,8 @@ class TCreateResourcePool : public TSubOperation {
 
         IncParentDirAlterVersionWithRepublishSafeWithUndo(OperationId, dstPath, context.SS, context.OnComplete);
 
-        UpdatePathSizeCounts(parentPath, dstPath);
+        dstPath.DomainInfo()->IncPathsInside();
+        IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
 
         SetState(NextState());
         return result;

ydb/core/tx/schemeshard/schemeshard__operation_create_rtmr.cpp

@@ -372,7 +372,7 @@ class TCreateRTMR: public TSubOperation {
         dstPath.DomainInfo()->AddInternalShards(txState);
 
         dstPath.Base()->IncShardsInside(shardsToCreate);
-        parentPath.Base()->IncAliveChildren();
+        IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
 
         SetState(NextState());
         return result;

ydb/core/tx/schemeshard/schemeshard__operation_create_sequence.cpp

@@ -577,7 +577,7 @@ class TCreateSequence : public TSubOperation {
         context.OnComplete.PublishToSchemeBoard(OperationId, dstPath->PathId);
 
         domainInfo->IncPathsInside();
-        parentPath->IncAliveChildren();
+        IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
 
         SetState(NextState());
         return result;

ydb/core/tx/schemeshard/schemeshard__operation_create_solomon.cpp

@@ -422,7 +422,7 @@ class TCreateSolomon: public TSubOperation {
         dstPath.DomainInfo()->AddInternalShards(txState);
 
         dstPath.Base()->IncShardsInside(shardsToCreate);
-        parentPath.Base()->IncAliveChildren();
+        IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
 
         SetState(NextState());
         return result;

ydb/core/tx/schemeshard/schemeshard__operation_create_subdomain.cpp

@@ -344,7 +344,7 @@ class TCreateSubDomain: public TSubOperation {
         dstPath.DomainInfo()->AddInternalShards(txState);
 
         dstPath.Base()->IncShardsInside(shardsToCreate);
-        parentPath.Base()->IncAliveChildren();
+        IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
 
         SetState(NextState());
         return result;

ydb/core/tx/schemeshard/schemeshard__operation_create_table.cpp

@@ -728,7 +728,7 @@ class TCreateTable: public TSubOperation {
         dstPath.DomainInfo()->AddInternalShards(txState);
 
         dstPath.Base()->IncShardsInside(shardsToCreate);
-        parentPath.Base()->IncAliveChildren();
+        IncAliveChildrenDirect(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
 
         LOG_TRACE_S(context.Ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
                 "TCreateTable Propose creating new table"

ydb/core/tx/schemeshard/schemeshard__operation_create_view.cpp

@@ -198,7 +198,8 @@ class TCreateView: public TSubOperation {
 
         dstPath.MaterializeLeaf(owner, viewPathId);
         dstPath.DomainInfo()->IncPathsInside();
-        parentPath.Base()->IncAliveChildren();
+        IncAliveChildrenSafeWithUndo(OperationId, parentPath, context); // for correct discard of ChildrenExist prop
+
         result->SetPathId(viewPathId.LocalPathId);
 
         TPathElement::TPtr viewPath = dstPath.Base();

ydb/core/tx/schemeshard/schemeshard__operation_drop_backup_collection.cpp

@@ -47,7 +47,7 @@ class TPropose : public TSubOperationState {
 
         auto domainInfo = context.SS->ResolveDomainInfo(pathId);
         domainInfo->DecPathsInside();
-        parentDirPtr->DecAliveChildren();
+        DecAliveChildrenDirect(OperationId, parentDirPtr, context); // for correct discard of ChildrenExist prop
         context.SS->TabletCounters->Simple()[COUNTER_BACKUP_COLLECTION_COUNT].Sub(1);
 
         ++parentDirPtr->DirAlterVersion;