YT-22593: And even more trivial TString->std::string migrations

babenko · babenko · commit c890e9d1c527 · 2025-02-22T18:01:12.000+03:00
commit_hash:b9219ac687ce03d9fb08849ad0629e7b471a7642
diff --git a/yt/yt/client/api/operation_client.h b/yt/yt/client/api/operation_client.h
@@ -114,11 +114,11 @@ struct TGetJobFailContextOptions
 struct TListOperationsAccessFilter
     : public NYTree::TYsonStruct
 {
-    TString Subject;
+    std::string Subject;
     NYTree::EPermissionSet Permissions;
 
     // This parameter cannot be set from YSON, it must be computed.
-    THashSet<TString> SubjectTransitiveClosure;
+    THashSet<std::string> SubjectTransitiveClosure;
 
     REGISTER_YSON_STRUCT(TListOperationsAccessFilter);
 
@@ -303,7 +303,7 @@ struct TOperation
     std::optional<TInstant> StartTime;
     std::optional<TInstant> FinishTime;
 
-    std::optional<TString> AuthenticatedUser;
+    std::optional<std::string> AuthenticatedUser;
 
     NYson::TYsonString BriefSpec;
     NYson::TYsonString Spec;
@@ -319,7 +319,7 @@ struct TOperation
     NYson::TYsonString RuntimeParameters;
 
     std::optional<bool> Suspended;
-    std::optional<TString> SuspendReason;
+    std::optional<std::string> SuspendReason;
 
     NYson::TYsonString Events;
     NYson::TYsonString Result;
diff --git a/yt/yt/client/security_client/acl.cpp b/yt/yt/client/security_client/acl.cpp
@@ -16,7 +16,7 @@ TSerializableAccessControlEntry::TSerializableAccessControlEntry() = default;
 
 TSerializableAccessControlEntry::TSerializableAccessControlEntry(
     ESecurityAction action,
-    std::vector<TString> subjects,
+    std::vector<std::string> subjects,
     EPermissionSet permissions,
     EAceInheritanceMode inheritanceMode)
     : Action(action)
diff --git a/yt/yt/client/security_client/acl.h b/yt/yt/client/security_client/acl.h
@@ -17,16 +17,16 @@ namespace NYT::NSecurityClient {
 struct TSerializableAccessControlEntry
 {
     ESecurityAction Action = ESecurityAction::Undefined;
-    std::vector<TString> Subjects;
+    std::vector<std::string> Subjects;
     NYTree::EPermissionSet Permissions;
     EAceInheritanceMode InheritanceMode = EAceInheritanceMode::ObjectAndDescendants;
-    TString SubjectTagFilter;
+    std::optional<std::string> SubjectTagFilter;
     std::optional<std::vector<std::string>> Columns;
     std::optional<bool> Vital;
 
     TSerializableAccessControlEntry(
         ESecurityAction action,
-        std::vector<TString> subjects,
+        std::vector<std::string> subjects,
         NYTree::EPermissionSet permissions,
         EAceInheritanceMode inheritanceMode = EAceInheritanceMode::ObjectAndDescendants);
 
diff --git a/yt/yt/client/security_client/helpers.cpp b/yt/yt/client/security_client/helpers.cpp
@@ -15,12 +15,12 @@ TYPath GetUserPath(const std::string& name)
     return "//sys/users/" + ToYPathLiteral(name);
 }
 
-TYPath GetGroupPath(const TString& name)
+TYPath GetGroupPath(const std::string& name)
 {
     return "//sys/groups/" + ToYPathLiteral(name);
 }
 
-TYPath GetAccountPath(const TString& name)
+TYPath GetAccountPath(const std::string& name)
 {
     return "//sys/accounts/" + ToYPathLiteral(name);
 }
@@ -29,15 +29,15 @@ TYPath GetAccountPath(const TString& name)
 
 ESecurityAction CheckPermissionsByAclAndSubjectClosure(
     const TSerializableAccessControlList& acl,
-    const THashSet<TString>& subjectClosure,
+    const THashSet<std::string>& subjectClosure,
     NYTree::EPermissionSet permissions)
 {
     NYTree::EPermissionSet allowedPermissions = {};
     NYTree::EPermissionSet deniedPermissions = {};
 
     for (const auto& ace : acl.Entries) {
         if (ace.Action != NSecurityClient::ESecurityAction::Allow && ace.Action != NSecurityClient::ESecurityAction::Deny) {
-            THROW_ERROR_EXCEPTION("Action %Qv is not supported", FormatEnum(ace.Action));
+            THROW_ERROR_EXCEPTION("Action %Qlv is not supported", ace.Action);
         }
         for (const auto& aceSubject : ace.Subjects) {
             if (subjectClosure.contains(aceSubject)) {
diff --git a/yt/yt/client/security_client/helpers.h b/yt/yt/client/security_client/helpers.h
@@ -12,14 +12,14 @@ namespace NYT::NSecurityClient {
 ////////////////////////////////////////////////////////////////////////////////
 
 NYPath::TYPath GetUserPath(const std::string& name);
-NYPath::TYPath GetGroupPath(const TString& name);
-NYPath::TYPath GetAccountPath(const TString& name);
+NYPath::TYPath GetGroupPath(const std::string& name);
+NYPath::TYPath GetAccountPath(const std::string& name);
 
 ////////////////////////////////////////////////////////////////////////////////
 
 ESecurityAction CheckPermissionsByAclAndSubjectClosure(
     const TSerializableAccessControlList& acl,
-    const THashSet<TString>& subjectClosure,
+    const THashSet<std::string>& subjectClosure,
     NYTree::EPermissionSet permissions);
 
 void ValidateSecurityTag(const TSecurityTag& tag);
diff --git a/yt/yt/client/ypath/rich.cpp b/yt/yt/client/ypath/rich.cpp
@@ -662,8 +662,7 @@ std::optional<std::string> TRichYPath::GetCluster() const
 
 void TRichYPath::SetCluster(const std::string& value)
 {
-    // TODO(babenko): switch to std::string
-    Attributes().Set("cluster", TString(value));
+    Attributes().Set("cluster", value);
 }
 
 std::optional<std::vector<TString>> TRichYPath::GetClusters() const
diff --git a/yt/yt/core/misc/configurable_singleton_def-inl.h b/yt/yt/core/misc/configurable_singleton_def-inl.h
@@ -64,8 +64,7 @@ struct TSingletonConfigHelpers
         return [=] (NYTree::TYsonStructRegistrar<TManagerConfig> registrar) {
             SetupSingletonConfigParameter(
                 registrar.template ParameterWithUniversalAccessor<TIntrusivePtr<TSingletonConfig>>(
-                    // TODO(babenko): switch to std::string
-                    TString(singletonName),
+                    singletonName,
                     [=] (TManagerConfig* config) -> auto& {
                         auto it = config->NameToConfig_.find(singletonName);
                         if (it == config->NameToConfig_.end()) {
diff --git a/yt/yt/core/rpc/service_detail.cpp b/yt/yt/core/rpc/service_detail.cpp
@@ -324,7 +324,9 @@ TServiceBase::TPerformanceCounters::TPerformanceCounters(const NProfiling::TProf
 NProfiling::TCounter* TServiceBase::TPerformanceCounters::GetRequestsPerUserAgentCounter(TStringBuf userAgent)
 {
     return RequestsPerUserAgent_.FindOrInsert(userAgent, [&] {
-        return Profiler_.WithRequiredTag("user_agent", TString(userAgent)).Counter("/user_agent");
+        return Profiler_
+            .WithRequiredTag("user_agent", std::string(userAgent))
+            .Counter("/user_agent");
     }).first;
 }
 
@@ -2318,7 +2320,6 @@ TServiceBase::TMethodPerformanceCountersPtr TServiceBase::CreateMethodPerformanc
 
     auto profiler = runtimeInfo->Profiler.WithSparse();
     if (userTag) {
-        // TODO(babenko): migrate to std::string
         profiler = profiler.WithTag("user", std::string(userTag));
     }
     if (runtimeInfo->Descriptor.RequestQueueProvider) {
diff --git a/yt/yt/core/rpc/service_detail.h b/yt/yt/core/rpc/service_detail.h
@@ -766,7 +766,7 @@ class TServiceBase
         std::atomic<TDuration> LoggingSuppressionTimeout = {};
 
         using TNonowningPerformanceCountersKey = std::tuple<TStringBuf, TRequestQueue*>;
-        using TOwningPerformanceCountersKey = std::tuple<TString, TRequestQueue*>;
+        using TOwningPerformanceCountersKey = std::tuple<std::string, TRequestQueue*>;
         using TPerformanceCountersKeyHash = THash<TNonowningPerformanceCountersKey>;
 
         struct TPerformanceCountersKeyEquals
@@ -813,7 +813,7 @@ class TServiceBase
         const NProfiling::TProfiler Profiler_;
 
         //! Number of requests per user agent.
-        NConcurrency::TSyncMap<TString, NProfiling::TCounter> RequestsPerUserAgent_;
+        NConcurrency::TSyncMap<std::string, NProfiling::TCounter, THash<TStringBuf>, TEqualTo<TStringBuf>> RequestsPerUserAgent_;
     };
 
     using TPerformanceCountersPtr = TIntrusivePtr<TPerformanceCounters>;
diff --git a/yt/yt/core/ytree/attributes.cpp b/yt/yt/core/ytree/attributes.cpp
@@ -28,8 +28,7 @@ TYsonString IAttributeDictionary::GetYsonAndRemove(TKeyView key)
 void IAttributeDictionary::MergeFrom(const IMapNodePtr& other)
 {
     for (const auto& [key, value] : other->GetChildren()) {
-        // TODO(babenko): migrate to std::string
-        SetYson(TString(key), ConvertToYsonString(value));
+        SetYson(key, ConvertToYsonString(value));
     }
 }
 
@@ -64,8 +63,7 @@ IAttributeDictionaryPtr IAttributeDictionary::FromMap(const IMapNodePtr& node)
     auto attributes = CreateEphemeralAttributes();
     auto children = node->GetChildren();
     for (int index = 0; index < std::ssize(children); ++index) {
-        // TODO(babenko): migrate to std::string
-        attributes->SetYson(TString(children[index].first), ConvertToYsonString(children[index].second));
+        attributes->SetYson(children[index].first, ConvertToYsonString(children[index].second));
     }
     return attributes;
 }
diff --git a/yt/yt/core/ytree/yson_struct-inl.h b/yt/yt/core/ytree/yson_struct-inl.h
@@ -337,8 +337,7 @@ THashMap<TKey, TIntrusivePtr<TValue>> CloneYsonStructs(const THashMap<TKey, TInt
     THashMap<TKey, TIntrusivePtr<TValue>> clonedObjs;
     clonedObjs.reserve(objs.size());
     for (const auto& [key, obj] : objs) {
-        // TODO(babenko): switch to std::string
-        clonedObjs.emplace(std::string(key), CloneYsonStruct(obj));
+        clonedObjs.emplace(key, CloneYsonStruct(obj));
     }
     return clonedObjs;
 }

Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,12 @@ TYPath GetUserPath(const std::string& name)`
`15`	`15`	`return "//sys/users/" + ToYPathLiteral(name);`
`16`	`16`	`}`
`17`	`17`
`18`		`-TYPath GetGroupPath(const TString& name)`
	`18`	`+TYPath GetGroupPath(const std::string& name)`
`19`	`19`	`{`
`20`	`20`	`return "//sys/groups/" + ToYPathLiteral(name);`
`21`	`21`	`}`
`22`	`22`
`23`		`-TYPath GetAccountPath(const TString& name)`
	`23`	`+TYPath GetAccountPath(const std::string& name)`
`24`	`24`	`{`
`25`	`25`	`return "//sys/accounts/" + ToYPathLiteral(name);`
`26`	`26`	`}`
`@@ -29,15 +29,15 @@ TYPath GetAccountPath(const TString& name)`
`29`	`29`
`30`	`30`	`ESecurityAction CheckPermissionsByAclAndSubjectClosure(`
`31`	`31`	`const TSerializableAccessControlList& acl,`
`32`		`- const THashSet<TString>& subjectClosure,`
	`32`	`+ const THashSet<std::string>& subjectClosure,`
`33`	`33`	`NYTree::EPermissionSet permissions)`
`34`	`34`	`{`
`35`	`35`	`NYTree::EPermissionSet allowedPermissions = {};`
`36`	`36`	`NYTree::EPermissionSet deniedPermissions = {};`
`37`	`37`
`38`	`38`	`for (const auto& ace : acl.Entries) {`
`39`	`39`	`if (ace.Action != NSecurityClient::ESecurityAction::Allow && ace.Action != NSecurityClient::ESecurityAction::Deny) {`
`40`		`- THROW_ERROR_EXCEPTION("Action %Qv is not supported", FormatEnum(ace.Action));`
	`40`	`+ THROW_ERROR_EXCEPTION("Action %Qlv is not supported", ace.Action);`
`41`	`41`	`}`
`42`	`42`	`for (const auto& aceSubject : ace.Subjects) {`
`43`	`43`	`if (subjectClosure.contains(aceSubject)) {`
Original file line number	Diff line number	Diff line change
`@@ -662,8 +662,7 @@ std::optional<std::string> TRichYPath::GetCluster() const`
`662`	`662`
`663`	`663`	`void TRichYPath::SetCluster(const std::string& value)`
`664`	`664`	`{`
`665`		`- // TODO(babenko): switch to std::string`
`666`		`- Attributes().Set("cluster", TString(value));`
	`665`	`+ Attributes().Set("cluster", value);`
`667`	`666`	`}`
`668`	`667`
`669`	`668`	`std::optional<std::vector<TString>> TRichYPath::GetClusters() const`
Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,9 @@ TServiceBase::TPerformanceCounters::TPerformanceCounters(const NProfiling::TProf`
`324`	`324`	`NProfiling::TCounter* TServiceBase::TPerformanceCounters::GetRequestsPerUserAgentCounter(TStringBuf userAgent)`
`325`	`325`	`{`
`326`	`326`	`return RequestsPerUserAgent_.FindOrInsert(userAgent, [&] {`
`327`		`- return Profiler_.WithRequiredTag("user_agent", TString(userAgent)).Counter("/user_agent");`
	`327`	`+ return Profiler_`
	`328`	`+ .WithRequiredTag("user_agent", std::string(userAgent))`
	`329`	`+ .Counter("/user_agent");`
`328`	`330`	`}).first;`
`329`	`331`	`}`
`330`	`332`
`@@ -2318,7 +2320,6 @@ TServiceBase::TMethodPerformanceCountersPtr TServiceBase::CreateMethodPerformanc`
`2318`	`2320`
`2319`	`2321`	`auto profiler = runtimeInfo->Profiler.WithSparse();`
`2320`	`2322`	`if (userTag) {`
`2321`		`- // TODO(babenko): migrate to std::string`
`2322`	`2323`	`profiler = profiler.WithTag("user", std::string(userTag));`
`2323`	`2324`	`}`
`2324`	`2325`	`if (runtimeInfo->Descriptor.RequestQueueProvider) {`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,7 @@ TYsonString IAttributeDictionary::GetYsonAndRemove(TKeyView key)`
`28`	`28`	`void IAttributeDictionary::MergeFrom(const IMapNodePtr& other)`
`29`	`29`	`{`
`30`	`30`	`for (const auto& [key, value] : other->GetChildren()) {`
`31`		`- // TODO(babenko): migrate to std::string`
`32`		`- SetYson(TString(key), ConvertToYsonString(value));`
	`31`	`+ SetYson(key, ConvertToYsonString(value));`
`33`	`32`	`}`
`34`	`33`	`}`
`35`	`34`
`@@ -64,8 +63,7 @@ IAttributeDictionaryPtr IAttributeDictionary::FromMap(const IMapNodePtr& node)`
`64`	`63`	`auto attributes = CreateEphemeralAttributes();`
`65`	`64`	`auto children = node->GetChildren();`
`66`	`65`	`for (int index = 0; index < std::ssize(children); ++index) {`
`67`		`- // TODO(babenko): migrate to std::string`
`68`		`- attributes->SetYson(TString(children[index].first), ConvertToYsonString(children[index].second));`
	`66`	`+ attributes->SetYson(children[index].first, ConvertToYsonString(children[index].second));`
`69`	`67`	`}`
`70`	`68`	`return attributes;`
`71`	`69`	`}`