rename filestore service/tablet macros to more coherent ones (#887)

ydb-platform · Apr 3, 2024 · 66cd19a · 66cd19a
1 parent 57c2a87
commit 66cd19a
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 28 deletions.
diff --git a/cloud/filestore/libs/service_kikimr/service_ut.cpp b/cloud/filestore/libs/service_kikimr/service_ut.cpp
@@ -54,15 +54,13 @@ struct TTestServiceActor final
 // FILESTORE_IMPLEMENT_METHOD
 
     FILESTORE_SERVICE(FILESTORE_IMPLEMENT_METHOD, TEvService)
-    FILESTORE_SERVICE_REQUESTS(FILESTORE_IMPLEMENT_METHOD, TEvService)
 
 #undef FILESTORE_IMPLEMENT_METHOD
 
     STFUNC(StateWork)
     {
         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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -72,15 +72,15 @@ void TStorageServiceActor::ForwardRequest(
         ForwardRequest<ns::T##name##Method>(ctx, ev);                          \
     }                                                                          \
 
-    FILESTORE_SERVICE_REQUESTS_HANDLE(FILESTORE_FORWARD_REQUEST, TEvService)
+    FILESTORE_SERVICE_REQUESTS_FWD(FILESTORE_FORWARD_REQUEST, TEvService)
 
 #undef FILESTORE_FORWARD_REQUEST
 
 #define FILESTORE_DEFINE_NO_HANDLE_FORWARD(name, ns)                           \
 template void TStorageServiceActor::ForwardRequest<ns::T##name##Method>(       \
     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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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