diff options
author | Alexander Smirnov <alex@ydb.tech> | 2025-06-02 00:52:11 +0000 |
---|---|---|
committer | Alexander Smirnov <alex@ydb.tech> | 2025-06-02 00:52:11 +0000 |
commit | 49c39ba199cfd73f34a81fed0ed9e692fdd8217c (patch) | |
tree | ecff0b06aee9115729682dd7c84a1f51c35164af | |
parent | 88225b68cc277a33ee6217f1de8755a2ed760aaf (diff) | |
parent | 84bb92be5896961370e8aef241565d75cd9cc06f (diff) | |
download | ydb-49c39ba199cfd73f34a81fed0ed9e692fdd8217c.tar.gz |
Merge branch 'rightlib' into merge-libs-250602-0050
-rw-r--r-- | library/cpp/tld/tlds-alpha-by-domain.txt | 2 | ||||
-rw-r--r-- | yt/yt/client/api/delegating_client.h | 8 | ||||
-rw-r--r-- | yt/yt/client/api/rpc_proxy/client_impl.cpp | 8 | ||||
-rw-r--r-- | yt/yt/client/api/rpc_proxy/client_impl.h | 8 | ||||
-rw-r--r-- | yt/yt/client/api/security_client.h | 8 | ||||
-rw-r--r-- | yt/yt/client/driver/etc_commands.h | 4 | ||||
-rw-r--r-- | yt/yt/client/federated/client.cpp | 4 | ||||
-rw-r--r-- | yt/yt/client/hedging/hedging.cpp | 4 | ||||
-rw-r--r-- | yt/yt/client/security_client/public.cpp | 8 | ||||
-rw-r--r-- | yt/yt/client/security_client/public.h | 8 | ||||
-rw-r--r-- | yt/yt/client/unittests/mock/client.h | 8 | ||||
-rw-r--r-- | yt/yt/core/misc/finally.h | 15 |
12 files changed, 47 insertions, 38 deletions
diff --git a/library/cpp/tld/tlds-alpha-by-domain.txt b/library/cpp/tld/tlds-alpha-by-domain.txt index fc8f36a83ec..2d8b0970c97 100644 --- a/library/cpp/tld/tlds-alpha-by-domain.txt +++ b/library/cpp/tld/tlds-alpha-by-domain.txt @@ -1,4 +1,4 @@ -# Version 2025052800, Last Updated Wed May 28 07:07:02 2025 UTC +# Version 2025060100, Last Updated Sun Jun 1 07:07:01 2025 UTC AAA AARP ABB diff --git a/yt/yt/client/api/delegating_client.h b/yt/yt/client/api/delegating_client.h index f69f0ee833c..98b5776980b 100644 --- a/yt/yt/client/api/delegating_client.h +++ b/yt/yt/client/api/delegating_client.h @@ -426,14 +426,14 @@ public: // Security DELEGATE_METHOD(TFuture<void>, AddMember, ( - const TString& group, - const TString& member, + const std::string& group, + const std::string& member, const TAddMemberOptions& options), (group, member, options)) DELEGATE_METHOD(TFuture<void>, RemoveMember, ( - const TString& group, - const TString& member, + const std::string& group, + const std::string& member, const TRemoveMemberOptions& options), (group, member, options)) diff --git a/yt/yt/client/api/rpc_proxy/client_impl.cpp b/yt/yt/client/api/rpc_proxy/client_impl.cpp index 07a8ffc20e6..c82186cb062 100644 --- a/yt/yt/client/api/rpc_proxy/client_impl.cpp +++ b/yt/yt/client/api/rpc_proxy/client_impl.cpp @@ -984,8 +984,8 @@ TFuture<TGetCurrentUserResultPtr> TClient::GetCurrentUser(const TGetCurrentUserO } TFuture<void> TClient::AddMember( - const TString& group, - const TString& member, + const std::string& group, + const std::string& member, const TAddMemberOptions& options) { auto proxy = CreateApiServiceProxy(); @@ -1002,8 +1002,8 @@ TFuture<void> TClient::AddMember( } TFuture<void> TClient::RemoveMember( - const TString& group, - const TString& member, + const std::string& group, + const std::string& member, const TRemoveMemberOptions& options) { auto proxy = CreateApiServiceProxy(); diff --git a/yt/yt/client/api/rpc_proxy/client_impl.h b/yt/yt/client/api/rpc_proxy/client_impl.h index 5676e9e04af..0c9e8e82d00 100644 --- a/yt/yt/client/api/rpc_proxy/client_impl.h +++ b/yt/yt/client/api/rpc_proxy/client_impl.h @@ -201,13 +201,13 @@ public: const TGetCurrentUserOptions& options) override; TFuture<void> AddMember( - const TString& group, - const TString& member, + const std::string& group, + const std::string& member, const NApi::TAddMemberOptions& options) override; TFuture<void> RemoveMember( - const TString& group, - const TString& member, + const std::string& group, + const std::string& member, const NApi::TRemoveMemberOptions& options) override; TFuture<TCheckPermissionResponse> CheckPermission( diff --git a/yt/yt/client/api/security_client.h b/yt/yt/client/api/security_client.h index 87fa27b94f5..bcfb3cb5e97 100644 --- a/yt/yt/client/api/security_client.h +++ b/yt/yt/client/api/security_client.h @@ -141,13 +141,13 @@ struct ISecurityClient const TGetCurrentUserOptions& options = {}) = 0; virtual TFuture<void> AddMember( - const TString& group, - const TString& member, + const std::string& group, + const std::string& member, const TAddMemberOptions& options = {}) = 0; virtual TFuture<void> RemoveMember( - const TString& group, - const TString& member, + const std::string& group, + const std::string& member, const TRemoveMemberOptions& options = {}) = 0; virtual TFuture<TCheckPermissionResponse> CheckPermission( diff --git a/yt/yt/client/driver/etc_commands.h b/yt/yt/client/driver/etc_commands.h index c1b02e3cb84..d2809528c3d 100644 --- a/yt/yt/client/driver/etc_commands.h +++ b/yt/yt/client/driver/etc_commands.h @@ -19,8 +19,8 @@ class TUpdateMembershipCommand : public TTypedCommand<TOptions> { protected: - TString Group; - TString Member; + std::string Group; + std::string Member; REGISTER_YSON_STRUCT_LITE(TUpdateMembershipCommand); diff --git a/yt/yt/client/federated/client.cpp b/yt/yt/client/federated/client.cpp index cfec702a489..6806c88835b 100644 --- a/yt/yt/client/federated/client.cpp +++ b/yt/yt/client/federated/client.cpp @@ -410,8 +410,8 @@ public: UNIMPLEMENTED_METHOD(TFuture<void>, TruncateJournal, (const NYPath::TYPath&, i64, const TTruncateJournalOptions&)); UNIMPLEMENTED_METHOD(TFuture<TGetFileFromCacheResult>, GetFileFromCache, (const TString&, const TGetFileFromCacheOptions&)); UNIMPLEMENTED_METHOD(TFuture<TPutFileToCacheResult>, PutFileToCache, (const NYPath::TYPath&, const TString&, const TPutFileToCacheOptions&)); - UNIMPLEMENTED_METHOD(TFuture<void>, AddMember, (const TString&, const TString&, const TAddMemberOptions&)); - UNIMPLEMENTED_METHOD(TFuture<void>, RemoveMember, (const TString&, const TString&, const TRemoveMemberOptions&)); + UNIMPLEMENTED_METHOD(TFuture<void>, AddMember, (const std::string&, const std::string&, const TAddMemberOptions&)); + UNIMPLEMENTED_METHOD(TFuture<void>, RemoveMember, (const std::string&, const std::string&, const TRemoveMemberOptions&)); UNIMPLEMENTED_METHOD(TFuture<TCheckPermissionResponse>, CheckPermission, (const std::string&, const NYPath::TYPath&, NYTree::EPermission, const TCheckPermissionOptions&)); UNIMPLEMENTED_METHOD(TFuture<TCheckPermissionByAclResult>, CheckPermissionByAcl, (const std::optional<std::string>&, NYTree::EPermission, NYTree::INodePtr, const TCheckPermissionByAclOptions&)); UNIMPLEMENTED_METHOD(TFuture<void>, TransferAccountResources, (const std::string&, const std::string&, NYTree::INodePtr, const TTransferAccountResourcesOptions&)); diff --git a/yt/yt/client/hedging/hedging.cpp b/yt/yt/client/hedging/hedging.cpp index 28ccacb6a49..9f5e46eef93 100644 --- a/yt/yt/client/hedging/hedging.cpp +++ b/yt/yt/client/hedging/hedging.cpp @@ -150,8 +150,8 @@ public: UNSUPPORTED_METHOD(TFuture<TGetFileFromCacheResult>, GetFileFromCache, (const TString&, const TGetFileFromCacheOptions&)); UNSUPPORTED_METHOD(TFuture<TPutFileToCacheResult>, PutFileToCache, (const TYPath&, const TString&, const TPutFileToCacheOptions&)); UNSUPPORTED_METHOD(TFuture<TGetCurrentUserResultPtr>, GetCurrentUser, (const TGetCurrentUserOptions&)); - UNSUPPORTED_METHOD(TFuture<void>, AddMember, (const TString&, const TString&, const TAddMemberOptions&)); - UNSUPPORTED_METHOD(TFuture<void>, RemoveMember, (const TString&, const TString&, const TRemoveMemberOptions&)); + UNSUPPORTED_METHOD(TFuture<void>, AddMember, (const std::string&, const std::string&, const TAddMemberOptions&)); + UNSUPPORTED_METHOD(TFuture<void>, RemoveMember, (const std::string&, const std::string&, const TRemoveMemberOptions&)); UNSUPPORTED_METHOD(TFuture<TCheckPermissionResponse>, CheckPermission, (const std::string&, const TYPath&, NYTree::EPermission, const TCheckPermissionOptions&)); UNSUPPORTED_METHOD(TFuture<TCheckPermissionByAclResult>, CheckPermissionByAcl, (const std::optional<std::string>&, NYTree::EPermission, NYTree::INodePtr, const TCheckPermissionByAclOptions&)); UNSUPPORTED_METHOD(TFuture<void>, TransferAccountResources, (const std::string&, const std::string&, NYTree::INodePtr, const TTransferAccountResourcesOptions&)); diff --git a/yt/yt/client/security_client/public.cpp b/yt/yt/client/security_client/public.cpp index 8373aff4a69..8dabb51355d 100644 --- a/yt/yt/client/security_client/public.cpp +++ b/yt/yt/client/security_client/public.cpp @@ -29,10 +29,10 @@ const std::string QueueAgentUserName("queue_agent"); const std::string YqlAgentUserName("yql_agent"); const std::string TabletBalancerUserName("tablet_balancer"); -const TString EveryoneGroupName("everyone"); -const TString UsersGroupName("users"); -const TString SuperusersGroupName("superusers"); -const TString AdminsGroupName("admins"); +const std::string EveryoneGroupName("everyone"); +const std::string UsersGroupName("users"); +const std::string SuperusersGroupName("superusers"); +const std::string AdminsGroupName("admins"); //////////////////////////////////////////////////////////////////////////////// diff --git a/yt/yt/client/security_client/public.h b/yt/yt/client/security_client/public.h index 5def7b382a9..cfbddbbec4b 100644 --- a/yt/yt/client/security_client/public.h +++ b/yt/yt/client/security_client/public.h @@ -42,10 +42,10 @@ extern const std::string QueueAgentUserName; extern const std::string YqlAgentUserName; extern const std::string TabletBalancerUserName; -extern const TString EveryoneGroupName; -extern const TString UsersGroupName; -extern const TString SuperusersGroupName; -extern const TString AdminsGroupName; +extern const std::string EveryoneGroupName; +extern const std::string UsersGroupName; +extern const std::string SuperusersGroupName; +extern const std::string AdminsGroupName; extern const std::string ReplicatorUserName; extern const std::string OwnerUserName; diff --git a/yt/yt/client/unittests/mock/client.h b/yt/yt/client/unittests/mock/client.h index 1061bd8ef4b..b82bd8a3adc 100644 --- a/yt/yt/client/unittests/mock/client.h +++ b/yt/yt/client/unittests/mock/client.h @@ -550,14 +550,14 @@ public: (override)); MOCK_METHOD(TFuture<void>, AddMember, ( - const TString& group, - const TString& member, + const std::string& group, + const std::string& member, const TAddMemberOptions& options), (override)); MOCK_METHOD(TFuture<void>, RemoveMember, ( - const TString& group, - const TString& member, + const std::string& group, + const std::string& member, const TRemoveMemberOptions& options), (override)); diff --git a/yt/yt/core/misc/finally.h b/yt/yt/core/misc/finally.h index fa6d098d400..090bc9ab22a 100644 --- a/yt/yt/core/misc/finally.h +++ b/yt/yt/core/misc/finally.h @@ -18,7 +18,7 @@ public: : Finally_(std::forward<T>(finally)) { } - TFinallyGuard(TFinallyGuard&& guard) + TFinallyGuard(TFinallyGuard&& guard) noexcept : Released_(guard.Released_) , Finally_(std::move(guard.Finally_)) { @@ -27,9 +27,18 @@ public: TFinallyGuard(const TFinallyGuard&) = delete; TFinallyGuard& operator=(const TFinallyGuard&) = delete; - TFinallyGuard& operator=(TFinallyGuard&&) = delete; - void Release() + TFinallyGuard& operator=(TFinallyGuard&& other) noexcept + { + if (this != &other) { + Released_ = other.Released_; + Finally_ = std::move(other.Finally_); + other.Release(); + } + return *this; + } + + void Release() noexcept { Released_ = true; } |