Skip to content

Commit ddead97

Browse files
GazizonokiGazizonoki
committed
Some fixed from ydb repo
1 parent bcf7975 commit ddead97

File tree

3 files changed

+41
-41
lines changed

3 files changed

+41
-41
lines changed

‎examples/basic_example/basic_example.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,4 +508,4 @@ bool Run(const TDriver& driver) {
508508
}
509509

510510
return true;
511-
}
511+
}

‎src/client/federated_topic/ut/basic_usage_ut.cpp

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
#include <ydb/public/sdk/cpp/client/ydb_federated_topic/federated_topic.h>
2-
#include <ydb/public/sdk/cpp/client/ydb_federated_topic/impl/federated_write_session.h>
1+
#include <ydb-cpp-sdk/client/federated_topic/federated_topic.h>
2+
#include <src/client/federated_topic/impl/federated_write_session.h>
33

4-
#include <ydb/public/sdk/cpp/client/ydb_topic/ut/ut_utils/managed_executor.h>
4+
#include <src/client/topic/ut/ut_utils/managed_executor.h>
55

6-
#include <ydb/public/sdk/cpp/client/ydb_persqueue_public/persqueue.h>
6+
#include <src/client/persqueue_public/persqueue.h>
77

8-
#include <ydb/public/sdk/cpp/client/ydb_topic/impl/common.h>
9-
#include <ydb/public/sdk/cpp/client/ydb_topic/common/executor_impl.h>
10-
#include <ydb/public/sdk/cpp/client/ydb_persqueue_public/include/write_session.h>
8+
#include <src/client/topic/impl/common.h>
9+
#include <src/client/topic/common/executor_impl.h>
10+
#include <src/client/persqueue_public/include/write_session.h>
1111

12-
#include <ydb/public/sdk/cpp/client/ydb_persqueue_public/ut/ut_utils/ut_utils.h>
13-
#include <ydb/public/sdk/cpp/client/ydb_federated_topic/ut/fds_mock/fds_mock.h>
12+
#include <src/client/persqueue_public/ut/ut_utils/ut_utils.h>
13+
#include <src/client/federated_topic/ut/fds_mock/fds_mock.h>
1414

1515
#include <library/cpp/testing/unittest/registar.h>
1616
#include <library/cpp/testing/unittest/tests_data.h>
@@ -43,7 +43,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
4343
NYdb::TDriverConfig cfg;
4444
cfg.SetEndpoint(TStringBuilder() << "localhost:" << newServicePort);
4545
cfg.SetDatabase("/Root");
46-
cfg.SetLog(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG));
46+
cfg.SetLog(std::unique_ptr<TLogBackend>(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG).Release()));
4747
NYdb::TDriver driver(cfg);
4848
NYdb::NFederatedTopic::TFederatedTopicClient topicClient(driver);
4949

@@ -58,7 +58,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
5858
Cerr << "Session was created" << Endl;
5959

6060
ReadSession->WaitEvent().Wait(TDuration::Seconds(1));
61-
TMaybe<NYdb::NFederatedTopic::TReadSessionEvent::TEvent> event = ReadSession->GetEvent(false);
61+
std::optional<NYdb::NFederatedTopic::TReadSessionEvent::TEvent> event = ReadSession->GetEvent(false);
6262
Y_ASSERT(!event);
6363

6464
auto fdsRequest = fdsMock.GetNextPendingRequest();
@@ -99,7 +99,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
9999
for (size_t i = 0; i < partitionsCount; ++i) {
100100
ReadSession->WaitEvent().Wait();
101101
// Get event
102-
TMaybe<NYdb::NFederatedTopic::TReadSessionEvent::TEvent> event = ReadSession->GetEvent(true/*block - will block if no event received yet*/);
102+
std::optional<NYdb::NFederatedTopic::TReadSessionEvent::TEvent> event = ReadSession->GetEvent(true/*block - will block if no event received yet*/);
103103
Cerr << "Got new read session event: " << DebugString(*event) << Endl;
104104

105105
auto* startPartitionSessionEvent = std::get_if<NYdb::NFederatedTopic::TReadSessionEvent::TStartPartitionSessionEvent>(&*event);
@@ -126,7 +126,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
126126
NYdb::TDriverConfig cfg;
127127
cfg.SetEndpoint(TStringBuilder() << "localhost:" << newServicePort);
128128
cfg.SetDatabase("/Root");
129-
cfg.SetLog(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG));
129+
cfg.SetLog(std::unique_ptr<TLogBackend>(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG).Release()));
130130
NYdb::TDriver driver(cfg);
131131
NYdb::NFederatedTopic::TFederatedTopicClient topicClient(driver);
132132

