Skip to content

Commit 8808cd6

Browse files
euskov17Gazizonoki
euskov17
and
Gazizonoki
authored
Replace TMap/TMultiMap to std::map/std::multimap (ydb-platform#10)
* Replace TMap/TMultiMap to std::map/std::multimap * Replace Tstring to std::string * Resolve conflict * Fix dumpers * Remove unittests * Update util/generic/is_in_ut.cpp * Update util/generic/is_in_ut.cpp --------- Co-authored-by: Bulat <bulat@ydb.tech>
1 parent a8a642e commit 8808cd6

File tree

48 files changed

+158
-751
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+158
-751
lines changed

‎client/draft/ydb_dynamic_config.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class TDynamicConfigClient::TImpl : public TClientImplCommon<TDynamicConfigClien
122122
auto promise = NThreading::NewPromise<TGetNodeLabelsResult>();
123123

124124
auto extractor = [promise] (google::protobuf::Any* any, TPlainStatus status) mutable {
125-
TMap<TString, TString> labels;
125+
std::map<TString, TString> labels;
126126
if (Ydb::DynamicConfig::GetNodeLabelsResult result; any && any->UnpackTo(&result)) {
127127
for (auto& label : result.labels()) {
128128
labels[label.label()] = label.value();
@@ -153,7 +153,7 @@ class TDynamicConfigClient::TImpl : public TClientImplCommon<TDynamicConfigClien
153153
TString clusterName = "<unknown>";
154154
ui64 version = 0;
155155
TString config;
156-
TMap<ui64, TString> volatileConfigs;
156+
std::map<ui64, TString> volatileConfigs;
157157
if (Ydb::DynamicConfig::GetConfigResult result; any && any->UnpackTo(&result)) {
158158
clusterName = result.identity().cluster();
159159
version = result.identity().version();
@@ -185,7 +185,7 @@ class TDynamicConfigClient::TImpl : public TClientImplCommon<TDynamicConfigClien
185185

186186
auto extractor = [promise] (google::protobuf::Any* any, TPlainStatus status) mutable {
187187
TString metadata;
188-
TMap<ui64, TString> volatileConfigs;
188+
std::map<ui64, TString> volatileConfigs;
189189
if (Ydb::DynamicConfig::GetMetadataResult result; any && any->UnpackTo(&result)) {
190190
metadata = result.metadata();
191191
for (const auto& config : result.volatile_configs()) {
@@ -208,7 +208,7 @@ class TDynamicConfigClient::TImpl : public TClientImplCommon<TDynamicConfigClien
208208
return promise.GetFuture();
209209
}
210210

211-
TAsyncResolveConfigResult ResolveConfig(const TString& config, const TMap<ui64, TString>& volatileConfigs, const TMap<TString, TString>& labels, const TClusterConfigSettings& settings = {}) {
211+
TAsyncResolveConfigResult ResolveConfig(const TString& config, const std::map<ui64, TString>& volatileConfigs, const std::map<TString, TString>& labels, const TClusterConfigSettings& settings = {}) {
212212
auto request = MakeOperationRequest<Ydb::DynamicConfig::ResolveConfigRequest>(settings);
213213
request.set_config(config);
214214
for (auto& [id, volatileConfig] : volatileConfigs) {
@@ -245,7 +245,7 @@ class TDynamicConfigClient::TImpl : public TClientImplCommon<TDynamicConfigClien
245245
return promise.GetFuture();
246246
}
247247

248-
TAsyncResolveConfigResult ResolveConfig(const TString& config, const TMap<ui64, TString>& volatileConfigs, const TClusterConfigSettings& settings = {}) {
248+
TAsyncResolveConfigResult ResolveConfig(const TString& config, const std::map<ui64, TString>& volatileConfigs, const TClusterConfigSettings& settings = {}) {
249249
auto request = MakeOperationRequest<Ydb::DynamicConfig::ResolveAllConfigRequest>(settings);
250250
request.set_config(config);
251251
for (auto& [id, volatileConfig] : volatileConfigs) {
@@ -277,7 +277,7 @@ class TDynamicConfigClient::TImpl : public TClientImplCommon<TDynamicConfigClien
277277
return promise.GetFuture();
278278
}
279279

280-
TAsyncVerboseResolveConfigResult VerboseResolveConfig(const TString& config, const TMap<ui64, TString>& volatileConfigs, const TClusterConfigSettings& settings = {}) {
280+
TAsyncVerboseResolveConfigResult VerboseResolveConfig(const TString& config, const std::map<ui64, TString>& volatileConfigs, const TClusterConfigSettings& settings = {}) {
281281
auto request = MakeOperationRequest<Ydb::DynamicConfig::ResolveAllConfigRequest>(settings);
282282
request.set_config(config);
283283
for (auto& [id, volatileConfig] : volatileConfigs) {
@@ -410,22 +410,22 @@ TAsyncGetNodeLabelsResult TDynamicConfigClient::GetNodeLabels(ui64 nodeId, const
410410

411411
TAsyncResolveConfigResult TDynamicConfigClient::ResolveConfig(
412412
const TString& config,
413-
const TMap<ui64, TString>& volatileConfigs,
414-
const TMap<TString, TString>& labels,
413+
const std::map<ui64, TString>& volatileConfigs,
414+
const std::map<TString, TString>& labels,
415415
const TClusterConfigSettings& settings) {
416416
return Impl_->ResolveConfig(config, volatileConfigs, labels, settings);
417417
}
418418

419419
TAsyncResolveConfigResult TDynamicConfigClient::ResolveConfig(
420420
const TString& config,
421-
const TMap<ui64, TString>& volatileConfigs,
421+
const std::map<ui64, TString>& volatileConfigs,
422422
const TClusterConfigSettings& settings) {
423423
return Impl_->ResolveConfig(config, volatileConfigs, settings);
424424
}
425425

426426
TAsyncVerboseResolveConfigResult TDynamicConfigClient::VerboseResolveConfig(
427427
const TString& config,
428-
const TMap<ui64, TString>& volatileConfigs,
428+
const std::map<ui64, TString>& volatileConfigs,
429429
const TClusterConfigSettings& settings) {
430430
return Impl_->VerboseResolveConfig(config, volatileConfigs, settings);
431431
}

‎client/draft/ydb_dynamic_config.h‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
#include <util/generic/string.h>
1111
#include <util/generic/set.h>
12-
#include <util/generic/map.h>
1312
#include <util/system/types.h>
1413

1514
#include <memory>
@@ -22,7 +21,7 @@ struct TGetConfigResult : public TStatus {
2221
TString&& clusterName,
2322
ui64 version,
2423
TString&& config,
25-
TMap<ui64, TString>&& volatileConfigs)
24+
std::map<ui64, TString>&& volatileConfigs)
2625
: TStatus(std::move(status))
2726
, ClusterName_(std::move(clusterName))
2827
, Version_(version)
@@ -42,15 +41,15 @@ struct TGetConfigResult : public TStatus {
4241
return Config_;
4342
}
4443

45-
const TMap<ui64, TString>& GetVolatileConfigs() const {
44+
const std::map<ui64, TString>& GetVolatileConfigs() const {
4645
return VolatileConfigs_;
4746
}
4847

4948
private:
5049
TString ClusterName_;
5150
ui64 Version_;
5251
TString Config_;
53-
TMap<ui64, TString> VolatileConfigs_;
52+
std::map<ui64, TString> VolatileConfigs_;
5453
};
5554

5655
using TAsyncGetConfigResult = NThreading::TFuture<TGetConfigResult>;
@@ -59,7 +58,7 @@ struct TGetMetadataResult : public TStatus {
5958
TGetMetadataResult(
6059
TStatus&& status,
6160
TString&& metadata,
62-
TMap<ui64, TString>&& volatileConfigs)
61+
std::map<ui64, TString>&& volatileConfigs)
6362
: TStatus(std::move(status))
6463
, Metadata_(std::move(metadata))
6564
, VolatileConfigs_(std::move(volatileConfigs))
@@ -69,13 +68,13 @@ struct TGetMetadataResult : public TStatus {
6968
return Metadata_;
7069
}
7170

72-
const TMap<ui64, TString>& GetVolatileConfigs() const {
71+
const std::map<ui64, TString>& GetVolatileConfigs() const {
7372
return VolatileConfigs_;
7473
}
7574

7675
private:
7776
TString Metadata_;
78-
TMap<ui64, TString> VolatileConfigs_;
77+
std::map<ui64, TString> VolatileConfigs_;
7978
};
8079

8180
using TAsyncGetMetadataResult = NThreading::TFuture<TGetMetadataResult>;
@@ -101,17 +100,17 @@ using TAsyncResolveConfigResult = NThreading::TFuture<TResolveConfigResult>;
101100
struct TGetNodeLabelsResult : public TStatus {
102101
TGetNodeLabelsResult(
103102
TStatus&& status,
104-
TMap<TString, TString>&& labels)
103+
std::map<TString, TString>&& labels)
105104
: TStatus(std::move(status))
106105
, Labels_(std::move(labels))
107106
{}
108107

109-
const TMap<TString, TString>& GetLabels() const {
108+
const std::map<TString, TString>& GetLabels() const {
110109
return Labels_;
111110
}
112111

113112
private:
114-
TMap<TString, TString> Labels_;
113+
std::map<TString, TString> Labels_;
115114
};
116115

117116
using TAsyncGetNodeLabelsResult = NThreading::TFuture<TGetNodeLabelsResult>;
@@ -140,7 +139,7 @@ struct TVerboseResolveConfigResult : public TStatus {
140139
}
141140
};
142141

143-
using ConfigByLabelSet = TMap<TSet<std::vector<TLabel>>, TString>;
142+
using ConfigByLabelSet = std::map<TSet<std::vector<TLabel>>, TString>;
144143

145144
TVerboseResolveConfigResult(
146145
TStatus&& status,
@@ -230,20 +229,20 @@ class TDynamicConfigClient {
230229
// Resolve arbitrary config for specific labels
231230
TAsyncResolveConfigResult ResolveConfig(
232231
const TString& config,
233-
const TMap<ui64, TString>& volatileConfigs,
234-
const TMap<TString, TString>& labels,
232+
const std::map<ui64, TString>& volatileConfigs,
233+
const std::map<TString, TString>& labels,
235234
const TClusterConfigSettings& settings = {});
236235

237236
// Resolve arbitrary config for all label combinations
238237
TAsyncResolveConfigResult ResolveConfig(
239238
const TString& config,
240-
const TMap<ui64, TString>& volatileConfigs,
239+
const std::map<ui64, TString>& volatileConfigs,
241240
const TClusterConfigSettings& settings = {});
242241

243242
// Resolve arbitrary config for all label combinations
244243
TAsyncVerboseResolveConfigResult VerboseResolveConfig(
245244
const TString& config,
246-
const TMap<ui64, TString>& volatileConfigs,
245+
const std::map<ui64, TString>& volatileConfigs,
247246
const TClusterConfigSettings& settings = {});
248247

249248
private:

‎client/impl/ydb_endpoints/endpoints_ut.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ Y_UNIT_TEST_SUITE(EndpointElector) {
221221
UNIT_ASSERT_VALUES_EQUAL(obj4->ObjectCount(), 1);
222222

223223
{
224-
TMap<ui64, size_t> sizes;
224+
std::map<ui64, size_t> sizes;
225225
size_t i = 0;
226226
elector.ForEachEndpoint([&sizes, &i](ui64 nodeId, const NYdb::IObjRegistryHandle& handle) {
227227
sizes[nodeId] = handle.Size();
@@ -236,7 +236,7 @@ Y_UNIT_TEST_SUITE(EndpointElector) {
236236
}
237237

238238
{
239-
TMap<ui64, size_t> sizes;
239+
std::map<ui64, size_t> sizes;
240240
size_t i = 0;
241241
elector.ForEachEndpoint([&sizes, &i](ui64 nodeId, const NYdb::IObjRegistryHandle& handle) {
242242
sizes[nodeId] = handle.Size();
@@ -263,7 +263,7 @@ Y_UNIT_TEST_SUITE(EndpointElector) {
263263
UNIT_ASSERT_VALUES_EQUAL(obj4->HostRemoved(), false);
264264

265265
{
266-
TMap<ui64, size_t> sizes;
266+
std::map<ui64, size_t> sizes;
267267
size_t i = 0;
268268
elector.ForEachEndpoint([&sizes, &i](ui64 nodeId, const NYdb::IObjRegistryHandle& handle) {
269269
sizes[nodeId] = handle.Size();
@@ -289,7 +289,7 @@ Y_UNIT_TEST_SUITE(EndpointElector) {
289289
UNIT_ASSERT_VALUES_EQUAL(obj5->HostRemoved(), true);
290290

291291
{
292-
TMap<ui64, size_t> sizes;
292+
std::map<ui64, size_t> sizes;
293293
size_t i = 0;
294294
elector.ForEachEndpoint([&sizes, &i](ui64 nodeId, const NYdb::IObjRegistryHandle& handle) {
295295
sizes[nodeId] = handle.Size();

‎client/impl/ydb_internal/session_pool/session_pool.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include <client/impl/ydb_internal/kqp_session_common/kqp_session_common.h>
44
#include <client/ydb_types/core_facility/core_facility.h>
55

6-
#include <util/generic/map.h>
76

87
namespace NYdb {
98

@@ -96,7 +95,7 @@ class TSessionPool {
9695
private:
9796
const ui32 MaxQueueSize_;
9897
const TDuration MaxWaitSessionTimeout_;
99-
TMultiMap<TInstant, std::unique_ptr<IGetSessionCtx>> Waiters_;
98+
std::multimap<TInstant, std::unique_ptr<IGetSessionCtx>> Waiters_;
10099
};
101100
public:
102101
using TKeepAliveCmd = std::function<void(TKqpSessionCommon* s)>;
@@ -130,7 +129,7 @@ class TSessionPool {
130129
mutable std::mutex Mtx_;
131130
bool Closed_;
132131

133-
TMultiMap<TInstant, std::unique_ptr<TKqpSessionCommon>> Sessions_;
132+
std::multimap<TInstant, std::unique_ptr<TKqpSessionCommon>> Sessions_;
134133
TWaitersQueue WaitersQueue_;
135134

136135
i64 ActiveSessions_;

‎client/ydb_params/impl.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
#include <ydb/public/api/protos/ydb_scheme.pb.h>
44
#include <ydb/public/api/protos/ydb_value.pb.h>
55

6-
#include <util/generic/map.h>
7-
86

97
namespace NYdb {
108

@@ -16,8 +14,8 @@ bool TParams::TImpl::Empty() const {
1614
return ParamsMap_.empty();
1715
}
1816

19-
TMap<TString, TValue> TParams::TImpl::GetValues() const {
20-
TMap<TString, TValue> valuesMap;
17+
std::map<TString, TValue> TParams::TImpl::GetValues() const {
18+
std::map<TString, TValue> valuesMap;
2119
for (auto it = ParamsMap_.begin(); it != ParamsMap_.end(); ++it) {
2220
auto paramType = TType(it->second.type());
2321
auto paramValue = TValue(paramType, it->second.value());

‎client/ydb_params/impl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class TParams::TImpl {
99
TImpl(::google::protobuf::Map<TString, Ydb::TypedValue>&& paramsMap);
1010

1111
bool Empty() const;
12-
TMap<TString, TValue> GetValues() const;
12+
std::map<TString, TValue> GetValues() const;
1313
TMaybe<TValue> GetValue(const TString& name) const;
1414
::google::protobuf::Map<TString, Ydb::TypedValue>* GetProtoMapPtr();
1515
const ::google::protobuf::Map<TString, Ydb::TypedValue>& GetProtoMap() const;

‎client/ydb_params/params.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
#include <client/ydb_types/fatal_error_handlers/handlers.h>
77

8-
#include <util/generic/map.h>
98
#include <util/string/builder.h>
109

1110
namespace NYdb {
@@ -27,7 +26,7 @@ bool TParams::Empty() const {
2726
return Impl_->Empty();
2827
}
2928

30-
TMap<TString, TValue> TParams::GetValues() const {
29+
std::map<TString, TValue> TParams::GetValues() const {
3130
return Impl_->GetValues();
3231
}
3332

@@ -49,7 +48,7 @@ class TParamsBuilder::TImpl {
4948
}
5049
}
5150

52-
TImpl(const TMap<TString, TType>& typeInfo)
51+
TImpl(const std::map<TString, TType>& typeInfo)
5352
: HasTypeInfo_(true)
5453
{
5554
for (const auto& pair : typeInfo) {
@@ -124,7 +123,7 @@ class TParamsBuilder::TImpl {
124123
private:
125124
bool HasTypeInfo_ = false;
126125
::google::protobuf::Map<TString, Ydb::TypedValue> ParamsMap_;
127-
TMap<TString, TParamValueBuilder> ValueBuildersMap_;
126+
std::map<TString, TParamValueBuilder> ValueBuildersMap_;
128127
};
129128

130129
////////////////////////////////////////////////////////////////////////////////
@@ -153,7 +152,7 @@ TParamsBuilder::~TParamsBuilder() = default;
153152
TParamsBuilder::TParamsBuilder()
154153
: Impl_(new TImpl()) {}
155154

156-
TParamsBuilder::TParamsBuilder(const TMap<TString, TType>& typeInfo)
155+
TParamsBuilder::TParamsBuilder(const std::map<TString, TType>& typeInfo)
157156
: Impl_(new TImpl(typeInfo)) {}
158157

159158
TParamsBuilder::TParamsBuilder(const ::google::protobuf::Map<TString, Ydb::Type>& typeInfo)

‎client/ydb_params/params.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class TParams {
4444
public:
4545
bool Empty() const;
4646

47-
TMap<TString, TValue> GetValues() const;
47+
std::map<TString, TValue> GetValues() const;
4848
TMaybe<TValue> GetValue(const TString& name) const;
4949

5050
private:
@@ -75,7 +75,7 @@ class TParamsBuilder : public TMoveOnly {
7575
public:
7676
TParamsBuilder(TParamsBuilder&&);
7777
TParamsBuilder();
78-
TParamsBuilder(const TMap<TString, TType>& typeInfo);
78+
TParamsBuilder(const std::map<TString, TType>& typeInfo);
7979

8080
~TParamsBuilder();
8181

‎client/ydb_params/params_ut.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Y_UNIT_TEST_SUITE(ParamsBuilder) {
8585
.EndOptional()
8686
.Build();
8787

88-
TMap<TString, TType> paramsMap;
88+
std::map<TString, TType> paramsMap;
8989
paramsMap.emplace("$param1", param1Type);
9090
paramsMap.emplace("$param2", param2Type);
9191

@@ -129,7 +129,7 @@ Y_UNIT_TEST_SUITE(ParamsBuilder) {
129129
.EndOptional()
130130
.Build();
131131

132-
TMap<TString, TType> paramsMap;
132+
std::map<TString, TType> paramsMap;
133133
paramsMap.emplace("$param1", param1Type);
134134
paramsMap.emplace("$param2", param2Type);
135135

@@ -187,7 +187,7 @@ Y_UNIT_TEST_SUITE(ParamsBuilder) {
187187
.EndOptional()
188188
.Build();
189189

190-
TMap<TString, TType> paramsMap;
190+
std::map<TString, TType> paramsMap;
191191
paramsMap.emplace("$param1", param1Type);
192192
paramsMap.emplace("$param2", param2Type);
193193

@@ -217,7 +217,7 @@ Y_UNIT_TEST_SUITE(ParamsBuilder) {
217217
.EndOptional()
218218
.Build();
219219

220-
TMap<TString, TType> paramsMap;
220+
std::map<TString, TType> paramsMap;
221221
paramsMap.emplace("$param1", param1Type);
222222
paramsMap.emplace("$param2", param2Type);
223223

‎client/ydb_persqueue_core/impl/read_session.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class TUserRetrievedEventsInfoAccumulator {
125125
size_t MessagesCount = 0;
126126
};
127127

128-
TMap<TDataDecompressionInfoPtr<UseMigrationProtocol>, TCounter> Counters;
128+
std::map<TDataDecompressionInfoPtr<UseMigrationProtocol>, TCounter> Counters;
129129
};
130130

131131
// Special class that stores actions to be done after lock will be released.

0 commit comments

Comments
 (0)