Skip to content

Commit 29d3942

Browse files
committed
Replace Cout, Cerr and Clog
1 parent 13f22b2 commit 29d3942

File tree

100 files changed

+609
-558
lines changed

Some content is hidden

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

100 files changed

+609
-558
lines changed

client/impl/ydb_internal/grpc_connections/grpc_connections.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ bool TGRpcConnectionsImpl::StartStatCollecting(NMonitoring::IMetricRegistry* sen
389389
if (auto ptr = dynamic_cast<NMonitoring::TMetricRegistry*>(sensorsRegistry)) {
390390
MetricRegistryPtr_ = ptr;
391391
} else {
392-
Cerr << "Unknown IMetricRegistry impl" << Endl;
392+
std::cerr << "Unknown IMetricRegistry impl" << std::endl;
393393
return false;
394394
}
395395
}

client/impl/ydb_internal/retry/retry.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ class TRetryContextBase : TNonCopyable {
4747

4848
void LogRetry(const TStatus& status) {
4949
if (Settings_.Verbose_) {
50-
Cerr << "Previous query attempt was finished with unsuccessful status "
51-
<< status.GetStatus() << ": " << status.GetIssues().ToString(true) << Endl;
52-
Cerr << "Sending retry attempt " << RetryNumber_ << " of " << Settings_.MaxRetries_ << Endl;
50+
std::cerr << "Previous query attempt was finished with unsuccessful status "
51+
<< ToString(status.GetStatus()) << ": " << status.GetIssues().ToString(true) << std::endl;
52+
std::cerr << "Sending retry attempt " << RetryNumber_ << " of " << Settings_.MaxRetries_ << std::endl;
5353
}
5454
}
5555

client/ydb_coordination/coordination_ut.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace {
2424
{
2525
Y_UNUSED(context);
2626

27-
Cerr << "ListEndpoints: " << request->ShortDebugString() << Endl;
27+
std::cerr << "ListEndpoints: " << request->ShortDebugString() << std::endl;
2828

2929
const auto* result = MockResults.FindPtr(request->database());
3030
Y_ABORT_UNLESS(result, "Mock service doesn't have a result for database '%s'", request->database().c_str());
@@ -50,7 +50,7 @@ namespace {
5050
{
5151
Y_UNUSED(context);
5252

53-
Cerr << "Session stream started" << Endl;
53+
std::cerr << "Session stream started" << std::endl;
5454

5555
Ydb::Coordination::SessionRequest request;
5656

@@ -60,7 +60,7 @@ namespace {
6060
// Disconnected before the request was sent
6161
return grpc::Status::OK;
6262
}
63-
Cerr << "Session request: " << request.ShortDebugString() << Endl;
63+
std::cerr << "Session request: " << request.ShortDebugString() << std::endl;
6464
Y_ABORT_UNLESS(request.has_session_start(), "Expected session start");
6565
auto& start = request.session_start();
6666
uint64_t sessionId = start.session_id();
@@ -77,7 +77,7 @@ namespace {
7777

7878
size_t pings_received = 0;
7979
while (stream->Read(&request)) {
80-
Cerr << "Session request: " << request.ShortDebugString() << Endl;
80+
std::cerr << "Session request: " << request.ShortDebugString() << std::endl;
8181
Y_ABORT_UNLESS(request.has_ping(), "Only ping requests are supported");
8282
if (++pings_received <= 2) {
8383
// Only reply to the first 2 ping requests
@@ -152,7 +152,7 @@ Y_UNIT_TEST_SUITE(Coordination) {
152152
auto endTimestamp = TInstant::Now();
153153
auto elapsed = endTimestamp - startTimestamp;
154154

155-
Cerr << "Got: " << res.GetStatus() << ": " << res.GetIssues().ToString() << Endl;
155+
std::cerr << "Got: " << res.GetStatus() << ": " << res.GetIssues().ToString() << std::endl;
156156

157157
// Both connection and session timeout return EStatus::TIMEOUT
158158
UNIT_ASSERT_VALUES_EQUAL_C(res.GetStatus(), EStatus::TIMEOUT, res.GetIssues().ToString());
@@ -168,7 +168,7 @@ Y_UNIT_TEST_SUITE(Coordination) {
168168
TMockCoordinationService coordinationService;
169169
ui16 coordinationPort = pm.GetPort();
170170
auto coordinationServer = StartGrpcServer(
171-
TYdbStringBuilder() << "0.0.0.0:" << coordinationPort,
171+
TStringBuilder() << "0.0.0.0:" << coordinationPort,
172172
coordinationService);
173173

174174
// Fill a fake discovery service
@@ -197,7 +197,7 @@ Y_UNIT_TEST_SUITE(Coordination) {
197197
auto stoppedFuture = stoppedPromise.GetFuture();
198198
auto settings = TSessionSettings()
199199
.OnStateChanged([](auto state) {
200-
Cerr << "Session state: " << state << Endl;
200+
std::cerr << "Session state: " << state << std::endl;
201201
})
202202
.OnStopped([stoppedPromise]() mutable {
203203
stoppedPromise.SetValue();
@@ -221,7 +221,7 @@ Y_UNIT_TEST_SUITE(Coordination) {
221221

222222
// Check the last failure stored in a session
223223
auto res2 = session.Close().ExtractValueSync();
224-
Cerr << "Close: " << res2.GetStatus() << ": " << res2.GetIssues().ToString() << Endl;
224+
std::cerr << "Close: " << res2.GetStatus() << ": " << res2.GetIssues().ToString() << std::endl;
225225
UNIT_ASSERT_VALUES_EQUAL_C(res2.GetStatus(), EStatus::TIMEOUT, res2.GetIssues().ToString());
226226
}
227227

@@ -261,7 +261,7 @@ Y_UNIT_TEST_SUITE(Coordination) {
261261
auto stoppedFuture = stoppedPromise.GetFuture();
262262
auto settings = TSessionSettings()
263263
.OnStateChanged([](auto state) {
264-
Cerr << "Session state: " << state << Endl;
264+
std::cerr << "Session state: " << state << std::endl;
265265
})
266266
.OnStopped([stoppedPromise]() mutable {
267267
stoppedPromise.SetValue();
@@ -288,7 +288,7 @@ Y_UNIT_TEST_SUITE(Coordination) {
288288

289289
// Check the last failure stored in a session
290290
auto res2 = session.Close().ExtractValueSync();
291-
Cerr << "Close: " << res2.GetStatus() << ": " << res2.GetIssues().ToString() << Endl;
291+
std::cerr << "Close: " << res2.GetStatus() << ": " << res2.GetIssues().ToString() << std::endl;
292292
UNIT_ASSERT_VALUES_EQUAL_C(res2.GetStatus(), EStatus::CLIENT_CANCELLED, res2.GetIssues().ToString());
293293
}
294294

client/ydb_driver/driver_ut.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace {
2929
{
3030
Y_UNUSED(context);
3131

32-
Cerr << "ListEndpoints: " << request->ShortDebugString() << Endl;
32+
std::cerr << "ListEndpoints: " << request->ShortDebugString() << std::endl;
3333

3434
const auto* result = MockResults.FindPtr(request->database());
3535
Y_ABORT_UNLESS(result, "Mock service doesn't have a result for database '%s'", request->database().c_str());
@@ -54,7 +54,7 @@ namespace {
5454
{
5555
Y_UNUSED(context);
5656

57-
Cerr << "CreateSession: " << request->ShortDebugString() << Endl;
57+
std::cerr << "CreateSession: " << request->ShortDebugString() << std::endl;
5858

5959
Ydb::Table::CreateSessionResult result;
6060
result.set_session_id("my-session-id");

client/ydb_federated_topic/ut/basic_usage_ut.cpp

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
3939

4040
// Create topic client.
4141
NYdb::TDriverConfig cfg;
42-
cfg.SetEndpoint(TYdbStringBuilder() << "localhost:" << newServicePort);
42+
cfg.SetEndpoint(TStringBuilder() << "localhost:" << newServicePort);
4343
cfg.SetDatabase("/Root");
4444
cfg.SetLog(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG));
4545
NYdb::TDriver driver(cfg);
@@ -53,7 +53,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
5353
.AppendTopics(setup->GetTestTopic());
5454

5555
ReadSession = topicClient.CreateReadSession(readSettings);
56-
Cerr << "Session was created" << Endl;
56+
std::cerr << "Session was created" << std::endl;
5757

5858
ReadSession->WaitEvent().Wait(TDuration::Seconds(1));
5959
std::optional<NYdb::NFederatedTopic::TReadSessionEvent::TEvent> event = ReadSession->GetEvent(false);
@@ -98,7 +98,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
9898
ReadSession->WaitEvent().Wait();
9999
// Get event
100100
std::optional<NYdb::NFederatedTopic::TReadSessionEvent::TEvent> event = ReadSession->GetEvent(true/*block - will block if no event received yet*/);
101-
Cerr << "Got new read session event: " << DebugString(*event) << Endl;
101+
std::cerr << "Got new read session event: " << DebugString(*event) << std::endl;
102102

103103
auto* startPartitionSessionEvent = std::get_if<NYdb::NFederatedTopic::TReadSessionEvent::TStartPartitionSessionEvent>(&*event);
104104
Y_ASSERT(startPartitionSessionEvent);
@@ -135,19 +135,19 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
135135
.MaxMemoryUsageBytes(1_MB)
136136
.AppendTopics(setup->GetTestTopic());
137137

138-
Cerr << "Before ReadSession was created" << Endl;
138+
std::cerr << "Before ReadSession was created" << std::endl;
139139
ReadSession = topicClient.CreateReadSession(readSettings);
140-
Cerr << "Session was created" << Endl;
140+
std::cerr << "Session was created" << std::endl;
141141

142142
auto f = ReadSession->WaitEvent();
143-
Cerr << "Returned from WaitEvent" << Endl;
143+
std::cerr << "Returned from WaitEvent" << std::endl;
144144
// observer asyncInit should respect client/session timeouts
145145
UNIT_ASSERT(!f.Wait(TDuration::Seconds(1)));
146146

147-
Cerr << "Session blocked successfully" << Endl;
147+
std::cerr << "Session blocked successfully" << std::endl;
148148

149149
UNIT_ASSERT(ReadSession->Close(TDuration::MilliSeconds(10)));
150-
Cerr << "Session closed gracefully" << Endl;
150+
std::cerr << "Session closed gracefully" << std::endl;
151151
}
152152

153153
Y_UNIT_TEST(RetryDiscoveryWithCancel) {
@@ -231,7 +231,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
231231
.AppendTopics(setup->GetTestTopic());
232232

233233
ReadSession = topicClient.CreateReadSession(readSettings);
234-
Cerr << "Session was created" << Endl;
234+
std::cerr << "Session was created" << std::endl;
235235

236236
Sleep(TDuration::MilliSeconds(50));
237237

@@ -296,7 +296,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
296296
UNIT_ASSERT(!events.empty());
297297

298298
for (auto& e : events) {
299-
Cerr << ">>> Got event: " << DebugString(e) << Endl;
299+
std::cerr << ">>> Got event: " << DebugString(e) << std::endl;
300300
if (auto* dataEvent = std::get_if<TReadSessionEvent::TDataReceivedEvent>(&e)) {
301301
dataEvent->Commit();
302302
} else if (auto* startPartitionSessionEvent = std::get_if<TReadSessionEvent::TStartPartitionSessionEvent>(&e)) {
@@ -343,7 +343,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
343343
.AppendTopics(setup->GetTestTopic());
344344

345345
ReadSession = topicClient.CreateReadSession(readSettings);
346-
Cerr << "Session was created" << Endl;
346+
std::cerr << "Session was created" << std::endl;
347347

348348
ReadSession->WaitEvent().Wait(TDuration::Seconds(1));
349349
auto event = ReadSession->GetEvent(false);
@@ -363,11 +363,11 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
363363
ReadSession->WaitEvent().Wait();
364364
event = ReadSession->GetEvent(false);
365365
UNIT_ASSERT(event.Defined());
366-
Cerr << ">>> Got event: " << DebugString(*event) << Endl;
366+
std::cerr << ">>> Got event: " << DebugString(*event) << std::endl;
367367
UNIT_ASSERT(std::holds_alternative<NTopic::TSessionClosedEvent>(*event));
368368

369369
auto ReadSession2 = topicClient.CreateReadSession(readSettings);
370-
Cerr << "Session2 was created" << Endl;
370+
std::cerr << "Session2 was created" << std::endl;
371371

372372
ReadSession2->WaitEvent().Wait(TDuration::Seconds(1));
373373
event = ReadSession2->GetEvent(false);
@@ -384,10 +384,10 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
384384

385385
event = ReadSession2->GetEvent(true);
386386
UNIT_ASSERT(event.Defined());
387-
Cerr << ">>> Got event: " << DebugString(*event) << Endl;
387+
std::cerr << ">>> Got event: " << DebugString(*event) << std::endl;
388388
UNIT_ASSERT(std::holds_alternative<TReadSessionEvent::TStartPartitionSessionEvent>(*event));
389389

390-
// Cerr << ">>> Got event: " << DebugString(*event) << Endl;
390+
// std::cerr << ">>> Got event: " << DebugString(*event) << std::endl;
391391
// UNIT_ASSERT(std::holds_alternative<NTopic::TSessionClosedEvent>(*event));
392392
}
393393

@@ -408,12 +408,12 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
408408
.AppendTopics(setup->GetTestTopic());
409409

410410
ReadSession = topicClient.CreateReadSession(readSettings);
411-
Cerr << "Session was created" << Endl;
411+
std::cerr << "Session was created" << std::endl;
412412

413413
ReadSession->WaitEvent().Wait(TDuration::Seconds(1));
414414
std::optional<NYdb::NFederatedTopic::TReadSessionEvent::TEvent> event = ReadSession->GetEvent(false);
415415
Y_ASSERT(event);
416-
Cerr << "Got new read session event: " << DebugString(*event) << Endl;
416+
std::cerr << "Got new read session event: " << DebugString(*event) << std::endl;
417417

418418
auto* startPartitionSessionEvent = std::get_if<NYdb::NFederatedTopic::TReadSessionEvent::TStartPartitionSessionEvent>(&*event);
419419
Y_ASSERT(startPartitionSessionEvent);
@@ -471,7 +471,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
471471
.AppendTopics(setup->GetTestTopic());
472472

473473
readSettings.FederatedEventHandlers_.SimpleDataHandlers([&](TReadSessionEvent::TDataReceivedEvent& ev) mutable {
474-
Cerr << ">>> event from dataHandler: " << DebugString(ev) << Endl;
474+
std::cerr << ">>> event from dataHandler: " << DebugString(ev) << std::endl;
475475
Y_VERIFY_S(AtomicGet(check) != 0, "check is false");
476476
auto& messages = ev.GetMessages();
477477
for (size_t i = 0u; i < messages.size(); ++i) {
@@ -484,7 +484,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
484484
});
485485

486486
ReadSession = topicClient.CreateReadSession(readSettings);
487-
Cerr << ">>> Session was created" << Endl;
487+
std::cerr << ">>> Session was created" << std::endl;
488488

489489
Sleep(TDuration::MilliSeconds(50));
490490

@@ -548,20 +548,20 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
548548
.MessageGroupId("src_id");
549549

550550
WriteSession = topicClient.CreateWriteSession(writeSettings);
551-
Cerr << "Session was created" << Endl;
551+
std::cerr << "Session was created" << std::endl;
552552

553553
WriteSession->WaitEvent().Wait(TDuration::Seconds(1));
554554
auto event = WriteSession->GetEvent(false);
555555
Y_ASSERT(event);
556-
Cerr << "Got new read session event: " << DebugString(*event) << Endl;
556+
std::cerr << "Got new read session event: " << DebugString(*event) << std::endl;
557557
auto* readyToAcceptEvent = std::get_if<NYdb::NTopic::TWriteSessionEvent::TReadyToAcceptEvent>(&*event);
558558
Y_ASSERT(readyToAcceptEvent);
559559
WriteSession->Write(std::move(readyToAcceptEvent->ContinuationToken), NTopic::TWriteMessage("hello"));
560560

561561
WriteSession->WaitEvent().Wait(TDuration::Seconds(1));
562562
event = WriteSession->GetEvent(false);
563563
Y_ASSERT(event);
564-
Cerr << "Got new read session event: " << DebugString(*event) << Endl;
564+
std::cerr << "Got new read session event: " << DebugString(*event) << std::endl;
565565

566566
readyToAcceptEvent = std::get_if<NYdb::NTopic::TWriteSessionEvent::TReadyToAcceptEvent>(&*event);
567567
Y_ASSERT(readyToAcceptEvent);
@@ -579,7 +579,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
579579
WriteSession->WaitEvent().Wait(TDuration::Seconds(1));
580580
event = WriteSession->GetEvent(false);
581581
Y_ASSERT(event);
582-
Cerr << "Got new read session event: " << DebugString(*event) << Endl;
582+
std::cerr << "Got new read session event: " << DebugString(*event) << std::endl;
583583

584584
auto* acksEvent = std::get_if<NYdb::NTopic::TWriteSessionEvent::TAcksEvent>(&*event);
585585
Y_ASSERT(acksEvent);

client/ydb_federated_topic/ut/fds_mock.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class TFederationDiscoveryServiceMock: public Ydb::FederationDiscovery::V1::Fede
6161
f.Wait(TDuration::Seconds(35));
6262
if (f.HasValue()) {
6363
auto result = f.ExtractValueSync();
64-
Cerr << ">>> Ready to answer: " << (result.Status.ok() ? "ok" : "err") << Endl;
64+
std::cerr << ">>> Ready to answer: " << (result.Status.ok() ? "ok" : "err") << std::endl;
6565
*response = std::move(result.Response);
6666
return result.Status;
6767
}

client/ydb_persqueue_core/impl/write_session_impl.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -831,10 +831,10 @@ bool TWriteSessionImpl::CleanupOnAcknowledged(ui64 id) {
831831
LOG_LAZY(DbDriverState->Log, TLOG_DEBUG, LogPrefix() << "Write session: acknoledged message " << id);
832832
UpdateTimedCountersImpl();
833833
if (SentOriginalMessages.empty() || SentOriginalMessages.front().Id != id){
834-
Cerr << "State before restart was:\n" << StateStr << "\n\n";
834+
std::cerr << "State before restart was:\n" << StateStr << "\n\n";
835835
DumpState();
836-
Cerr << "State on ack with id " << id << " is:\n";
837-
Cerr << StateStr << "\n\n";
836+
std::cerr << "State on ack with id " << id << " is:\n";
837+
std::cerr << StateStr << "\n\n";
838838
Y_ABORT("got unknown ack");
839839
}
840840

@@ -1098,9 +1098,9 @@ bool TWriteSessionImpl::IsReadyToSendNextImpl() {
10981098
Y_ABORT_UNLESS(!OriginalMessagesToSend.empty(), "There are packed messages but no original messages");
10991099
if (OriginalMessagesToSend.front().Id > PackedMessagesToSend.top().Offset) {
11001100

1101-
Cerr << " State before restart was:\n" << StateStr << "\n\n";
1101+
std::cerr << " State before restart was:\n" << StateStr << "\n\n";
11021102
DumpState();
1103-
Cerr << " State after restart is:\n" << StateStr << "\n\n";
1103+
std::cerr << " State after restart is:\n" << StateStr << "\n\n";
11041104
Y_ABORT("Lost original message(s)");
11051105
}
11061106

client/ydb_persqueue_core/ut/basic_usage_ut.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
6868
ui32 previousOffset = 0;
6969
bool closed = false;
7070
while ((readMessageCount < messageCount || committedOffset <= previousOffset) && !closed) {
71-
Cerr << "Get event on client\n";
71+
std::cerr << "Get event on client\n";
7272
auto event = *readSession->GetEvent(true);
7373
std::visit(TOverloaded {
7474
[&](TReadSessionEvent::TDataReceivedEvent& event) {
@@ -149,7 +149,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
149149
auto sessionAdapter = TSimpleWriteSessionTestAdapter(
150150
dynamic_cast<TSimpleBlockingWriteSession *>(session.get()));
151151
if (shouldCaptureData.has_value()) {
152-
TYdbStringBuilder msg;
152+
TStringBuilder msg;
153153
msg << "Session has captured " << sessionAdapter.GetAcquiredMessagesCount()
154154
<< " messages, capturing was expected: " << *shouldCaptureData << Endl;
155155
UNIT_ASSERT_VALUES_EQUAL_C(sessionAdapter.GetAcquiredMessagesCount() > 0, *shouldCaptureData, msg.c_str());
@@ -329,7 +329,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
329329
oss << message;
330330
}
331331

332-
Cerr << message << " " << packed << "\n";
332+
std::cerr << message << " " << packed << "\n";
333333

334334
{
335335
auto event = *writer->GetEvent(true);
@@ -364,7 +364,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
364364
}
365365
++tokens;
366366
}
367-
Cerr << "GOT EVENT " << acks << " " << tokens << "\n";
367+
std::cerr << "GOT EVENT " << acks << " " << tokens << "\n";
368368

369369
}
370370
UNIT_ASSERT(!writer->WaitEvent().Wait(TDuration::Seconds(5)));
@@ -377,7 +377,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
377377
);
378378
ui32 readMessageCount = 0;
379379
while (readMessageCount < 4) {
380-
Cerr << "Get event on client\n";
380+
std::cerr << "Get event on client\n";
381381
auto event = *readSession->GetEvent(true);
382382
std::visit(TOverloaded {
383383
[&](TReadSessionEvent::TDataReceivedEvent& event) {
@@ -481,7 +481,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
481481
.RetryPolicy(IRetryPolicy::GetNoRetryPolicy());
482482
std::shared_ptr<IReadSession> readSession = client.CreateReadSession(settings);
483483

484-
Cerr << "Get event on client\n";
484+
std::cerr << "Get event on client\n";
485485
auto event = *readSession->GetEvent(true);
486486
std::visit(TOverloaded {
487487
[&](TReadSessionEvent::TDataReceivedEvent&) {
@@ -505,7 +505,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
505505
UNIT_FAIL("Test does not support lock sessions yet");
506506
},
507507
[&](TSessionClosedEvent& event) {
508-
Cerr << "Got close event: " << event.DebugString();
508+
std::cerr << "Got close event: " << event.DebugString();
509509
}
510510

511511
}, event);

0 commit comments

Comments
 (0)