@@ -170,7 +170,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
170170
NYdb::TDriverConfig cfg;
171171
cfg.SetEndpoint(TStringBuilder() << "localhost:" << newServicePort);
172172
cfg.SetDatabase("/Root");
173-
cfg.SetLog(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG));
173+
cfg.SetLog(std::unique_ptr<TLogBackend>(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG).Release()));
174174
NYdb::TDriver driver(cfg);
175175
auto clientSettings = TFederatedTopicClientSettings()
176176
.RetryPolicy(NTopic::IRetryPolicy::GetFixedIntervalPolicy(
@@ -215,7 +215,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
215215
NYdb::TDriverConfig cfg;
216216
cfg.SetEndpoint(TStringBuilder() << "localhost:" << newServicePort);
217217
cfg.SetDatabase("/Root");
218-
cfg.SetLog(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG));
218+
cfg.SetLog(std::unique_ptr<TLogBackend>(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG).Release()));
219219
NYdb::TDriver driver(cfg);
220220
auto clientSettings = TFederatedTopicClientSettings()
221221
.RetryPolicy(NTopic::IRetryPolicy::GetFixedIntervalPolicy(
@@ -324,7 +324,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
324324
NYdb::TDriverConfig cfg;
325325
cfg.SetEndpoint(TStringBuilder() << "localhost:" << newServicePort);
326326
cfg.SetDatabase("/Root");
327-
cfg.SetLog(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG));
327+
cfg.SetLog(std::unique_ptr<TLogBackend>(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG).Release()));
328328
NYdb::TDriver driver(cfg);
329329
auto clientSettings = TFederatedTopicClientSettings()
330330
.RetryPolicy(NTopic::IRetryPolicy::GetNoRetryPolicy());
@@ -343,14 +343,14 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
343343

344344
ReadSession->WaitEvent().Wait(TDuration::Seconds(1));
345345
auto event = ReadSession->GetEvent(false);
346-
UNIT_ASSERT(!event.Defined());
346+
UNIT_ASSERT(!event.has_value());
347347

348348
auto fdsRequest = fdsMock.WaitNextPendingRequest();
349349
fdsRequest.Result.SetValue({{}, grpc::Status(grpc::StatusCode::UNAVAILABLE, "mock 'unavailable'")});
350350

351351
ReadSession->WaitEvent().Wait();
352352
event = ReadSession->GetEvent(false);
353-
UNIT_ASSERT(event.Defined());
353+
UNIT_ASSERT(event.has_value());
354354
Cerr << ">>> Got event: " << DebugString(*event) << Endl;
355355
UNIT_ASSERT(std::holds_alternative<NTopic::TSessionClosedEvent>(*event));
356356

@@ -359,13 +359,13 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
359359

360360
ReadSession2->WaitEvent().Wait(TDuration::Seconds(1));
361361
event = ReadSession2->GetEvent(false);
362-
UNIT_ASSERT(!event.Defined());
362+
UNIT_ASSERT(!event.has_value());
363363

364364
fdsRequest = fdsMock.WaitNextPendingRequest();
365365
fdsRequest.Result.SetValue(fdsMock.ComposeOkResultAvailableDatabases());
366366

367367
event = ReadSession2->GetEvent(true);
368-
UNIT_ASSERT(event.Defined());
368+
UNIT_ASSERT(event.has_value());
369369
Cerr << ">>> Got event: " << DebugString(*event) << Endl;
370370
UNIT_ASSERT(std::holds_alternative<TReadSessionEvent::TStartPartitionSessionEvent>(*event));
371371

@@ -393,7 +393,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
393393
Cerr << "Session was created" << Endl;
394394

395395
ReadSession->WaitEvent().Wait(TDuration::Seconds(1));
396-
TMaybe<NYdb::NFederatedTopic::TReadSessionEvent::TEvent> event = ReadSession->GetEvent(false);
396+
std::optional<NYdb::NFederatedTopic::TReadSessionEvent::TEvent> event = ReadSession->GetEvent(false);
397397
Y_ASSERT(event);
398398
Cerr << "Got new read session event: " << DebugString(*event) << Endl;
399399

@@ -418,7 +418,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
418418
NYdb::TDriverConfig cfg;
419419
cfg.SetEndpoint(TStringBuilder() << "localhost:" << newServicePort);
420420
cfg.SetDatabase("/Root");
421-
cfg.SetLog(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG));
421+
cfg.SetLog(std::unique_ptr<TLogBackend>(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG).Release()));
422422
NYdb::TDriver driver(cfg);
423423
auto clientSettings = TFederatedTopicClientSettings();
424424
NYdb::NFederatedTopic::TFederatedTopicClient topicClient(driver, clientSettings);
@@ -434,7 +434,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
434434
Cerr << "Session was created" << Endl;
435435

