From 66cd19a8fe37088b718f0432ec159c358ee46857 Mon Sep 17 00:00:00 2001 From: Maxim Deb Natkh Date: Wed, 3 Apr 2024 18:20:17 +0200 Subject: [PATCH] rename filestore service/tablet macros to more coherent ones (#887) --- .../libs/service_kikimr/service_ut.cpp | 2 -- cloud/filestore/libs/storage/api/service.h | 20 ++++++++----------- .../libs/storage/service/service_actor.cpp | 1 - .../libs/storage/service/service_actor.h | 1 - .../service/service_actor_complete.cpp | 1 - .../storage/service/service_actor_forward.cpp | 4 ++-- .../libs/storage/tablet/tablet_actor.cpp | 6 +++--- .../libs/storage/tablet/tablet_actor.h | 2 +- .../tablet_proxy/tablet_proxy_actor.cpp | 4 ++-- .../libs/storage/testlib/service_client.h | 1 - .../libs/storage/testlib/tablet_client.h | 2 +- .../storage/testlib/tablet_proxy_client.h | 2 +- 12 files changed, 18 insertions(+), 28 deletions(-) diff --git a/cloud/filestore/libs/service_kikimr/service_ut.cpp b/cloud/filestore/libs/service_kikimr/service_ut.cpp index 1df3865fdb1..aa9592cc4e6 100644 --- a/cloud/filestore/libs/service_kikimr/service_ut.cpp +++ b/cloud/filestore/libs/service_kikimr/service_ut.cpp @@ -54,7 +54,6 @@ struct TTestServiceActor final // FILESTORE_IMPLEMENT_METHOD FILESTORE_SERVICE(FILESTORE_IMPLEMENT_METHOD, TEvService) - FILESTORE_SERVICE_REQUESTS(FILESTORE_IMPLEMENT_METHOD, TEvService) #undef FILESTORE_IMPLEMENT_METHOD @@ -62,7 +61,6 @@ struct TTestServiceActor final { switch (ev->GetTypeRewrite()) { FILESTORE_SERVICE(FILESTORE_HANDLE_REQUEST, TEvService) - FILESTORE_SERVICE_REQUESTS(FILESTORE_HANDLE_REQUEST, TEvService) } } }; diff --git a/cloud/filestore/libs/storage/api/service.h b/cloud/filestore/libs/storage/api/service.h index 2a7010f1a12..b688260d580 100644 --- a/cloud/filestore/libs/storage/api/service.h +++ b/cloud/filestore/libs/storage/api/service.h @@ -14,10 +14,7 @@ namespace NCloud::NFileStore::NStorage { //////////////////////////////////////////////////////////////////////////////// -#define FILESTORE_SERVICE_REQUESTS(xxx, ...) \ -// FILESTORE_SERVICE_REQUESTS - -#define FILESTORE_SERVICE_REQUESTS_HANDLE(xxx, ...) \ +#define FILESTORE_SERVICE_REQUESTS_FWD(xxx, ...) \ xxx(AddClusterNode, __VA_ARGS__) \ xxx(RemoveClusterNode, __VA_ARGS__) \ xxx(ListClusterNodes, __VA_ARGS__) \ @@ -56,17 +53,17 @@ namespace NCloud::NFileStore::NStorage { xxx(TestLock, __VA_ARGS__) \ \ xxx(AllocateData, __VA_ARGS__) \ -// FILESTORE_SERVICE_REQUESTS_HANDLE +// FILESTORE_SERVICE_REQUESTS_FWD -#define FILESTORE_SERVICE_REQUESTS_NO_HANDLE(xxx, ...) \ +#define FILESTORE_SERVICE_REQUESTS_HANDLE(xxx, ...) \ xxx(WriteData, __VA_ARGS__) \ xxx(ReadData, __VA_ARGS__) \ -// FILESTORE_SERVICE_REQUESTS_NO_HANDLE +// FILESTORE_SERVICE_REQUESTS_HANDLE -#define FILESTORE_SERVICE_REQUESTS_FWD(xxx, ...) \ - FILESTORE_SERVICE_REQUESTS_NO_HANDLE(xxx, __VA_ARGS__) \ - FILESTORE_SERVICE_REQUESTS_HANDLE(xxx, __VA_ARGS__) \ -// FILESTORE_SERVICE_REQUESTS_FWD +#define FILESTORE_SERVICE_REQUESTS(xxx, ...) \ + FILESTORE_SERVICE_REQUESTS_HANDLE(xxx, __VA_ARGS__) \ + FILESTORE_SERVICE_REQUESTS_FWD(xxx, __VA_ARGS__) \ +// FILESTORE_SERVICE_REQUESTS //////////////////////////////////////////////////////////////////////////////// @@ -270,7 +267,6 @@ struct TEvService "EvEnd expected to be < TFileStoreEvents::SERVICE_END"); FILESTORE_SERVICE(FILESTORE_DECLARE_PROTO_EVENTS, NProto) - FILESTORE_SERVICE_REQUESTS(FILESTORE_DECLARE_EVENTS) using TEvRegisterLocalFileStoreRequest = TRequestEvent< TRegisterLocalFileStore, diff --git a/cloud/filestore/libs/storage/service/service_actor.cpp b/cloud/filestore/libs/storage/service/service_actor.cpp index 4140eccb625..7651896332c 100644 --- a/cloud/filestore/libs/storage/service/service_actor.cpp +++ b/cloud/filestore/libs/storage/service/service_actor.cpp @@ -126,7 +126,6 @@ bool TStorageServiceActor::HandleRequests(STFUNC_SIG) FILESTORE_HANDLE_RESPONSE(name, ns) \ FILESTORE_SERVICE(FILESTORE_HANDLE_REQUEST_RESPONSE, TEvService) - FILESTORE_SERVICE_REQUESTS(FILESTORE_HANDLE_REQUEST_RESPONSE, TEvService) FILESTORE_SERVICE_REQUESTS_PRIVATE(FILESTORE_HANDLE_REQUEST_RESPONSE, TEvServicePrivate) #undef FILESTORE_HANDLE_REQUEST_RESPONSE diff --git a/cloud/filestore/libs/storage/service/service_actor.h b/cloud/filestore/libs/storage/service/service_actor.h index 844753e73e1..edfd2ffa21b 100644 --- a/cloud/filestore/libs/storage/service/service_actor.h +++ b/cloud/filestore/libs/storage/service/service_actor.h @@ -95,7 +95,6 @@ class TStorageServiceActor final const NActors::TActorContext& ctx); \ FILESTORE_SERVICE(FILESTORE_DECLARE_REQUEST_RESPONSE, TEvService) - FILESTORE_SERVICE_REQUESTS(FILESTORE_DECLARE_REQUEST_RESPONSE, TEvService) FILESTORE_SERVICE_REQUESTS_PRIVATE(FILESTORE_DECLARE_REQUEST_RESPONSE, TEvServicePrivate) #undef FILESTORE_DECLARE_REQUEST_RESPONSE diff --git a/cloud/filestore/libs/storage/service/service_actor_complete.cpp b/cloud/filestore/libs/storage/service/service_actor_complete.cpp index e701777d1bf..8f738e19364 100644 --- a/cloud/filestore/libs/storage/service/service_actor_complete.cpp +++ b/cloud/filestore/libs/storage/service/service_actor_complete.cpp @@ -72,7 +72,6 @@ void TStorageServiceActor::CompleteRequest( } FILESTORE_SERVICE(FILESTORE_IMPLEMENT_RESPONSE, TEvService) - FILESTORE_SERVICE_REQUESTS(FILESTORE_IMPLEMENT_RESPONSE, TEvService) FILESTORE_SERVICE_REQUESTS_PRIVATE(FILESTORE_IMPLEMENT_RESPONSE, TEvServicePrivate) #undef FILESTORE_IMPLEMENT_RESPONSE diff --git a/cloud/filestore/libs/storage/service/service_actor_forward.cpp b/cloud/filestore/libs/storage/service/service_actor_forward.cpp index 1b6c76804cd..127a7932c6c 100644 --- a/cloud/filestore/libs/storage/service/service_actor_forward.cpp +++ b/cloud/filestore/libs/storage/service/service_actor_forward.cpp @@ -72,7 +72,7 @@ void TStorageServiceActor::ForwardRequest( ForwardRequest(ctx, ev); \ } \ - FILESTORE_SERVICE_REQUESTS_HANDLE(FILESTORE_FORWARD_REQUEST, TEvService) + FILESTORE_SERVICE_REQUESTS_FWD(FILESTORE_FORWARD_REQUEST, TEvService) #undef FILESTORE_FORWARD_REQUEST @@ -80,7 +80,7 @@ void TStorageServiceActor::ForwardRequest( template void TStorageServiceActor::ForwardRequest( \ const TActorContext&, const ns::TEv##name##Request::TPtr&); \ - FILESTORE_SERVICE_REQUESTS_NO_HANDLE(FILESTORE_DEFINE_NO_HANDLE_FORWARD, TEvService) + FILESTORE_SERVICE_REQUESTS_HANDLE(FILESTORE_DEFINE_NO_HANDLE_FORWARD, TEvService) #undef FILESTORE_DEFINE_NO_HANDLE_FORWARD diff --git a/cloud/filestore/libs/storage/tablet/tablet_actor.cpp b/cloud/filestore/libs/storage/tablet/tablet_actor.cpp index 2030953ac24..fc46f5c971a 100644 --- a/cloud/filestore/libs/storage/tablet/tablet_actor.cpp +++ b/cloud/filestore/libs/storage/tablet/tablet_actor.cpp @@ -478,7 +478,7 @@ void TIndexTabletActor::HandleDescribeSessions( bool TIndexTabletActor::HandleRequests(STFUNC_SIG) { switch (ev->GetTypeRewrite()) { - FILESTORE_SERVICE_REQUESTS_FWD(FILESTORE_HANDLE_REQUEST, TEvService) + FILESTORE_SERVICE_REQUESTS(FILESTORE_HANDLE_REQUEST, TEvService) FILESTORE_TABLET_REQUESTS(FILESTORE_HANDLE_REQUEST, TEvIndexTablet) FILESTORE_TABLET_REQUESTS_PRIVATE(FILESTORE_HANDLE_REQUEST, TEvIndexTabletPrivate) @@ -517,7 +517,7 @@ bool TIndexTabletActor::IgnoreCompletions(STFUNC_SIG) bool TIndexTabletActor::RejectRequests(STFUNC_SIG) { switch (ev->GetTypeRewrite()) { - FILESTORE_SERVICE_REQUESTS_FWD(FILESTORE_REJECT_REQUEST, TEvService) + FILESTORE_SERVICE_REQUESTS(FILESTORE_REJECT_REQUEST, TEvService) FILESTORE_TABLET_REQUESTS(FILESTORE_REJECT_REQUEST, TEvIndexTablet) FILESTORE_TABLET_REQUESTS_PRIVATE(FILESTORE_REJECT_REQUEST, TEvIndexTabletPrivate) @@ -532,7 +532,7 @@ bool TIndexTabletActor::RejectRequests(STFUNC_SIG) bool TIndexTabletActor::RejectRequestsByBrokenTablet(STFUNC_SIG) { switch (ev->GetTypeRewrite()) { - FILESTORE_SERVICE_REQUESTS_FWD(FILESTORE_REJECT_REQUEST_BY_BROKEN_TABLET, TEvService) + FILESTORE_SERVICE_REQUESTS(FILESTORE_REJECT_REQUEST_BY_BROKEN_TABLET, TEvService) FILESTORE_TABLET_REQUESTS(FILESTORE_REJECT_REQUEST_BY_BROKEN_TABLET, TEvIndexTablet) FILESTORE_TABLET_REQUESTS_PRIVATE(FILESTORE_REJECT_REQUEST_BY_BROKEN_TABLET, TEvIndexTabletPrivate) diff --git a/cloud/filestore/libs/storage/tablet/tablet_actor.h b/cloud/filestore/libs/storage/tablet/tablet_actor.h index 8dac4988e0c..b4df36fa379 100644 --- a/cloud/filestore/libs/storage/tablet/tablet_actor.h +++ b/cloud/filestore/libs/storage/tablet/tablet_actor.h @@ -429,7 +429,7 @@ class TIndexTabletActor final bool IgnoreCompletions(STFUNC_SIG); FILESTORE_TABLET_REQUESTS(FILESTORE_IMPLEMENT_REQUEST, TEvIndexTablet) - FILESTORE_SERVICE_REQUESTS_FWD(FILESTORE_IMPLEMENT_REQUEST, TEvService) + FILESTORE_SERVICE_REQUESTS(FILESTORE_IMPLEMENT_REQUEST, TEvService) FILESTORE_TABLET_REQUESTS_PRIVATE_SYNC(FILESTORE_IMPLEMENT_REQUEST, TEvIndexTabletPrivate) FILESTORE_TABLET_REQUESTS_PRIVATE_ASYNC(FILESTORE_IMPLEMENT_ASYNC_REQUEST, TEvIndexTabletPrivate) diff --git a/cloud/filestore/libs/storage/tablet_proxy/tablet_proxy_actor.cpp b/cloud/filestore/libs/storage/tablet_proxy/tablet_proxy_actor.cpp index ab9435b6e95..d88bda137b7 100644 --- a/cloud/filestore/libs/storage/tablet_proxy/tablet_proxy_actor.cpp +++ b/cloud/filestore/libs/storage/tablet_proxy/tablet_proxy_actor.cpp @@ -487,7 +487,7 @@ bool TIndexTabletProxyActor::HandleRequests(STFUNC_SIG) // FILESTORE_HANDLE_METHOD switch (ev->GetTypeRewrite()) { - FILESTORE_SERVICE_REQUESTS_FWD(FILESTORE_HANDLE_METHOD, TEvService) + FILESTORE_SERVICE_REQUESTS(FILESTORE_HANDLE_METHOD, TEvService) FILESTORE_TABLET_REQUESTS(FILESTORE_HANDLE_METHOD, TEvIndexTablet) default: @@ -520,7 +520,7 @@ bool TIndexTabletProxyActor::LogLateMessage(STFUNC_SIG) // FILESTORE_HANDLE_METHOD switch (ev->GetTypeRewrite()) { - FILESTORE_SERVICE_REQUESTS_FWD(FILESTORE_HANDLE_METHOD, TEvService) + FILESTORE_SERVICE_REQUESTS(FILESTORE_HANDLE_METHOD, TEvService) FILESTORE_TABLET_REQUESTS(FILESTORE_HANDLE_METHOD, TEvIndexTablet) default: diff --git a/cloud/filestore/libs/storage/testlib/service_client.h b/cloud/filestore/libs/storage/testlib/service_client.h index 9c1c37a02f8..6ae9c909e47 100644 --- a/cloud/filestore/libs/storage/testlib/service_client.h +++ b/cloud/filestore/libs/storage/testlib/service_client.h @@ -360,7 +360,6 @@ class TServiceClient // FILESTORE_DECLARE_METHOD FILESTORE_SERVICE(FILESTORE_DECLARE_METHOD, TEvService) - FILESTORE_SERVICE_REQUESTS(FILESTORE_DECLARE_METHOD, TEvService) #undef FILESTORE_DECLARE_METHOD diff --git a/cloud/filestore/libs/storage/testlib/tablet_client.h b/cloud/filestore/libs/storage/testlib/tablet_client.h index bcc61ea0d13..4b8395c364a 100644 --- a/cloud/filestore/libs/storage/testlib/tablet_client.h +++ b/cloud/filestore/libs/storage/testlib/tablet_client.h @@ -799,7 +799,7 @@ class TIndexTabletClient } \ // FILESTORE_DECLARE_METHOD - FILESTORE_SERVICE_REQUESTS_FWD(FILESTORE_DECLARE_METHOD, TEvService) + FILESTORE_SERVICE_REQUESTS(FILESTORE_DECLARE_METHOD, TEvService) FILESTORE_TABLET_REQUESTS(FILESTORE_DECLARE_METHOD, TEvIndexTablet) FILESTORE_TABLET_REQUESTS_PRIVATE(FILESTORE_DECLARE_METHOD, TEvIndexTabletPrivate) diff --git a/cloud/filestore/libs/storage/testlib/tablet_proxy_client.h b/cloud/filestore/libs/storage/testlib/tablet_proxy_client.h index e34462a9dd6..9919c314194 100644 --- a/cloud/filestore/libs/storage/testlib/tablet_proxy_client.h +++ b/cloud/filestore/libs/storage/testlib/tablet_proxy_client.h @@ -93,7 +93,7 @@ class TIndexTabletProxyClient } \ // FILESTORE_DECLARE_METHOD - FILESTORE_SERVICE_REQUESTS_FWD(FILESTORE_DECLARE_METHOD, TEvService) + FILESTORE_SERVICE_REQUESTS(FILESTORE_DECLARE_METHOD, TEvService) FILESTORE_TABLET_REQUESTS(FILESTORE_DECLARE_METHOD, TEvIndexTablet) #undef FILESTORE_DECLARE_METHOD