Skip to content

Commit 3f4f6c5

Browse files
EnjectionEnjection
committed
Fix sdk according review in #14617 (#14831)
1 parent ff4449d commit 3f4f6c5

File tree

4 files changed

+40
-42
lines changed

4 files changed

+40
-42
lines changed

‎include/ydb-cpp-sdk/client/config/config.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ struct TFetchAllConfigsSettings : public NYdb::TOperationRequestSettings<TFetchA
3030
struct TBootstrapClusterSettings : public NYdb::TOperationRequestSettings<TBootstrapClusterSettings> {};
3131

3232
struct TMainConfigIdentity {
33-
ui64 Version;
34-
TString Cluster;
33+
std::uint64_t Version;
34+
std::string Cluster;
3535
};
3636

3737
struct TStorageConfigIdentity {
38-
ui64 Version;
39-
TString Cluster;
38+
std::uint64_t Version;
39+
std::string Cluster;
4040
};
4141

4242
struct TDatabaseConfigIdentity {
43-
ui64 Version;
44-
TString Cluster;
45-
TString Database;
43+
std::uint64_t Version;
44+
std::string Cluster;
45+
std::string Database;
4646
};
4747

4848
using TIdentityTypes = std::variant<
@@ -54,7 +54,7 @@ using TIdentityTypes = std::variant<
5454

5555
struct TConfig {
5656
TIdentityTypes Identity;
57-
TString Config;
57+
std::string Config;
5858
};
5959