436436
ReadSession->WaitEvent().Wait(TDuration::Seconds(1));
437-
TMaybe<NYdb::NFederatedTopic::TReadSessionEvent::TEvent> event = ReadSession->GetEvent(false);
437+
std::optional<NYdb::NFederatedTopic::TReadSessionEvent::TEvent> event = ReadSession->GetEvent(false);
438438
Y_ASSERT(!event);
439439

440440
{
@@ -449,7 +449,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
449449
}
450450

451451
ReadSession->WaitEvent().Wait();
452-
TMaybe<NYdb::NFederatedTopic::TReadSessionEvent::TEvent> event2 = ReadSession->GetEvent(true);
452+
std::optional<NYdb::NFederatedTopic::TReadSessionEvent::TEvent> event2 = ReadSession->GetEvent(true);
453453
Cerr << "Got new read session event: " << DebugString(*event2) << Endl;
454454

455455
auto* sessionEvent = std::get_if<NYdb::NFederatedTopic::TSessionClosedEvent>(&*event2);
@@ -475,7 +475,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
475475
NYdb::TDriverConfig cfg;
476476
cfg.SetEndpoint(TStringBuilder() << "localhost:" << newServicePort);
477477
cfg.SetDatabase("/Root");
478-
cfg.SetLog(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG));
478+
cfg.SetLog(std::unique_ptr<TLogBackend>(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG).Release()));
479479
NYdb::TDriver driver(cfg);
480480
auto clientSettings = TFederatedTopicClientSettings()
481481
.RetryPolicy(NTopic::IRetryPolicy::GetFixedIntervalPolicy(
@@ -568,7 +568,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
568568
NYdb::TDriverConfig cfg;
569569
cfg.SetEndpoint(TStringBuilder() << "localhost:" << newServicePort);
570570
cfg.SetDatabase("/Root");
571-
cfg.SetLog(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG));
571+
cfg.SetLog(std::unique_ptr<TLogBackend>(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG).Release()));
572572
NYdb::TDriver driver(cfg);
573573
auto clientSettings = TFederatedTopicClientSettings()
574574
.RetryPolicy(NTopic::IRetryPolicy::GetFixedIntervalPolicy(
@@ -613,10 +613,10 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
613613
auto& message = messages[i];
614614
UNIT_ASSERT(message.GetFederatedPartitionSession()->GetReadSourceDatabaseName() == "dc1");
615615
UNIT_ASSERT(message.GetFederatedPartitionSession()->GetTopicPath() == setup->GetTestTopic());
616-
UNIT_ASSERT(message.GetData().EndsWith(message.GetFederatedPartitionSession()->GetTopicOriginDatabaseName()));
616+
UNIT_ASSERT(message.GetData().ends_with(message.GetFederatedPartitionSession()->GetTopicOriginDatabaseName()));
617617

618618
UNIT_ASSERT(!sentSet.empty());
619-
UNIT_ASSERT_C(sentSet.erase(message.GetData()), "no such element is sentSet: " + message.GetData());
619+
UNIT_ASSERT_C(sentSet.erase(TString{message.GetData()}), "no such element is sentSet: " + message.GetData());
620620
totalReceived++;
621621
}
622622
if (totalReceived == 3 * sentMessages.size()) {
@@ -719,7 +719,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
719719
NYdb::TDriverConfig cfg;
720720
cfg.SetEndpoint(TStringBuilder() << "localhost:" << newServicePort);
721721
cfg.SetDatabase("/Root");
722-
cfg.SetLog(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG));
722+
cfg.SetLog(std::unique_ptr<TLogBackend>(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG).Release()));
723723
NYdb::TDriver driver(cfg);
724724
NYdb::NFederatedTopic::TFederatedTopicClient topicClient(driver);
725725

@@ -787,7 +787,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
787787
NYdb::TDriverConfig cfg;
788788
cfg.SetEndpoint(TStringBuilder() << "localhost:" << newServicePort);
789789
cfg.SetDatabase("/Root");
790-
cfg.SetLog(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG));
790+
cfg.SetLog(std::unique_ptr<TLogBackend>(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG).Release()));
791791
NYdb::TDriver driver(cfg);
792792
NYdb::NFederatedTopic::TFederatedTopicClient topicClient(driver);
793793

@@ -821,7 +821,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
821821
NYdb::TDriverConfig cfg;
822822
cfg.SetEndpoint(TStringBuilder() << "localhost:" << newServicePort);
823823
cfg.SetDatabase("/Root");
824-
cfg.SetLog(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG));
824+
cfg.SetLog(std::unique_ptr<TLogBackend>(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG).Release()));
825825
NYdb::TDriver driver(cfg);
826826
NYdb::NFederatedTopic::TFederatedTopicClient topicClient(driver);
827827

