issue-2639: 1. renamed ShardName/shardName to ShardNodeName/shardNode…

…Name where it was still called ShardName/shardName 2. not generating ShardNodeName upon node creation if this node isn't actually going to be created in one of the shards - in order not to waste space in NodeRefs table (#2648)

cloud/filestore/apps/client/lib/find_garbage.cpp

@@ -156,13 +156,13 @@ class TFindGarbageCommand final
         FetchAll(session, FileSystemId, RootNodeId, &leaderNodes);
         STORAGE_INFO("Fetched " << leaderNodes.size() << " nodes");
 
-        THashSet<TString> shardNames;
+        THashSet<TString> shardNodeNames;
         for (const auto& node: leaderNodes) {
             if (!node.ShardFileSystemId) {
                 continue;
             }
 
-            shardNames.insert(node.ShardNodeName);
+            shardNodeNames.insert(node.ShardNodeName);
         }
 
         struct TResult
@@ -187,7 +187,7 @@ class TFindGarbageCommand final
                 CreateCustomSession(shard, shard + "::" + ClientId);
             auto& shardSession = shardSessionGuard.AccessSession();
             for (const auto& node: nodes) {
-                if (!shardNames.contains(node.Name)) {
+                if (!shardNodeNames.contains(node.Name)) {
                     STORAGE_INFO("Node " << node.Name << " not found in shard"
                         ", calling stat");
                     auto stat =

cloud/filestore/libs/storage/tablet/tablet_actor_createhandle.cpp

@@ -206,7 +206,7 @@ bool TIndexTabletActor::PrepareTx_CreateHandle(
 
             if (args.RequestShardId) {
                 args.ShardId = args.RequestShardId;
-                args.ShardName = CreateGuidAsString();
+                args.ShardNodeName = CreateGuidAsString();
                 args.IsNewShardNode = true;
             }
         } else {
@@ -218,7 +218,7 @@ bool TIndexTabletActor::PrepareTx_CreateHandle(
 
             args.TargetNodeId = ref->ChildNodeId;
             args.ShardId = ref->ShardId;
-            args.ShardName = ref->ShardName;
+            args.ShardNodeName = ref->ShardNodeName;
         }
     } else {
         args.TargetNodeId = args.NodeId;
@@ -317,7 +317,7 @@ void TIndexTabletActor::ExecuteTx_CreateHandle(
             args.Name,
             args.TargetNodeId,
             args.ShardId,
-            args.ShardName);
+            args.ShardNodeName);
 
         // update parent cmtime as we created a new entry
         auto parent = CopyAttrs(args.ParentNode->Attrs, E_CM_CMTIME);
@@ -375,7 +375,7 @@ void TIndexTabletActor::ExecuteTx_CreateHandle(
         ConvertNodeFromAttrs(*node, args.TargetNodeId, args.TargetNode->Attrs);
     } else {
         args.Response.SetShardFileSystemId(args.ShardId);
-        args.Response.SetShardNodeName(args.ShardName);
+        args.Response.SetShardNodeName(args.ShardNodeName);
     }
 
     if (args.IsNewShardNode) {
@@ -389,7 +389,7 @@ void TIndexTabletActor::ExecuteTx_CreateHandle(
         shardRequest->SetGid(args.Gid);
         shardRequest->SetFileSystemId(args.ShardId);
         shardRequest->SetNodeId(RootNodeId);
-        shardRequest->SetName(args.ShardName);
+        shardRequest->SetName(args.ShardNodeName);
         shardRequest->ClearShardFileSystemId();
 
         db.WriteOpLogEntry(args.OpLogEntry);
@@ -424,7 +424,7 @@ void TIndexTabletActor::CompleteTx_CreateHandle(
             "%s Creating node in shard upon CreateHandle: %s, %s",
             LogTag.c_str(),
             args.ShardId.c_str(),
-            args.ShardName.c_str());
+            args.ShardNodeName.c_str());
 
         RegisterCreateNodeInShardActor(
             ctx,

cloud/filestore/libs/storage/tablet/tablet_actor_createnode.cpp

@@ -491,7 +491,7 @@ void TIndexTabletActor::ExecuteTx_CreateNode(
             shardRequest->CopyFrom(args.Request);
             shardRequest->SetFileSystemId(args.ShardId);
             shardRequest->SetNodeId(RootNodeId);
-            shardRequest->SetName(args.ShardName);
+            shardRequest->SetName(args.ShardNodeName);
             shardRequest->ClearShardFileSystemId();
 
             db.WriteOpLogEntry(args.OpLogEntry);
@@ -533,7 +533,7 @@ void TIndexTabletActor::ExecuteTx_CreateNode(
         args.Name,
         args.ChildNodeId,
         args.ShardId,
-        args.ShardName);
+        args.ShardNodeName);
 
     if (args.ShardId.empty()) {
         if (args.ChildNodeId == InvalidNodeId) {
@@ -572,7 +572,7 @@ void TIndexTabletActor::CompleteTx_CreateNode(
             "%s Creating node in shard upon CreateNode: %s, %s",
             LogTag.c_str(),
             args.ShardId.c_str(),
-            args.ShardName.c_str());
+            args.ShardNodeName.c_str());
 
         RegisterCreateNodeInShardActor(
             ctx,

cloud/filestore/libs/storage/tablet/tablet_actor_deletecheckpoint.cpp

@@ -205,7 +205,7 @@ void TIndexTabletActor::ExecuteTx_DeleteCheckpoint(
                     ref.Name,
                     ref.ChildNodeId,
                     ref.ShardId,
-                    ref.ShardName);
+                    ref.ShardNodeName);
             }
 
             RemoveCheckpointNodes(db, checkpoint, args.NodeIds);

cloud/filestore/libs/storage/tablet/tablet_actor_getnodeattr.cpp

@@ -167,7 +167,7 @@ bool TIndexTabletActor::PrepareTx_GetNodeAttr(
 
         args.TargetNodeId = ref->ChildNodeId;
         args.ShardId = ref->ShardId;
-        args.ShardName = ref->ShardName;
+        args.ShardNodeName = ref->ShardNodeName;
     } else {
         args.TargetNodeId = args.NodeId;
     }
@@ -202,7 +202,7 @@ void TIndexTabletActor::CompleteTx_GetNodeAttr(
         auto* node = response->Record.MutableNode();
         if (args.ShardId) {
             node->SetShardFileSystemId(args.ShardId);
-            node->SetShardNodeName(args.ShardName);
+            node->SetShardNodeName(args.ShardNodeName);
         } else {
             TABLET_VERIFY(args.TargetNode);
             ConvertNodeFromAttrs(
@@ -389,7 +389,7 @@ bool TIndexTabletActor::PrepareTx_GetNodeAttrBatch(
         auto* nodeAttr = nodeResult->MutableNode();
         if (refs[i]->ShardId) {
             nodeAttr->SetShardFileSystemId(refs[i]->ShardId);
-            nodeAttr->SetShardNodeName(refs[i]->ShardName);
+            nodeAttr->SetShardNodeName(refs[i]->ShardNodeName);
             continue;
         }
 

cloud/filestore/libs/storage/tablet/tablet_actor_listnodes.cpp

@@ -27,12 +27,12 @@ void AddExternalNode(
     NProto::TListNodesResponse& record,
     TString name,
     const TString& shardId,
-    const TString& shardName)
+    const TString& shardNodeName)
 {
     record.AddNames(std::move(name));
     auto* node = record.AddNodes();
     node->SetShardFileSystemId(shardId);
-    node->SetShardNodeName(shardName);
+    node->SetShardNodeName(shardNodeName);
 }
 
 NProto::TError ValidateRequest(const NProto::TListNodesRequest& request)
@@ -199,7 +199,7 @@ void TIndexTabletActor::CompleteTx_ListNodes(
                     record,
                     ref.Name,
                     ref.ShardId,
-                    ref.ShardName);
+                    ref.ShardNodeName);
 
                 continue;
             }

cloud/filestore/libs/storage/tablet/tablet_actor_renamenode.cpp

@@ -204,7 +204,7 @@ bool TIndexTabletActor::PrepareTx_RenameNode(
         const bool isSameExternalNode = args.ChildRef->ShardId
             && args.NewChildRef->ShardId
             && args.ChildRef->ShardId == args.NewChildRef->ShardId
-            && args.ChildRef->ShardName == args.NewChildRef->ShardName;
+            && args.ChildRef->ShardNodeName == args.NewChildRef->ShardNodeName;
         if (isSameNode || isSameExternalNode) {
             args.Error = MakeError(S_ALREADY, "is the same file");
             return true;
@@ -290,7 +290,7 @@ void TIndexTabletActor::ExecuteTx_RenameNode(
         args.Name,
         args.ChildRef->ChildNodeId,
         args.ChildRef->ShardId,
-        args.ChildRef->ShardName);
+        args.ChildRef->ShardNodeName);
 
     if (args.NewChildRef) {
         if (HasFlag(args.Flags, NProto::TRenameNodeRequest::F_EXCHANGE)) {
@@ -303,7 +303,7 @@ void TIndexTabletActor::ExecuteTx_RenameNode(
                 args.NewName,
                 args.NewChildRef->NodeId,
                 args.NewChildRef->ShardId,
-                args.NewChildRef->ShardName);
+                args.NewChildRef->ShardNodeName);
 
             // create source ref to target node
             CreateNodeRef(
@@ -313,7 +313,7 @@ void TIndexTabletActor::ExecuteTx_RenameNode(
                 args.Name,
                 args.NewChildRef->ChildNodeId,
                 args.NewChildRef->ShardId,
-                args.NewChildRef->ShardName);
+                args.NewChildRef->ShardNodeName);
         } else if (args.NewChildRef->ShardId.empty()) {
             if (!args.NewChildNode) {
                 auto message = ReportNewChildNodeIsNull(TStringBuilder()
@@ -346,7 +346,7 @@ void TIndexTabletActor::ExecuteTx_RenameNode(
                 args.NewParentNode->NodeId,
                 args.NewName,
                 args.NewChildRef->ShardId,
-                args.NewChildRef->ShardName,
+                args.NewChildRef->ShardNodeName,
                 args.NewChildRef->MinCommitId,
                 args.CommitId);
 
@@ -359,7 +359,7 @@ void TIndexTabletActor::ExecuteTx_RenameNode(
                 args.Request.GetHeaders());
             shardRequest->SetFileSystemId(args.NewChildRef->ShardId);
             shardRequest->SetNodeId(RootNodeId);
-            shardRequest->SetName(args.NewChildRef->ShardName);
+            shardRequest->SetName(args.NewChildRef->ShardNodeName);
 
             db.WriteOpLogEntry(args.OpLogEntry);
         }
@@ -383,7 +383,7 @@ void TIndexTabletActor::ExecuteTx_RenameNode(
         args.NewName,
         args.ChildRef->ChildNodeId,
         args.ChildRef->ShardId,
-        args.ChildRef->ShardName);
+        args.ChildRef->ShardNodeName);
 
     auto newParent = CopyAttrs(args.NewParentNode->Attrs, E_CM_CMTIME);
     UpdateNode(

cloud/filestore/libs/storage/tablet/tablet_actor_unlinknode.cpp

@@ -381,7 +381,7 @@ void TIndexTabletActor::ExecuteTx_UnlinkNode(
             args.ParentNodeId,
             args.Name,
             args.ChildRef->ShardId,
-            args.ChildRef->ShardName,
+            args.ChildRef->ShardNodeName,
             args.ChildRef->MinCommitId,
             args.CommitId);
 
@@ -392,7 +392,7 @@ void TIndexTabletActor::ExecuteTx_UnlinkNode(
         shardRequest->CopyFrom(args.Request);
         shardRequest->SetFileSystemId(args.ChildRef->ShardId);
         shardRequest->SetNodeId(RootNodeId);
-        shardRequest->SetName(args.ChildRef->ShardName);
+        shardRequest->SetName(args.ChildRef->ShardNodeName);
 
         db.WriteOpLogEntry(args.OpLogEntry);
     } else {
@@ -452,7 +452,7 @@ void TIndexTabletActor::CompleteTx_UnlinkNode(
                 "%s Unlinking node in shard upon UnlinkNode: %s, %s",
                 LogTag.c_str(),
                 args.ChildRef->ShardId.c_str(),
-                args.ChildRef->ShardName.c_str());
+                args.ChildRef->ShardNodeName.c_str());
 
             RegisterUnlinkNodeInShardActor(
                 ctx,

cloud/filestore/libs/storage/tablet/tablet_database.cpp

@@ -484,7 +484,7 @@ void TIndexTabletDatabase::WriteNodeRef(
     const TString& name,
     ui64 childNodeId,
     const TString& shardId,
-    const TString& shardName)
+    const TString& shardNodeName)
 {
     using TTable = TIndexTabletSchema::NodeRefs;
 
@@ -494,7 +494,7 @@ void TIndexTabletDatabase::WriteNodeRef(
             NIceDb::TUpdate<TTable::CommitId>(commitId),
             NIceDb::TUpdate<TTable::ChildId>(childNodeId),
             NIceDb::TUpdate<TTable::ShardId>(shardId),
-            NIceDb::TUpdate<TTable::ShardName>(shardName)
+            NIceDb::TUpdate<TTable::ShardNodeName>(shardNodeName)
         );
 }
 
@@ -533,7 +533,7 @@ bool TIndexTabletDatabase::ReadNodeRef(
                 name,
                 it.GetValue<TTable::ChildId>(),
                 it.GetValue<TTable::ShardId>(),
-                it.GetValue<TTable::ShardName>(),
+                it.GetValue<TTable::ShardNodeName>(),
                 minCommitId,
                 maxCommitId
             };
@@ -573,7 +573,7 @@ bool TIndexTabletDatabase::ReadNodeRefs(
                 it.GetValue<TTable::Name>(),
                 it.GetValue<TTable::ChildId>(),
                 it.GetValue<TTable::ShardId>(),
-                it.GetValue<TTable::ShardName>(),
+                it.GetValue<TTable::ShardNodeName>(),
                 minCommitId,
                 maxCommitId
             });
@@ -624,7 +624,7 @@ bool TIndexTabletDatabase::ReadNodeRefs(
             it.GetValue<TTable::Name>(),
             it.GetValue<TTable::ChildId>(),
             it.GetValue<TTable::ShardId>(),
-            it.GetValue<TTable::ShardName>(),
+            it.GetValue<TTable::ShardNodeName>(),
             it.GetValue<TTable::CommitId>(),
             InvalidCommitId});
         --maxCount;
@@ -666,7 +666,7 @@ void TIndexTabletDatabase::WriteNodeRefVer(
     const TString& name,
     ui64 childNodeId,
     const TString& shardId,
-    const TString& shardName)
+    const TString& shardNodeName)
 {
     using TTable = TIndexTabletSchema::NodeRefs_Ver;
 
@@ -676,7 +676,7 @@ void TIndexTabletDatabase::WriteNodeRefVer(
             NIceDb::TUpdate<TTable::MaxCommitId>(maxCommitId),
             NIceDb::TUpdate<TTable::ChildId>(childNodeId),
             NIceDb::TUpdate<TTable::ShardId>(shardId),
-            NIceDb::TUpdate<TTable::ShardName>(shardName)
+            NIceDb::TUpdate<TTable::ShardNodeName>(shardNodeName)
         );
 }
 
@@ -725,7 +725,7 @@ bool TIndexTabletDatabase::ReadNodeRefVer(
                 name,
                 it.GetValue<TTable::ChildId>(),
                 it.GetValue<TTable::ShardId>(),
-                it.GetValue<TTable::ShardName>(),
+                it.GetValue<TTable::ShardNodeName>(),
                 minCommitId,
                 maxCommitId
             };
@@ -765,7 +765,7 @@ bool TIndexTabletDatabase::ReadNodeRefVers(
                 it.GetValue<TTable::Name>(),
                 it.GetValue<TTable::ChildId>(),
                 it.GetValue<TTable::ShardId>(),
-                it.GetValue<TTable::ShardName>(),
+                it.GetValue<TTable::ShardNodeName>(),
                 minCommitId,
                 maxCommitId
             });
@@ -2138,22 +2138,22 @@ void TIndexTabletDatabaseProxy::WriteNodeRef(
     const TString& name,
     ui64 childNode,
     const TString& shardId,
-    const TString& shardName)
+    const TString& shardNodeName)
 {
     TIndexTabletDatabase::WriteNodeRef(
         nodeId,
         commitId,
         name,
         childNode,
         shardId,
-        shardName);
+        shardNodeName);
     NodeUpdates.emplace_back(TInMemoryIndexState::TWriteNodeRefsRequest{
         .NodeRefsKey = {nodeId, name},
         .NodeRefsRow = {
             .CommitId = commitId,
             .ChildId = childNode,
             .ShardId = shardId,
-            .ShardName = shardName}});
+            .ShardNodeName = shardNodeName}});
 }
 
 void TIndexTabletDatabaseProxy::DeleteNodeRef(ui64 nodeId, const TString& name)
@@ -2170,7 +2170,7 @@ void TIndexTabletDatabaseProxy::WriteNodeRefVer(
     const TString& name,
     ui64 childNode,
     const TString& shardId,
-    const TString& shardName)
+    const TString& shardNodeName)
 {
     TIndexTabletDatabase::WriteNodeRefVer(
         nodeId,
@@ -2179,7 +2179,7 @@ void TIndexTabletDatabaseProxy::WriteNodeRefVer(
         name,
         childNode,
         shardId,
-        shardName);
+        shardNodeName);
     // TODO(#1146): _Ver tables not yet supported
 }
 
@@ -2201,7 +2201,7 @@ TIndexTabletDatabaseProxy::ExtractWriteNodeRefsFromNodeRef(const TNodeRef& ref)
             .CommitId = ref.MinCommitId,
             .ChildId = ref.ChildNodeId,
             .ShardId = ref.ShardId,
-            .ShardName = ref.ShardName}};
+            .ShardNodeName = ref.ShardNodeName}};
 }
 
 }   // namespace NCloud::NFileStore::NStorage