6060
struct TFetchConfigResult : public TStatus {
@@ -83,32 +83,32 @@ class TConfigClient {
8383

8484
// Replace config
8585
TAsyncStatus ReplaceConfig(
86-
const TString& mainConfig,
86+
const std::string& mainConfig,
8787
const TReplaceConfigSettings& settings = {});
8888

8989
// Replace config
9090
TAsyncStatus ReplaceConfig(
91-
const TString& mainConfig,
92-
const TString& storageConfig,
91+
const std::string& mainConfig,
92+
const std::string& storageConfig,
9393
const TReplaceConfigSettings& settings = {});
9494

9595
// Replace config
9696
TAsyncStatus ReplaceConfigDisableDedicatedStorageSection(
97-
const TString& mainConfig,
97+
const std::string& mainConfig,
9898
const TReplaceConfigSettings& settings = {});
9999

100100
// Replace config
101101
TAsyncStatus ReplaceConfigEnableDedicatedStorageSection(
102-
const TString& mainConfig,
103-
const TString& storageConfig,
102+
const std::string& mainConfig,
103+
const std::string& storageConfig,
104104
const TReplaceConfigSettings& settings = {});
105105

106106
// Fetch current cluster storage config
107107
TAsyncFetchConfigResult FetchAllConfigs(const TFetchAllConfigsSettings& settings = {});
108108

109109
// Bootstrap cluster with automatic configuration
110110
TAsyncStatus BootstrapCluster(
111-
const TString& selfAssemblyUUID,
111+
const std::string& selfAssemblyUUID,
112112
const TBootstrapClusterSettings& settings = {});
113113

114114
private:

‎include/ydb-cpp-sdk/client/types/status/status.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ class TStatus {
2525
const NYdb::NIssue::TIssues& GetIssues() const;
2626
bool IsSuccess() const;
2727
bool IsTransportError() const;
28-
bool IsUnimplementedError() const;
2928
const std::string& GetEndpoint() const;
3029
const std::multimap<std::string, std::string>& GetResponseMetadata() const;
3130
float GetConsumedRu() const;

‎src/client/config/config.cpp

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,20 @@ class TConfigClient::TImpl : public TClientImplCommon<TConfigClient::TImpl> {
1414
{
1515
}
1616

17-
TAsyncStatus ReplaceConfig(const TString& mainConfig, const TReplaceConfigSettings& settings = {}) {
18-
auto request = MakeRequest<Ydb::Config::ReplaceConfigRequest>();
17+
TAsyncStatus ReplaceConfig(const std::string& mainConfig, const TReplaceConfigSettings& settings = {}) {
18+
auto request = MakeOperationRequest<Ydb::Config::ReplaceConfigRequest>(settings);
1919
request.set_replace(mainConfig);
2020

2121
ApplyReplaceSettings(request, settings);
2222

2323
return RunSimple<Ydb::Config::V1::ConfigService, Ydb::Config::ReplaceConfigRequest, Ydb::Config::ReplaceConfigResponse>(
2424
std::move(request),
25-
&Ydb::Config::V1::ConfigService::Stub::AsyncReplaceConfig);
25+
&Ydb::Config::V1::ConfigService::Stub::AsyncReplaceConfig,
26+
TRpcRequestSettings::Make(settings));
2627
}
2728

28-
TAsyncStatus ReplaceConfig(const TString& mainConfig, const TString& storageConfig, const TReplaceConfigSettings& settings = {}) {
29-
auto request = MakeRequest<Ydb::Config::ReplaceConfigRequest>();
29+
TAsyncStatus ReplaceConfig(const std::string& mainConfig, const std::string& storageConfig, const TReplaceConfigSettings& settings = {}) {
30+
auto request = MakeOperationRequest<Ydb::Config::ReplaceConfigRequest>(settings);
3031
auto& replace = *request.mutable_replace_with_dedicated_storage_section();
3132
replace.set_main_config(mainConfig);
3233
replace.set_storage_config(storageConfig);
@@ -35,22 +36,24 @@ class TConfigClient::TImpl : public TClientImplCommon<TConfigClient::TImpl> {
3536

3637
return RunSimple<Ydb::Config::V1::ConfigService, Ydb::Config::ReplaceConfigRequest, Ydb::Config::ReplaceConfigResponse>(
3738
std::move(request),
38-
&Ydb::Config::V1::ConfigService::Stub::AsyncReplaceConfig);
39+
&Ydb::Config::V1::ConfigService::Stub::AsyncReplaceConfig,
40+
TRpcRequestSettings::Make(settings));
3941
}
4042

41-
TAsyncStatus ReplaceConfigDisableDedicatedStorageSection(const TString& mainConfig, const TReplaceConfigSettings& settings = {}) {
42-
auto request = MakeRequest<Ydb::Config::ReplaceConfigRequest>();
43+
TAsyncStatus ReplaceConfigDisableDedicatedStorageSection(const std::string& mainConfig, const TReplaceConfigSettings& settings = {}) {
44+
auto request = MakeOperationRequest<Ydb::Config::ReplaceConfigRequest>(settings);
4345
request.set_replace_disable_dedicated_storage_section(mainConfig);
4446

4547
ApplyReplaceSettings(request, settings);
4648

4749
return RunSimple<Ydb::Config::V1::ConfigService, Ydb::Config::ReplaceConfigRequest, Ydb::Config::ReplaceConfigResponse>(
4850
std::move(request),
49-
&Ydb::Config::V1::ConfigService::Stub::AsyncReplaceConfig);
51+
&Ydb::Config::V1::ConfigService::Stub::AsyncReplaceConfig,
52+
TRpcRequestSettings::Make(settings));
5053
}
5154

52-
TAsyncStatus ReplaceConfigEnableDedicatedStorageSection(const TString& mainConfig, const TString& storageConfig, const TReplaceConfigSettings& settings = {}) {
53-
auto request = MakeRequest<Ydb::Config::ReplaceConfigRequest>();
55+
TAsyncStatus ReplaceConfigEnableDedicatedStorageSection(const std::string& mainConfig, const std::string& storageConfig, const TReplaceConfigSettings& settings = {}) {
56+
auto request = MakeOperationRequest<Ydb::Config::ReplaceConfigRequest>(settings);
5457
auto& replace = *request.mutable_replace_enable_dedicated_storage_section();
5558
replace.set_main_config(mainConfig);
5659
replace.set_storage_config(storageConfig);
@@ -59,7 +62,8 @@ class TConfigClient::TImpl : public TClientImplCommon<TConfigClient::TImpl> {
5962

6063
return RunSimple<Ydb::Config::V1::ConfigService, Ydb::Config::ReplaceConfigRequest, Ydb::Config::ReplaceConfigResponse>(
6164
std::move(request),
62-
&Ydb::Config::V1::ConfigService::Stub::AsyncReplaceConfig);
65+
&Ydb::Config::V1::ConfigService::Stub::AsyncReplaceConfig,
66+
TRpcRequestSettings::Make(settings));
6367
}
6468

6569
TAsyncFetchConfigResult FetchAllConfigs(const TFetchAllConfigsSettings& settings = {}) {
@@ -117,9 +121,8 @@ class TConfigClient::TImpl : public TClientImplCommon<TConfigClient::TImpl> {
117121
return promise.GetFuture();
118122
}
119123

120-
TAsyncStatus BootstrapCluster(const TString& selfAssemblyUUID, const TBootstrapClusterSettings& settings = {}) {
121-
Y_UNUSED(settings);
122-
auto request = MakeRequest<Ydb::Config::BootstrapClusterRequest>();
124+
TAsyncStatus BootstrapCluster(const std::string& selfAssemblyUUID, const TBootstrapClusterSettings& settings = {}) {
125+
auto request = MakeOperationRequest<Ydb::Config::BootstrapClusterRequest>(settings);
123126
request.set_self_assembly_uuid(selfAssemblyUUID);
124127

125128
return RunSimple<Ydb::Config::V1::ConfigService, Ydb::Config::BootstrapClusterRequest,
@@ -141,30 +144,30 @@ TConfigClient::TConfigClient(const TDriver& driver, const TCommonClientSettings&
141144
TConfigClient::~TConfigClient() = default;
142145

143146
TAsyncStatus TConfigClient::ReplaceConfig(
144-
const TString& mainConfig,
147+
const std::string& mainConfig,
145148
const TReplaceConfigSettings& settings)
146149
{
147150
return Impl_->ReplaceConfig(mainConfig, settings);
148151
}
149152

150153
TAsyncStatus TConfigClient::ReplaceConfig(
151-
const TString& mainConfig,
152-
const TString& storageConfig,
154+
const std::string& mainConfig,
155+
const std::string& storageConfig,
153156
const TReplaceConfigSettings& settings)
154157
{
155158
return Impl_->ReplaceConfig(mainConfig, storageConfig, settings);
156159
}
157160

158161
TAsyncStatus TConfigClient::ReplaceConfigDisableDedicatedStorageSection(
159-
const TString& mainConfig,
162+
const std::string& mainConfig,
160163
const TReplaceConfigSettings& settings)
161164
{
162165
return Impl_->ReplaceConfigDisableDedicatedStorageSection(mainConfig, settings);
163166
}
164167

165168
TAsyncStatus TConfigClient::ReplaceConfigEnableDedicatedStorageSection(
166-
const TString& mainConfig,
167-
const TString& storageConfig,
169+
const std::string& mainConfig,
170+
const std::string& storageConfig,
168171
const TReplaceConfigSettings& settings)
169172
{
170173
return Impl_->ReplaceConfigEnableDedicatedStorageSection(mainConfig, storageConfig, settings);
@@ -175,7 +178,7 @@ TAsyncFetchConfigResult TConfigClient::FetchAllConfigs(const TFetchAllConfigsSet
175178
}
176179

177180
TAsyncStatus TConfigClient::BootstrapCluster(
178-
const TString& selfAssemblyUUID,
181+
const std::string& selfAssemblyUUID,
179182
const TBootstrapClusterSettings& settings)
180183
{
181184
return Impl_->BootstrapCluster(selfAssemblyUUID, settings);

‎src/client/types/status/status.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ bool TStatus::IsTransportError() const {
5454
&& static_cast<size_t>(Impl_->Status.Status) <= TRANSPORT_STATUSES_LAST;
5555
}
5656

57-
bool TStatus::IsUnimplementedError() const {
58-
return Impl_->Status.Status == EStatus::CLIENT_CALL_UNIMPLEMENTED;
59-
}
60-
6157
void TStatus::CheckStatusOk(const std::string& str) const {
6258
Impl_->CheckStatusOk(str);
6359
}

0 commit comments

Comments
 (0)