aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorilnaz <ilnaz@ydb.tech>2023-02-14 15:59:08 +0300
committerilnaz <ilnaz@ydb.tech>2023-02-14 15:59:08 +0300
commit32778d66b1d27930f41bf2657a78b8ea668f0f10 (patch)
tree374d2ab38026cad079dc03bd442e23a727b8a07c
parent76dc940cbab459dfeccf6a8138b2cd99d713a5ec (diff)
downloadydb-32778d66b1d27930f41bf2657a78b8ea668f0f10.tar.gz
Discoverer -> TargetDiscoverer
-rw-r--r--ydb/core/protos/services.proto2
-rw-r--r--ydb/core/tx/replication/controller/CMakeLists.darwin.txt2
-rw-r--r--ydb/core/tx/replication/controller/CMakeLists.linux-aarch64.txt2
-rw-r--r--ydb/core/tx/replication/controller/CMakeLists.linux.txt2
-rw-r--r--ydb/core/tx/replication/controller/replication.cpp4
-rw-r--r--ydb/core/tx/replication/controller/target_discoverer.cpp (renamed from ydb/core/tx/replication/controller/discoverer.cpp)16
-rw-r--r--ydb/core/tx/replication/controller/target_discoverer.h (renamed from ydb/core/tx/replication/controller/discoverer.h)2
7 files changed, 15 insertions, 15 deletions
diff --git a/ydb/core/protos/services.proto b/ydb/core/protos/services.proto
index f868ce8bdc..029eac76d8 100644
--- a/ydb/core/protos/services.proto
+++ b/ydb/core/protos/services.proto
@@ -919,7 +919,7 @@ message TActivity {
BS_DEFRAG_SCHEDULER = 556;
BS_DEFRAG_PLANNER = 557;
REPLICATION_CONTROLLER_ACTOR = 558;
- REPLICATION_CONTROLLER_DISCOVERER = 559;
+ REPLICATION_CONTROLLER_TARGET_DISCOVERER = 559;
REPLICATION_CONTROLLER_STREAM_CREATOR = 561;
YQ_TEST_CONNECTION_ACTOR = 560;
REPLICATION_CONTROLLER_DST_CREATOR = 562;
diff --git a/ydb/core/tx/replication/controller/CMakeLists.darwin.txt b/ydb/core/tx/replication/controller/CMakeLists.darwin.txt
index eb802ebe22..15f00b6b4b 100644
--- a/ydb/core/tx/replication/controller/CMakeLists.darwin.txt
+++ b/ydb/core/tx/replication/controller/CMakeLists.darwin.txt
@@ -25,7 +25,6 @@ target_link_libraries(tx-replication-controller PUBLIC
)
target_sources(tx-replication-controller PRIVATE
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/controller.cpp
- ${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/discoverer.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/dst_creator.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/dst_remover.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/logging.cpp
@@ -35,6 +34,7 @@ target_sources(tx-replication-controller PRIVATE
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/stream_remover.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/sys_params.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/target_base.cpp
+ ${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/target_discoverer.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/target_table.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/target_with_stream.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/tx_assign_stream_name.cpp
diff --git a/ydb/core/tx/replication/controller/CMakeLists.linux-aarch64.txt b/ydb/core/tx/replication/controller/CMakeLists.linux-aarch64.txt
index cd653db9c3..a47d27c926 100644
--- a/ydb/core/tx/replication/controller/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/tx/replication/controller/CMakeLists.linux-aarch64.txt
@@ -26,7 +26,6 @@ target_link_libraries(tx-replication-controller PUBLIC
)
target_sources(tx-replication-controller PRIVATE
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/controller.cpp
- ${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/discoverer.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/dst_creator.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/dst_remover.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/logging.cpp
@@ -36,6 +35,7 @@ target_sources(tx-replication-controller PRIVATE
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/stream_remover.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/sys_params.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/target_base.cpp
+ ${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/target_discoverer.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/target_table.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/target_with_stream.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/tx_assign_stream_name.cpp
diff --git a/ydb/core/tx/replication/controller/CMakeLists.linux.txt b/ydb/core/tx/replication/controller/CMakeLists.linux.txt
index cd653db9c3..a47d27c926 100644
--- a/ydb/core/tx/replication/controller/CMakeLists.linux.txt
+++ b/ydb/core/tx/replication/controller/CMakeLists.linux.txt
@@ -26,7 +26,6 @@ target_link_libraries(tx-replication-controller PUBLIC
)
target_sources(tx-replication-controller PRIVATE
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/controller.cpp
- ${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/discoverer.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/dst_creator.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/dst_remover.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/logging.cpp
@@ -36,6 +35,7 @@ target_sources(tx-replication-controller PRIVATE
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/stream_remover.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/sys_params.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/target_base.cpp
+ ${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/target_discoverer.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/target_table.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/target_with_stream.cpp
${CMAKE_SOURCE_DIR}/ydb/core/tx/replication/controller/tx_assign_stream_name.cpp
diff --git a/ydb/core/tx/replication/controller/replication.cpp b/ydb/core/tx/replication/controller/replication.cpp
index 467ad27b22..673dd268f2 100644
--- a/ydb/core/tx/replication/controller/replication.cpp
+++ b/ydb/core/tx/replication/controller/replication.cpp
@@ -1,6 +1,6 @@
-#include "discoverer.h"
#include "private_events.h"
#include "replication.h"
+#include "target_discoverer.h"
#include "target_table.h"
#include "util.h"
@@ -37,7 +37,7 @@ class TReplication::TImpl {
paths.emplace_back(target.GetSrcPath(), target.GetDstPath());
}
- Discoverer = ctx.Register(CreateDiscoverer(ctx.SelfID, ReplicationId, YdbProxy, std::move(paths)));
+ Discoverer = ctx.Register(CreateTargetDiscoverer(ctx.SelfID, ReplicationId, YdbProxy, std::move(paths)));
break;
}
diff --git a/ydb/core/tx/replication/controller/discoverer.cpp b/ydb/core/tx/replication/controller/target_discoverer.cpp
index a8dcdc6091..ea433392e6 100644
--- a/ydb/core/tx/replication/controller/discoverer.cpp
+++ b/ydb/core/tx/replication/controller/target_discoverer.cpp
@@ -1,6 +1,6 @@
-#include "discoverer.h"
#include "logging.h"
#include "private_events.h"
+#include "target_discoverer.h"
#include "util.h"
#include <library/cpp/actors/core/actor_bootstrapped.h>
@@ -12,7 +12,7 @@
namespace NKikimr::NReplication::NController {
-class TDiscoverer: public TActorBootstrapped<TDiscoverer> {
+class TTargetDiscoverer: public TActorBootstrapped<TTargetDiscoverer> {
void DescribePath(ui32 idx) {
Y_VERIFY(idx < Paths.size());
Send(YdbProxy, new TEvYdbProxy::TEvDescribePathRequest(Paths.at(idx).first, {}), 0, idx);
@@ -97,15 +97,15 @@ class TDiscoverer: public TActorBootstrapped<TDiscoverer> {
public:
static constexpr NKikimrServices::TActivity::EType ActorActivityType() {
- return NKikimrServices::TActivity::REPLICATION_CONTROLLER_DISCOVERER;
+ return NKikimrServices::TActivity::REPLICATION_CONTROLLER_TARGET_DISCOVERER;
}
- explicit TDiscoverer(const TActorId& parent, ui64 rid, const TActorId& proxy, TVector<std::pair<TString, TString>>&& paths)
+ explicit TTargetDiscoverer(const TActorId& parent, ui64 rid, const TActorId& proxy, TVector<std::pair<TString, TString>>&& paths)
: Parent(parent)
, ReplicationId(rid)
, YdbProxy(proxy)
, Paths(std::move(paths))
- , LogPrefix("Discoverer", ReplicationId)
+ , LogPrefix("TargetDiscoverer", ReplicationId)
{
}
@@ -137,12 +137,12 @@ private:
TVector<TEvPrivate::TEvDiscoveryResult::TAddEntry> ToAdd;
TVector<TEvPrivate::TEvDiscoveryResult::TFailedEntry> Failed;
-}; // TDiscoverer
+}; // TTargetDiscoverer
-IActor* CreateDiscoverer(const TActorId& parent, ui64 rid, const TActorId& proxy,
+IActor* CreateTargetDiscoverer(const TActorId& parent, ui64 rid, const TActorId& proxy,
TVector<std::pair<TString, TString>>&& specificPaths)
{
- return new TDiscoverer(parent, rid, proxy, std::move(specificPaths));
+ return new TTargetDiscoverer(parent, rid, proxy, std::move(specificPaths));
}
}
diff --git a/ydb/core/tx/replication/controller/discoverer.h b/ydb/core/tx/replication/controller/target_discoverer.h
index 60bcec0b30..40c4cb1406 100644
--- a/ydb/core/tx/replication/controller/discoverer.h
+++ b/ydb/core/tx/replication/controller/target_discoverer.h
@@ -6,7 +6,7 @@
namespace NKikimr::NReplication::NController {
-IActor* CreateDiscoverer(const TActorId& parent, ui64 rid, const TActorId& proxy,
+IActor* CreateTargetDiscoverer(const TActorId& parent, ui64 rid, const TActorId& proxy,
TVector<std::pair<TString, TString>>&& specificPaths);
}