Skip to content

Commit 37310a1

Browse files
committed
Replaced TVector with std::vector
1 parent bf69aa4 commit 37310a1

File tree

327 files changed

+1320
-1323
lines changed

Some content is hidden

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

327 files changed

+1320
-1323
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,4 @@ util/all_util.cpp
8686
util/charset/all_charset.cpp
8787

8888
cmake-build-debug
89+
examples

client/draft/ydb_dynamic_config.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class TDynamicConfigClient::TImpl : public TClientImplCommon<TDynamicConfigClien
5858
TRpcRequestSettings::Make(settings));
5959
}
6060

61-
TAsyncStatus RemoveVolatileConfig(const TString& cluster, ui64 version, const TVector<ui64>& ids, const TClusterConfigSettings& settings = {}) {
61+
TAsyncStatus RemoveVolatileConfig(const TString& cluster, ui64 version, const std::vector<ui64>& ids, const TClusterConfigSettings& settings = {}) {
6262
auto request = MakeOperationRequest<Ydb::DynamicConfig::RemoveVolatileConfigRequest>(settings);
6363

6464
request.mutable_identity()->set_cluster(cluster);
@@ -87,7 +87,7 @@ class TDynamicConfigClient::TImpl : public TClientImplCommon<TDynamicConfigClien
8787
TRpcRequestSettings::Make(settings));
8888
}
8989

