Skip to content

Commit

Permalink
separate include targets (ydb-platform#3405)
Browse files Browse the repository at this point in the history
  • Loading branch information
ildar-khisambeev authored Apr 27, 2024
1 parent 7eca2bb commit 3863877
Show file tree
Hide file tree
Showing 86 changed files with 3,694 additions and 4,004 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <ydb/public/sdk/cpp/client/ydb_topic/topic.h>
#include <ydb/public/sdk/cpp/client/ydb_topic/include/client.h>

#include <ydb/public/api/protos/ydb_federation_discovery.pb.h>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "federated_read_session.h"

#include <ydb/public/sdk/cpp/client/ydb_topic/impl/log_lazy.h>
#include <ydb/public/sdk/cpp/client/ydb_topic/common/log_lazy.h>
#include <ydb/public/sdk/cpp/client/ydb_topic/impl/topic_impl.h>

#define INCLUDE_YDB_INTERNAL_H
Expand Down Expand Up @@ -116,7 +116,6 @@ void TFederatedReadSessionImpl::OpenSubSessionsImpl(const std::vector<std::share
.Database(db->path())
.DiscoveryEndpoint(db->endpoint());
auto subclient = make_shared<NTopic::TTopicClient::TImpl>(Connections, settings);
subclient->SetProvidedCodecs(ProvidedCodecs);
auto subsession = subclient->CreateReadSession(FromFederated(Settings, db, EventFederator));
SubSessions.emplace_back(subsession, db);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

#include <ydb/public/sdk/cpp/client/ydb_federated_topic/impl/federated_topic_impl.h>

#include <ydb/public/sdk/cpp/client/ydb_topic/impl/callback_context.h>
#include <ydb/public/sdk/cpp/client/ydb_topic/impl/read_session.h>

#include <ydb/public/sdk/cpp/client/ydb_topic/common/callback_context.h>
#include <ydb/public/sdk/cpp/client/ydb_topic/impl/read_session.h>

namespace NYdb::NFederatedTopic {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include "federated_read_session.h"
#include "federated_write_session.h"

#include <ydb/public/sdk/cpp/client/ydb_persqueue_public/impl/read_session.h>
#include <ydb/public/sdk/cpp/client/ydb_persqueue_public/impl/write_session.h>
#include <ydb/public/sdk/cpp/client/ydb_persqueue_public/include/read_session.h>
#include <ydb/public/sdk/cpp/client/ydb_persqueue_public/include/write_session.h>

namespace NYdb::NFederatedTopic {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "federated_write_session.h"

#include <ydb/public/sdk/cpp/client/ydb_topic/impl/log_lazy.h>
#include <ydb/public/sdk/cpp/client/ydb_topic/common/log_lazy.h>
#include <ydb/public/sdk/cpp/client/ydb_topic/impl/topic_impl.h>

#define INCLUDE_YDB_INTERNAL_H
Expand Down Expand Up @@ -115,7 +115,6 @@ void TFederatedWriteSessionImpl::OpenSubsessionImpl(std::shared_ptr<TDbInfo> db)
.Database(db->path())
.DiscoveryEndpoint(db->endpoint());
auto subclient = make_shared<NTopic::TTopicClient::TImpl>(Connections, clientSettings);
subclient->SetProvidedCodecs(ProvidedCodecs);

auto handlers = NTopic::TWriteSessionSettings::TEventHandlers()
.HandlersExecutor(Settings.EventHandlers_.HandlersExecutor_)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <ydb/public/sdk/cpp/client/ydb_federated_topic/impl/federated_topic_impl.h>

#include <ydb/public/sdk/cpp/client/ydb_persqueue_public/impl/write_session.h>
#include <ydb/public/sdk/cpp/client/ydb_persqueue_public/include/write_session.h>

#include <ydb/public/sdk/cpp/client/ydb_topic/impl/write_session.h>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "ydb/public/sdk/cpp/client/ydb_topic/impl/log_lazy.h"
#include "ydb/public/sdk/cpp/client/ydb_topic/common/log_lazy.h"
#include <ydb/public/api/grpc/ydb_federation_discovery_v1.grpc.pb.h>

#include <ydb/public/sdk/cpp/client/ydb_federated_topic/impl/federation_observer.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <ydb/public/api/protos/ydb_federation_discovery.pb.h>

#include <ydb/public/sdk/cpp/client/ydb_topic/impl/callback_context.h>
#include <ydb/public/sdk/cpp/client/ydb_topic/common/callback_context.h>
#include <ydb/public/sdk/cpp/client/ydb_common_client/impl/client.h>
#include <ydb/public/sdk/cpp/client/ydb_federated_topic/federated_topic.h>

Expand Down
2 changes: 1 addition & 1 deletion ydb/public/sdk/cpp/client/ydb_federated_topic/impl/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ PEERDIR(
ydb/public/sdk/cpp/client/impl/ydb_internal/make_request
ydb/public/sdk/cpp/client/ydb_common_client/impl
ydb/public/sdk/cpp/client/ydb_driver
ydb/public/sdk/cpp/client/ydb_persqueue_public/impl
ydb/public/sdk/cpp/client/ydb_persqueue_public/include
ydb/public/sdk/cpp/client/ydb_topic/impl
ydb/public/sdk/cpp/client/ydb_proto
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
#include <ydb/public/sdk/cpp/client/ydb_persqueue_public/persqueue.h>

#include <ydb/public/sdk/cpp/client/ydb_topic/impl/common.h>
#include <ydb/public/sdk/cpp/client/ydb_persqueue_public/impl/write_session.h>
#include <ydb/public/sdk/cpp/client/ydb_topic/common/executor_impl.h>
#include <ydb/public/sdk/cpp/client/ydb_persqueue_public/include/write_session.h>

#include <ydb/public/sdk/cpp/client/ydb_persqueue_public/ut/ut_utils/ut_utils.h>
#include <ydb/public/sdk/cpp/client/ydb_federated_topic/ut/fds_mock.h>
Expand Down Expand Up @@ -274,7 +275,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
NPersQueue::TWriteSessionSettings writeSettings;
writeSettings.Path(setup->GetTestTopic()).MessageGroupId("src_id");
writeSettings.Codec(NPersQueue::ECodec::RAW);
NPersQueue::IExecutor::TPtr executor = new NPersQueue::TSyncExecutor();
NPersQueue::IExecutor::TPtr executor = new NTopic::TSyncExecutor();
writeSettings.CompressionExecutor(executor);

auto& client = setup->GetPersQueueClient();
Expand Down Expand Up @@ -533,7 +534,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
NPersQueue::TWriteSessionSettings writeSettings;
writeSettings.Path(setup->GetTestTopic()).MessageGroupId("src_id");
writeSettings.Codec(NPersQueue::ECodec::RAW);
NPersQueue::IExecutor::TPtr executor = new NPersQueue::TSyncExecutor();
NPersQueue::IExecutor::TPtr executor = new NTopic::TSyncExecutor();
writeSettings.CompressionExecutor(executor);

auto& client = setup->GetPersQueueClient();
Expand Down Expand Up @@ -639,7 +640,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
NPersQueue::TWriteSessionSettings writeSettings;
writeSettings.Path(setup->GetTestTopic()).MessageGroupId("src_id");
writeSettings.Codec(NPersQueue::ECodec::RAW);
NPersQueue::IExecutor::TPtr executor = new NPersQueue::TSyncExecutor();
NPersQueue::IExecutor::TPtr executor = new NTopic::TSyncExecutor();
writeSettings.CompressionExecutor(executor);

auto& client = setup->GetPersQueueClient();
Expand All @@ -659,7 +660,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
NPersQueue::TWriteSessionSettings writeSettings;
writeSettings.Path(setup->GetTestTopic() + "-mirrored-from-dc2").MessageGroupId("src_id");
writeSettings.Codec(NPersQueue::ECodec::RAW);
NPersQueue::IExecutor::TPtr executor = new NPersQueue::TSyncExecutor();
NPersQueue::IExecutor::TPtr executor = new NTopic::TSyncExecutor();
writeSettings.CompressionExecutor(executor);

auto& client = setup->GetPersQueueClient();
Expand All @@ -679,7 +680,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
NPersQueue::TWriteSessionSettings writeSettings;
writeSettings.Path(setup->GetTestTopic() + "-mirrored-from-dc3").MessageGroupId("src_id");
writeSettings.Codec(NPersQueue::ECodec::RAW);
NPersQueue::IExecutor::TPtr executor = new NPersQueue::TSyncExecutor();
NPersQueue::IExecutor::TPtr executor = new NTopic::TSyncExecutor();
writeSettings.CompressionExecutor(executor);

auto& client = setup->GetPersQueueClient();
Expand Down
2 changes: 1 addition & 1 deletion ydb/public/sdk/cpp/client/ydb_federated_topic/ut/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ PEERDIR(
ydb/public/lib/yson_value
ydb/public/sdk/cpp/client/ydb_driver
ydb/public/sdk/cpp/client/ydb_persqueue_public
ydb/public/sdk/cpp/client/ydb_persqueue_public/impl
ydb/public/sdk/cpp/client/ydb_persqueue_public/include
ydb/public/sdk/cpp/client/ydb_persqueue_public/ut/ut_utils

ydb/public/sdk/cpp/client/ydb_topic/codecs
Expand Down
57 changes: 0 additions & 57 deletions ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/common.cpp
Original file line number Diff line number Diff line change
@@ -1,58 +1 @@
#include "common.h"

#include <util/charset/unidata.h>

namespace NYdb::NPersQueue {

ERetryErrorClass GetRetryErrorClass(EStatus status) {
switch (status) {
case EStatus::SUCCESS: // NoRetry?
case EStatus::INTERNAL_ERROR: // NoRetry?
case EStatus::ABORTED:
case EStatus::UNAVAILABLE:
case EStatus::GENERIC_ERROR: // NoRetry?
case EStatus::BAD_SESSION: // NoRetry?
case EStatus::SESSION_EXPIRED:
case EStatus::CANCELLED:
case EStatus::UNDETERMINED:
case EStatus::SESSION_BUSY:
case EStatus::CLIENT_INTERNAL_ERROR:
case EStatus::CLIENT_CANCELLED:
case EStatus::CLIENT_OUT_OF_RANGE:
return ERetryErrorClass::ShortRetry;

case EStatus::OVERLOADED:
case EStatus::TIMEOUT:
case EStatus::TRANSPORT_UNAVAILABLE:
case EStatus::CLIENT_RESOURCE_EXHAUSTED:
case EStatus::CLIENT_DEADLINE_EXCEEDED:
case EStatus::CLIENT_LIMITS_REACHED:
case EStatus::CLIENT_DISCOVERY_FAILED:
return ERetryErrorClass::LongRetry;

case EStatus::SCHEME_ERROR:
case EStatus::STATUS_UNDEFINED:
case EStatus::BAD_REQUEST:
case EStatus::UNAUTHORIZED:
case EStatus::PRECONDITION_FAILED:
case EStatus::UNSUPPORTED:
case EStatus::ALREADY_EXISTS:
case EStatus::NOT_FOUND:
case EStatus::EXTERNAL_ERROR:
case EStatus::CLIENT_UNAUTHENTICATED:
case EStatus::CLIENT_CALL_UNIMPLEMENTED:
return ERetryErrorClass::NoRetry;
}
}

ERetryErrorClass GetRetryErrorClassV2(EStatus status) {
switch (status) {
case EStatus::SCHEME_ERROR:
return ERetryErrorClass::NoRetry;
default:
return GetRetryErrorClass(status);

}
}

} // namespace NYdb::NPersQueue
9 changes: 1 addition & 8 deletions ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/common.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
#pragma once

#include <ydb/public/sdk/cpp/client/ydb_types/status_codes.h>

#include <library/cpp/retry/retry_policy.h>

namespace NYdb::NPersQueue {
ERetryErrorClass GetRetryErrorClass(EStatus status);
ERetryErrorClass GetRetryErrorClassV2(EStatus status);
}
#include <ydb/public/sdk/cpp/client/ydb_persqueue_public/impl/common.h>
4 changes: 2 additions & 2 deletions ydb/public/sdk/cpp/client/ydb_persqueue_public/impl/aliases.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <ydb/public/sdk/cpp/client/ydb_topic/impl/callback_context.h>
#include <ydb/public/sdk/cpp/client/ydb_topic/common/callback_context.h>
#include <ydb/public/sdk/cpp/client/ydb_topic/codecs/codecs.h>
#include <ydb/public/sdk/cpp/client/ydb_topic/impl/common.h>
#include <ydb/public/sdk/cpp/client/ydb_topic/impl/read_session_impl.ipp>
Expand All @@ -20,7 +20,7 @@ using NTopic::TEnableSelfContext;
using NTopic::TContextOwner;

// common
using NTopic::GetRetryErrorClass;
// using NTopic::GetRetryErrorClass;
using NTopic::ISessionConnectionProcessorFactory;
using NTopic::CreateConnectionProcessorFactory;
using NTopic::TBaseSessionEventsQueue;
Expand Down
58 changes: 58 additions & 0 deletions ydb/public/sdk/cpp/client/ydb_persqueue_public/impl/common.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
#include "common.h"

#include <util/charset/unidata.h>

namespace NYdb::NPersQueue {

ERetryErrorClass GetRetryErrorClass(EStatus status) {
switch (status) {
case EStatus::SUCCESS: // NoRetry?
case EStatus::INTERNAL_ERROR: // NoRetry?
case EStatus::ABORTED:
case EStatus::UNAVAILABLE:
case EStatus::GENERIC_ERROR: // NoRetry?
case EStatus::BAD_SESSION: // NoRetry?
case EStatus::SESSION_EXPIRED:
case EStatus::CANCELLED:
case EStatus::UNDETERMINED:
case EStatus::SESSION_BUSY:
case EStatus::CLIENT_INTERNAL_ERROR:
case EStatus::CLIENT_CANCELLED:
case EStatus::CLIENT_OUT_OF_RANGE:
return ERetryErrorClass::ShortRetry;

case EStatus::OVERLOADED:
case EStatus::TIMEOUT:
case EStatus::TRANSPORT_UNAVAILABLE:
case EStatus::CLIENT_RESOURCE_EXHAUSTED:
case EStatus::CLIENT_DEADLINE_EXCEEDED:
case EStatus::CLIENT_LIMITS_REACHED:
case EStatus::CLIENT_DISCOVERY_FAILED:
return ERetryErrorClass::LongRetry;

case EStatus::SCHEME_ERROR:
case EStatus::STATUS_UNDEFINED:
case EStatus::BAD_REQUEST:
case EStatus::UNAUTHORIZED:
case EStatus::PRECONDITION_FAILED:
case EStatus::UNSUPPORTED:
case EStatus::ALREADY_EXISTS:
case EStatus::NOT_FOUND:
case EStatus::EXTERNAL_ERROR:
case EStatus::CLIENT_UNAUTHENTICATED:
case EStatus::CLIENT_CALL_UNIMPLEMENTED:
return ERetryErrorClass::NoRetry;
}
}

ERetryErrorClass GetRetryErrorClassV2(EStatus status) {
switch (status) {
case EStatus::SCHEME_ERROR:
return ERetryErrorClass::NoRetry;
default:
return GetRetryErrorClass(status);

}
}

} // namespace NYdb::NPersQueue
10 changes: 10 additions & 0 deletions ydb/public/sdk/cpp/client/ydb_persqueue_public/impl/common.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#pragma once

#include <ydb/public/sdk/cpp/client/ydb_types/status_codes.h>

#include <library/cpp/retry/retry_policy.h>

namespace NYdb::NPersQueue {
ERetryErrorClass GetRetryErrorClass(EStatus status);
ERetryErrorClass GetRetryErrorClassV2(EStatus status);
}
Loading

0 comments on commit 3863877

Please sign in to comment.