refactor persqueue sdk (#3146)

Author: ildar-khisambeev

ydb/core/http_proxy/http_req.cpp

@@ -38,7 +38,7 @@
 #include <ydb/services/persqueue_v1/actors/persqueue_utils.h>
 
 #include <ydb/public/sdk/cpp/client/ydb_datastreams/datastreams.h>
-#include <ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/common.h>
+#include <ydb/public/sdk/cpp/client/ydb_topic/impl/common.h>
 
 #include <ydb/services/datastreams/datastreams_proxy.h>
 #include <ydb/services/datastreams/next_token.h>
@@ -507,7 +507,7 @@ namespace NKikimr::NHttpProxy {
                     ReplyToHttpContext(ctx);
                 } else {
                     auto retryClass =
-                        NYdb::NPersQueue::GetRetryErrorClass(ev->Get()->Status->GetStatus());
+                        NYdb::NTopic::GetRetryErrorClass(ev->Get()->Status->GetStatus());
 
                     switch (retryClass) {
                     case ERetryErrorClass::ShortRetry:

ydb/core/http_proxy/ya.make

@@ -38,7 +38,7 @@ PEERDIR(
     ydb/library/naming_conventions
     ydb/public/sdk/cpp/client/ydb_datastreams
     ydb/public/sdk/cpp/client/ydb_persqueue_core
-    ydb/public/sdk/cpp/client/ydb_persqueue_public/codecs
+    ydb/public/sdk/cpp/client/ydb_topic/codecs
     ydb/public/sdk/cpp/client/iam_private
     ydb/services/datastreams
     ydb/services/persqueue_v1/actors

ydb/core/persqueue/ut/mirrorer_ut.cpp

@@ -1,7 +1,7 @@
 #include "actor_persqueue_client_iface.h"
 
-#include <ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/test_server.h>
-#include <ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/data_plane_helpers.h>
+#include <ydb/public/sdk/cpp/client/ydb_persqueue_public/ut/ut_utils/test_server.h>
+#include <ydb/public/sdk/cpp/client/ydb_persqueue_public/ut/ut_utils/data_plane_helpers.h>
 
 
 #include <library/cpp/testing/unittest/registar.h>

ydb/core/persqueue/ut/ya.make

@@ -20,6 +20,7 @@ PEERDIR(
     ydb/core/persqueue/ut/common
     ydb/core/testlib/default
     ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils
+    ydb/public/sdk/cpp/client/ydb_persqueue_public/ut/ut_utils
     ydb/public/sdk/cpp/client/ydb_topic/ut/ut_utils
 
     ydb/core/tx/schemeshard/ut_helpers

ydb/core/persqueue/ya.make

@@ -67,7 +67,7 @@ PEERDIR(
     ydb/library/persqueue/counter_time_keeper
     ydb/library/persqueue/topic_parser
     ydb/public/lib/base
-    ydb/public/sdk/cpp/client/ydb_persqueue_core
+    ydb/public/sdk/cpp/client/ydb_persqueue_public
 )
 
 END()

ydb/core/testlib/ya.make

@@ -89,7 +89,7 @@ PEERDIR(
     ydb/public/lib/base
     ydb/public/lib/deprecated/kicli
     ydb/public/sdk/cpp/client/ydb_driver
-    ydb/public/sdk/cpp/client/ydb_persqueue_public/codecs
+    ydb/public/sdk/cpp/client/ydb_topic/codecs
     ydb/public/sdk/cpp/client/ydb_query
     ydb/public/sdk/cpp/client/ydb_table
     ydb/services/auth

ydb/public/sdk/cpp/client/ydb_federated_topic/impl/federated_read_session.cpp

@@ -1,6 +1,6 @@
 #include "federated_read_session.h"
 
-#include <ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/log_lazy.h>
+#include <ydb/public/sdk/cpp/client/ydb_topic/impl/log_lazy.h>
 #include <ydb/public/sdk/cpp/client/ydb_topic/impl/topic_impl.h>
 
 #define INCLUDE_YDB_INTERNAL_H

ydb/public/sdk/cpp/client/ydb_federated_topic/impl/federated_read_session.h

@@ -2,8 +2,8 @@
 
 #include <ydb/public/sdk/cpp/client/ydb_federated_topic/impl/federated_topic_impl.h>
 
-#include <ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/callback_context.h>
-#include <ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/read_session.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/impl/read_session.h>
 
@@ -118,7 +118,7 @@ class TEventFederator {
     std::shared_ptr<TFederatedDbState> FederationState;
 };
 
-class TFederatedReadSessionImpl : public NPersQueue::TEnableSelfContext<TFederatedReadSessionImpl> {
+class TFederatedReadSessionImpl : public NTopic::TEnableSelfContext<TFederatedReadSessionImpl> {
     friend class TFederatedTopicClient::TImpl;
     friend class TFederatedReadSession;
 
@@ -199,7 +199,7 @@ class TFederatedReadSessionImpl : public NPersQueue::TEnableSelfContext<TFederat
 
 
 class TFederatedReadSession : public IFederatedReadSession,
-                              public NPersQueue::TContextOwner<TFederatedReadSessionImpl> {
+                              public NTopic::TContextOwner<TFederatedReadSessionImpl> {
     friend class TFederatedTopicClient::TImpl;
 
 public:

ydb/public/sdk/cpp/client/ydb_federated_topic/impl/federated_read_session_event.cpp

@@ -1,5 +1,5 @@
 #include <ydb/public/sdk/cpp/client/ydb_federated_topic/federated_topic.h>
-#include <ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/read_session.h>
+#include <ydb/public/sdk/cpp/client/ydb_topic/impl/read_session.h>
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -143,7 +143,7 @@ TReadSessionEvent::TDataReceivedEvent::TDataReceivedEvent(NTopic::TReadSessionEv
 
 void TReadSessionEvent::TDataReceivedEvent::Commit() {
     for (auto [from, to] : OffsetRanges) {
-        static_cast<NPersQueue::TPartitionStreamImpl<false>*>(PartitionSession.Get())->Commit(from, to);
+        static_cast<NTopic::TPartitionStreamImpl<false>*>(PartitionSession.Get())->Commit(from, to);
     }
 }
 

ydb/public/sdk/cpp/client/ydb_federated_topic/impl/federated_topic_impl.cpp

@@ -3,8 +3,8 @@
 #include "federated_read_session.h"
 #include "federated_write_session.h"
 
-#include <ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/read_session.h>
-#include <ydb/public/sdk/cpp/client/ydb_persqueue_core/impl/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>
 
 namespace NYdb::NFederatedTopic {