90-
TAsyncStatus ForceRemoveVolatileConfig(const TVector<ui64>& ids, const TClusterConfigSettings& settings = {}) {
90+
TAsyncStatus ForceRemoveVolatileConfig(const std::vector<ui64>& ids, const TClusterConfigSettings& settings = {}) {
9191
auto request = MakeOperationRequest<Ydb::DynamicConfig::RemoveVolatileConfigRequest>(settings);
9292

9393
for (auto& id: ids) {
@@ -308,9 +308,9 @@ class TDynamicConfigClient::TImpl : public TClientImplCommon<TDynamicConfigClien
308308

309309
if (Ydb::DynamicConfig::ResolveAllConfigResult result; any && any->UnpackTo(&result)) {
310310
for (auto& config : result.configs()) {
311-
TSet<TVector<TVerboseResolveConfigResult::TLabel>> labelSets;
311+
TSet<std::vector<TVerboseResolveConfigResult::TLabel>> labelSets;
312312
for (auto& labelSet : config.label_sets()) {
313-
TVector<TVerboseResolveConfigResult::TLabel> set;
313+
std::vector<TVerboseResolveConfigResult::TLabel> set;
314314
for (auto& label : labelSet.labels()) {
315315
labels.insert(label.label());
316316
set.push_back(TVerboseResolveConfigResult::TLabel{convert(label.type()), label.value()});
@@ -373,7 +373,7 @@ TAsyncStatus TDynamicConfigClient::AddVolatileConfig(
373373
TAsyncStatus TDynamicConfigClient::RemoveVolatileConfig(
374374
const TString& cluster,
375375
ui64 version,
376-
const TVector<ui64>& ids,
376+
const std::vector<ui64>& ids,
377377
const TClusterConfigSettings& settings) {
378378
return Impl_->RemoveVolatileConfig(cluster, version, ids, settings);
379379
}
@@ -386,7 +386,7 @@ TAsyncStatus TDynamicConfigClient::RemoveAllVolatileConfigs(
386386
}
387387

388388
TAsyncStatus TDynamicConfigClient::ForceRemoveVolatileConfig(
389-
const TVector<ui64>& ids,
389+
const std::vector<ui64>& ids,
390390
const TClusterConfigSettings& settings) {
391391
return Impl_->ForceRemoveVolatileConfig(ids, settings);
392392
}

client/draft/ydb_dynamic_config.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ struct TVerboseResolveConfigResult : public TStatus {
140140
}
141141
};
142142

143-
using ConfigByLabelSet = TMap<TSet<TVector<TLabel>>, TString>;
143+
using ConfigByLabelSet = TMap<TSet<std::vector<TLabel>>, TString>;
144144

145145
TVerboseResolveConfigResult(
146146
TStatus&& status,
@@ -200,7 +200,7 @@ class TDynamicConfigClient {
200200
TAsyncStatus RemoveVolatileConfig(
201201
const TString& cluster,
202202
ui64 version,
203-
const TVector<ui64>& ids,
203+
const std::vector<ui64>& ids,
204204
const TClusterConfigSettings& settings = {});
205205

206206
// Remove all volatile config
@@ -211,7 +211,7 @@ class TDynamicConfigClient {
211211

212212
// Remove specific volatile configs
213213
TAsyncStatus ForceRemoveVolatileConfig(
214-
const TVector<ui64>& ids,
214+
const std::vector<ui64>& ids,
215215
const TClusterConfigSettings& settings = {});
216216

217217
// Remove all volatile config

client/draft/ydb_scripting.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ namespace NScripting {
1414

1515
using namespace NThreading;
1616

17-
TExecuteYqlResult::TExecuteYqlResult(TStatus&& status, TVector<TResultSet>&& resultSets,
17+
TExecuteYqlResult::TExecuteYqlResult(TStatus&& status, std::vector<TResultSet>&& resultSets,
1818
const TMaybe<NTable::TQueryStats>& queryStats)
1919
: TStatus(std::move(status))
2020
, ResultSets_(std::move(resultSets))
2121
, QueryStats_(queryStats) {}
2222

23-
const TVector<TResultSet>& TExecuteYqlResult::GetResultSets() const {
23+
const std::vector<TResultSet>& TExecuteYqlResult::GetResultSets() const {
2424
return ResultSets_;
2525
}
2626

@@ -163,7 +163,7 @@ class TScriptingClient::TImpl : public TClientImplCommon<TScriptingClient::TImpl
163163

164164
auto extractor = [promise]
165165
(google::protobuf::Any* any, TPlainStatus status) mutable {
166-
TVector<TResultSet> res;
166+
std::vector<TResultSet> res;
167167
TMaybe<NTable::TQueryStats> queryStats;
168168
if (any) {
169169
Ydb::Scripting::ExecuteYqlResult result;

client/draft/ydb_scripting.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ namespace NScripting {
99

1010
class TExecuteYqlResult : public TStatus {
1111
public:
12-
TExecuteYqlResult(TStatus&& status, TVector<TResultSet>&& resultSets,
12+
TExecuteYqlResult(TStatus&& status, std::vector<TResultSet>&& resultSets,
1313
const TMaybe<NTable::TQueryStats>& queryStats);
1414

15-
const TVector<TResultSet>& GetResultSets() const;
15+
const std::vector<TResultSet>& GetResultSets() const;
1616
TResultSet GetResultSet(size_t resultIndex) const;
1717

1818
TResultSetParser GetResultSetParser(size_t resultIndex) const;
1919

2020
const TMaybe<NTable::TQueryStats>& GetStats() const;
2121

2222
private:
23-
TVector<TResultSet> ResultSets_;
23+
std::vector<TResultSet> ResultSets_;
2424
TMaybe<NTable::TQueryStats> QueryStats_;
2525
};
2626

client/extensions/solomon_stats/pull_client.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ TSolomonStatPullExtension::TParams::TParams(const TString& host
77
, const TString& project
88
, const TString& service
99
, const TString& cluster
10-
, const TVector<std::pair<TString, TString>>& labels)
10+
, const std::vector<std::pair<TString, TString>>& labels)
1111
: Host_(host), Port_(port), Labels_()
1212
{
1313
Labels_.Add("project", project);

client/extensions/solomon_stats/pull_client.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
#include <library/cpp/monlib/service/pages/mon_page.h>
1010
#include <library/cpp/monlib/service/monservice.h>
1111

12-
#include <util/generic/vector.h>
13-
1412
namespace NSolomonStatExtension {
1513

1614
class TSolomonStatPullExtension: public NYdb::IExtension {
@@ -26,7 +24,7 @@ class TSolomonStatPullExtension: public NYdb::IExtension {
2624
, const TString& project
2725
, const TString& service
2826
, const TString& cluster
29-
, const TVector<std::pair<TString, TString>>& labels = {});
27+
, const std::vector<std::pair<TString, TString>>& labels = {});
3028

3129
NMonitoring::TLabels GetLabels() const;
3230

client/impl/ydb_endpoints/endpoints_ut.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class TDiscoveryEmulator : public TThread {
6060
void Exec() {
6161
for (ui64 i = 0; i < MaxEvents_; i++) {
6262
ui8 mask = RandomNumber<ui8>(16);
63-
TVector<TEndpointRecord> endpoints;
63+
std::vector<TEndpointRecord> endpoints;
6464

6565
for (size_t i = 0; i < Pool_.size(); i++) {
6666
if (mask & (1 << i))
@@ -76,7 +76,7 @@ class TDiscoveryEmulator : public TThread {
7676
Finished_.store(true);
7777
}
7878

79-
const TVector<TEndpointRecord>& GetPool() const {
79+
const std::vector<TEndpointRecord>& GetPool() const {
8080
return Pool_;
8181
}
8282

@@ -89,10 +89,10 @@ class TDiscoveryEmulator : public TThread {
8989
ui64 MaxEvents_;
9090
std::atomic_bool Finished_;
9191

92-
static const TVector<TEndpointRecord> Pool_;
92+
static const std::vector<TEndpointRecord> Pool_;
9393
};
9494

95-
const TVector<TEndpointRecord> TDiscoveryEmulator::Pool_ = TVector<TEndpointRecord>{{"One", 1}, {"Two", 2}, {"Three", 3}, {"Four", 4}};
95+
const std::vector<TEndpointRecord> TDiscoveryEmulator::Pool_ = std::vector<TEndpointRecord>{{"One", 1}, {"Two", 2}, {"Three", 3}, {"Four", 4}};
9696

9797
Y_UNIT_TEST_SUITE(CheckUtils) {
9898

@@ -116,7 +116,7 @@ Y_UNIT_TEST_SUITE(EndpointElector) {
116116

117117
Y_UNIT_TEST(GetEndpoint) {
118118
TEndpointElectorSafe elector;
119-
elector.SetNewState(TVector<TEndpointRecord>{{"Two", 0, "", 2}, {"One", 0, "", 1}});
119+
elector.SetNewState(std::vector<TEndpointRecord>{{"Two", 0, "", 2}, {"One", 0, "", 1}});
120120
UNIT_ASSERT_VALUES_EQUAL(elector.GetEndpoint(TEndpointKey("One", 0), true).Endpoint, "One");
121121
UNIT_ASSERT_VALUES_EQUAL(elector.GetEndpoint(TEndpointKey("Two", 0), true).Endpoint, "Two");
122122
UNIT_ASSERT_VALUES_EQUAL(elector.GetEndpoint(TEndpointKey("", 1), true).NodeId, 1);
@@ -127,26 +127,26 @@ Y_UNIT_TEST_SUITE(EndpointElector) {
127127

128128
Y_UNIT_TEST(DiffOnRemove) {
129129
TEndpointElectorSafe elector;
130-
auto removed = elector.SetNewState(TVector<TEndpointRecord>{{"Two", 2}, {"One", 1}});
130+
auto removed = elector.SetNewState(std::vector<TEndpointRecord>{{"Two", 2}, {"One", 1}});
131131
UNIT_ASSERT_VALUES_EQUAL(removed.size(), 0);
132-
removed = elector.SetNewState(TVector<TEndpointRecord>{{"One", 1}});
132+
removed = elector.SetNewState(std::vector<TEndpointRecord>{{"One", 1}});
133133
UNIT_ASSERT_VALUES_EQUAL(removed.size(), 1);
134134
UNIT_ASSERT_VALUES_EQUAL(removed[0], TString("Two"));
135135
}
136136

137137
Y_UNIT_TEST(Pessimization) {
138138
TEndpointElectorSafe elector;
139-
elector.SetNewState(TVector<TEndpointRecord>{{"Two", 2}, {"One", 1}});
139+
elector.SetNewState(std::vector<TEndpointRecord>{{"Two", 2}, {"One", 1}});
140140
UNIT_ASSERT_VALUES_EQUAL(elector.GetPessimizationRatio(), 0);
141141
elector.PessimizeEndpoint("One");
142142
UNIT_ASSERT_VALUES_EQUAL(elector.GetPessimizationRatio(), 50);
143-
elector.SetNewState(TVector<TEndpointRecord>{{"Two", 2}});
143+
elector.SetNewState(std::vector<TEndpointRecord>{{"Two", 2}});
144144
UNIT_ASSERT_VALUES_EQUAL(elector.GetPessimizationRatio(), 0);
145145
}
146146

147147
Y_UNIT_TEST(Election) {
148148
TEndpointElectorSafe elector;
149-
elector.SetNewState(TVector<TEndpointRecord>{{"Two", 2}, {"One_A", 1}, {"Three", 3}, {"One_B", 1}});
149+
elector.SetNewState(std::vector<TEndpointRecord>{{"Two", 2}, {"One_A", 1}, {"Three", 3}, {"One_B", 1}});
150150
std::unordered_set<TString> endpoints;
151151
// Just to make sure no possible to get more than expected
152152
size_t extra_attempts = 1000;
@@ -158,7 +158,7 @@ Y_UNIT_TEST_SUITE(EndpointElector) {
158158
UNIT_ASSERT(endpoints.find("One_A") != endpoints.end());
159159
UNIT_ASSERT(endpoints.find("One_B") != endpoints.end());
160160

161-
elector.SetNewState(TVector<TEndpointRecord>{{"One", 1}});
161+
elector.SetNewState(std::vector<TEndpointRecord>{{"One", 1}});
162162
// no preferred endpoint, expect avaliable
163163
UNIT_ASSERT_VALUES_EQUAL(elector.GetEndpoint(TEndpointKey("Three", 0)).Endpoint, "One");
164164
UNIT_ASSERT_VALUES_EQUAL(elector.GetEndpoint(TEndpointKey()).Endpoint, "One");
@@ -174,7 +174,7 @@ Y_UNIT_TEST_SUITE(EndpointElector) {
174174
int counter1 = 0;
175175
int counter2 = 0;
176176

177-
TVector<std::unique_ptr<TTestObj>> storage;
177+
std::vector<std::unique_ptr<TTestObj>> storage;
178178
while (!emulator.Finished()) {
179179
auto obj = std::make_unique<TTestObj>(counter2);
180180
if (elector.LinkObjToEndpoint(TEndpointKey("Two", 2), obj.get(), nullptr)) {
@@ -194,7 +194,7 @@ Y_UNIT_TEST_SUITE(EndpointElector) {
194194

195195
Y_UNIT_TEST(EndpointAssiciationSingleThread) {
196196
TEndpointElectorSafe elector;
197-
elector.SetNewState(TVector<TEndpointRecord>{{"Two", 2, "", 2}, {"One_A", 10, "", 10}, {"Three", 3, "", 3}, {"One_B", 4, "", 4}});
197+
elector.SetNewState(std::vector<TEndpointRecord>{{"Two", 2, "", 2}, {"One_A", 10, "", 10}, {"Three", 3, "", 3}, {"One_B", 4, "", 4}});
198198

199199
auto obj1 = std::make_unique<TTestObj>();
200200
auto obj2 = std::make_unique<TTestObj>();
@@ -280,7 +280,7 @@ Y_UNIT_TEST_SUITE(EndpointElector) {
280280
obj1.reset(new TTestObj());
281281
elector.LinkObjToEndpoint(TEndpointKey("Two", 2), obj1.get(), nullptr);
282282

283-
elector.SetNewState(TVector<TEndpointRecord>{{"Two", 2, "", 2}, {"One_A", 10, "", 10}, {"One_C", 1, "", 1}});
283+
elector.SetNewState(std::vector<TEndpointRecord>{{"Two", 2, "", 2}, {"One_A", 10, "", 10}, {"One_C", 1, "", 1}});
284284

285285
UNIT_ASSERT_VALUES_EQUAL(obj1->HostRemoved(), false);
286286
UNIT_ASSERT_VALUES_EQUAL(obj2->HostRemoved(), true);

client/impl/ydb_internal/scheme_helpers/helpers.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
#pragma once
22

33
#include <client/ydb_scheme/scheme.h>
4+
#include <vector>
45

56
namespace NYdb {
67

78
template<typename TFrom>
8-
inline void PermissionToSchemeEntry(const TFrom& from, TVector<NScheme::TPermissions>* to) {
9+
inline void PermissionToSchemeEntry(const TFrom& from, std::vector<NScheme::TPermissions>* to) {
910
for (const auto& effPerm : from) {
10-
to->push_back(NScheme::TPermissions{effPerm.subject(), TVector<TString>()});
11+
to->push_back(NScheme::TPermissions{effPerm.subject(), std::vector<TString>()});
1112
for (const auto& permName : effPerm.permission_names()) {
1213
to->back().PermissionNames.push_back(permName);
1314
}

client/impl/ydb_internal/session_pool/session_pool.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ std::unique_ptr<IGetSessionCtx> TSessionPool::TWaitersQueue::TryGet() {
7777
return result;
7878
}
7979

80-
void TSessionPool::TWaitersQueue::GetOld(TInstant now, TVector<std::unique_ptr<IGetSessionCtx>>& oldWaiters) {
80+
void TSessionPool::TWaitersQueue::GetOld(TInstant now, std::vector<std::unique_ptr<IGetSessionCtx>>& oldWaiters) {
8181
auto it = Waiters_.begin();
8282
while (it != Waiters_.end()) {
8383
if (now < it->first + MaxWaitSessionTimeout_)
@@ -265,11 +265,11 @@ TPeriodicCb TSessionPool::CreatePeriodicTask(std::weak_ptr<ISessionClient> weakC
265265
return false;
266266
} else {
267267
auto keepAliveBatchSize = PERIODIC_ACTION_BATCH_SIZE;
268-
TVector<std::unique_ptr<TKqpSessionCommon>> sessionsToTouch;
268+
std::vector<std::unique_ptr<TKqpSessionCommon>> sessionsToTouch;
269269
sessionsToTouch.reserve(keepAliveBatchSize);
270-
TVector<std::unique_ptr<TKqpSessionCommon>> sessionsToDelete;
270+
std::vector<std::unique_ptr<TKqpSessionCommon>> sessionsToDelete;
271271
sessionsToDelete.reserve(keepAliveBatchSize);
272-
TVector<std::unique_ptr<IGetSessionCtx>> waitersToReplyError;
272+
std::vector<std::unique_ptr<IGetSessionCtx>> waitersToReplyError;
273273
waitersToReplyError.reserve(keepAliveBatchSize);
274274
const auto now = TInstant::Now();
275275
{

0 commit comments

Comments
 (0)