@@ -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
9797Y_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 );
0 commit comments