@@ -878,7 +878,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
878878
NYdb::TDriverConfig cfg;
879879
cfg.SetEndpoint(TStringBuilder() << "localhost:" << newServicePort);
880880
cfg.SetDatabase("/Root");
881-
cfg.SetLog(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG));
881+
cfg.SetLog(std::unique_ptr<TLogBackend>(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG).Release()));
882882
NYdb::TDriver driver(cfg);
883883
TFederatedTopicClientSettings clientSettings;
884884
clientSettings.RetryPolicy(NPersQueue::IRetryPolicy::GetNoRetryPolicy());
@@ -934,7 +934,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
934934
NYdb::TDriverConfig cfg;
935935
cfg.SetEndpoint(TStringBuilder() << "localhost:" << newServicePort);
936936
cfg.SetDatabase("/Root");
937-
cfg.SetLog(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG));
937+
cfg.SetLog(std::unique_ptr<TLogBackend>(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG).Release()));
938938
NYdb::TDriver driver(cfg);
939939
NYdb::NFederatedTopic::TFederatedTopicClient topicClient(driver);
940940

@@ -1017,7 +1017,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
10171017
NYdb::TDriverConfig cfg;
10181018
cfg.SetEndpoint(TStringBuilder() << "localhost:" << newServicePort);
10191019
cfg.SetDatabase("/Root");
1020-
cfg.SetLog(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG));
1020+
cfg.SetLog(std::unique_ptr<TLogBackend>(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG).Release()));
10211021
NYdb::TDriver driver(cfg);
10221022
TFederatedTopicClientSettings clientSettings;
10231023
NYdb::NFederatedTopic::TFederatedTopicClient topicClient(driver, clientSettings);
@@ -1036,13 +1036,13 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
10361036

10371037
{
10381038
auto e = WriteSession->GetEvent(true);
1039-
UNIT_ASSERT(e.Defined());
1039+
UNIT_ASSERT(e.has_value());
10401040
Cerr << ">>> Got event: " << DebugString(*e) << Endl;
10411041
UNIT_ASSERT(std::holds_alternative<NYdb::NTopic::TWriteSessionEvent::TReadyToAcceptEvent>(*e));
10421042
}
10431043
{
10441044
auto e = WriteSession->GetEvent(true);
1045-
UNIT_ASSERT(e.Defined());
1045+
UNIT_ASSERT(e.has_value());
10461046
Cerr << ">>> Got event: " << DebugString(*e) << Endl;
10471047
UNIT_ASSERT(std::holds_alternative<NYdb::NTopic::TSessionClosedEvent>(*e));
10481048
}
@@ -1052,7 +1052,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
10521052

10531053
NTopic::TContinuationToken GetToken(std::shared_ptr<NTopic::IWriteSession> writer) {
10541054
auto e = writer->GetEvent(true);
1055-
UNIT_ASSERT(e.Defined());
1055+
UNIT_ASSERT(e.has_value());
10561056
Cerr << ">>> Got event: " << DebugString(*e) << Endl;
10571057
auto* readyToAcceptEvent = std::get_if<NYdb::NTopic::TWriteSessionEvent::TReadyToAcceptEvent>(&*e);
10581058
UNIT_ASSERT(readyToAcceptEvent);
@@ -1076,7 +1076,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
10761076
auto driverConfig = NYdb::TDriverConfig()
10771077
.SetEndpoint(TStringBuilder() << "localhost:" << newServicePort)
10781078
.SetDatabase("/Root")
1079-
.SetLog(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG));
1079+
.SetLog(std::unique_ptr<TLogBackend>(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG).Release()));
10801080
auto driver = NYdb::TDriver(driverConfig);
10811081
auto topicClient = NYdb::NFederatedTopic::TFederatedTopicClient(driver);
10821082

@@ -1169,7 +1169,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
11691169
NYdb::TDriverConfig cfg;
11701170
cfg.SetEndpoint(TStringBuilder() << "localhost:" << setup->GetGrpcPort());
11711171
cfg.SetDatabase("/Root");
1172-
cfg.SetLog(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG));
1172+
cfg.SetLog(std::unique_ptr<TLogBackend>(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG).Release()));
11731173
NYdb::TDriver driver(cfg);
11741174
NYdb::NFederatedTopic::TFederatedTopicClient client(driver);
11751175

‎src/library/json_value/ydb_json_value.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ namespace {
676676

677677
case TTypeParser::ETypeKind::Decimal:
678678
EnsureType(jsonValue, NJson::JSON_STRING);
679-
ValueBuilder.Decimal(std::string(jsonValue.GetString()));
679+
ValueBuilder.Decimal(TDecimalValue(std::string{jsonValue.GetString()}, 22, 9));
680680
break;
681681

682682
case TTypeParser::ETypeKind::Pg:

0 commit comments

Comments
 (0)