[refactoring] Do not include grpc_request_proxy.h in each cpp (#10451)

dcherednik · web-flow · commit b9bc524c9f9b · 2024-10-15T16:13:00.000+02:00
diff --git a/ydb/core/grpc_services/base/base.h b/ydb/core/grpc_services/base/base.h
@@ -48,12 +48,15 @@ namespace NRpcService {
     };
 }
 
+struct TAppData;
+
 namespace NGRpcService {
 
 using TYdbIssueMessageType = Ydb::Issue::IssueMessage;
 
 std::pair<TString, TString> SplitPath(const TMaybe<TString>& database, const TString& path);
 std::pair<TString, TString> SplitPath(const TString& path);
+TString DatabaseFromDomain(const TAppData* appdata);
 
 inline TActorId CreateGRpcRequestProxyId(int n = 0) {
     if (n == 0) {
diff --git a/ydb/core/grpc_services/grpc_request_proxy.h b/ydb/core/grpc_services/grpc_request_proxy.h
@@ -23,7 +23,6 @@ struct TAppData;
 
 namespace NGRpcService {
 
-TString DatabaseFromDomain(const TAppData* appdata);
 IActor* CreateGRpcRequestProxy(const NKikimrConfig::TAppConfig& appConfig, TIntrusivePtr<NJaegerTracing::TSamplingThrottlingControl> tracingControl);
 IActor* CreateGRpcRequestProxySimple(const NKikimrConfig::TAppConfig& appConfig);
 
diff --git a/ydb/core/grpc_services/rpc_alter_coordination_node.cpp b/ydb/core/grpc_services/rpc_alter_coordination_node.cpp
@@ -1,6 +1,8 @@
 #include "service_coordination.h"
 #include <ydb/core/grpc_services/base/base.h>
 
+#include <ydb/public/api/protos/ydb_coordination.pb.h>
+
 #include "rpc_scheme_base.h"
 #include "rpc_common/rpc_common.h"
 
diff --git a/ydb/core/grpc_services/rpc_calls.h b/ydb/core/grpc_services/rpc_calls.h
@@ -12,7 +12,6 @@
 #include <ydb/public/api/protos/ydb_discovery.pb.h>
 #include <ydb/public/api/protos/ydb_monitoring.pb.h>
 #include <ydb/public/api/protos/ydb_status_codes.pb.h>
-#include <ydb/public/api/protos/ydb_table.pb.h>
 #include <ydb/public/api/protos/draft/ydb_object_storage.pb.h>
 #include <ydb/public/api/protos/ydb_persqueue_cluster_discovery.pb.h>
 #include <ydb/public/api/protos/ydb_persqueue_v1.pb.h>
diff --git a/ydb/core/grpc_services/rpc_common/rpc_common.h b/ydb/core/grpc_services/rpc_common/rpc_common.h
@@ -4,7 +4,7 @@
 #include <ydb/core/base/path.h>
 #include <ydb/core/tx/tx_proxy/proxy.h>
 #include <ydb/core/util/proto_duration.h>
-#include "ydb/core/grpc_services/grpc_request_proxy.h"
+#include "ydb/core/grpc_services/base/base.h"
 
 namespace NKikimr {
 namespace NGRpcService {
diff --git a/ydb/core/grpc_services/rpc_create_coordination_node.cpp b/ydb/core/grpc_services/rpc_create_coordination_node.cpp
@@ -4,6 +4,8 @@
 #include "rpc_scheme_base.h"
 #include "rpc_common/rpc_common.h"
 
+#include <ydb/public/api/protos/ydb_coordination.pb.h>
+
 namespace NKikimr {
 namespace NGRpcService {
 
diff --git a/ydb/core/grpc_services/rpc_deferrable.h b/ydb/core/grpc_services/rpc_deferrable.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "defs.h"
-#include "grpc_request_proxy.h"
 #include "cancelation/cancelation.h"
 #include "cancelation/cancelation_event.h"
 #include "rpc_common/rpc_common.h"
diff --git a/ydb/core/grpc_services/rpc_describe_coordination_node.cpp b/ydb/core/grpc_services/rpc_describe_coordination_node.cpp
@@ -1,6 +1,8 @@
 #include "service_coordination.h"
 #include <ydb/core/grpc_services/base/base.h>
 
+#include <ydb/public/api/protos/ydb_coordination.pb.h>
+
 #include "rpc_scheme_base.h"
 #include "rpc_common/rpc_common.h"
 
diff --git a/ydb/core/grpc_services/rpc_drop_coordination_node.cpp b/ydb/core/grpc_services/rpc_drop_coordination_node.cpp
@@ -1,6 +1,8 @@
 #include "service_coordination.h"
 #include <ydb/core/grpc_services/base/base.h>
 
+#include <ydb/public/api/protos/ydb_coordination.pb.h>
+
 #include "rpc_scheme_base.h"
 #include "rpc_common/rpc_common.h"
 
diff --git a/ydb/core/grpc_services/rpc_kh_snapshots.cpp b/ydb/core/grpc_services/rpc_kh_snapshots.cpp
@@ -10,6 +10,7 @@
 #include <ydb/core/actorlib_impl/long_timer.h>
 
 #include <ydb/library/actors/core/hfunc.h>
+#include <ydb/public/api/protos/ydb_clickhouse_internal.pb.h>
 
 #include <util/string/vector.h>
 #include <util/generic/hash.h>
diff --git a/ydb/core/grpc_services/rpc_request_base.h b/ydb/core/grpc_services/rpc_request_base.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "grpc_request_proxy.h"
+#include "grpc_request_proxy_handle_methods.h"
 #include <ydb/core/grpc_services/base/base.h>
 #include <ydb/core/base/appdata.h>
 #include <ydb/library/ydb_issue/issue_helpers.h>
diff --git a/ydb/core/grpc_services/ydb_over_fq/create_session.cpp b/ydb/core/grpc_services/ydb_over_fq/create_session.cpp
@@ -3,6 +3,8 @@
 #include <ydb/core/grpc_services/base/base.h>
 #include <ydb/core/grpc_services/rpc_deferrable.h>
 
+#include <ydb/public/api/protos/ydb_table.pb.h>
+
 namespace NKikimr::NGRpcService::NYdbOverFq {
 
 class TCreateSessionRPC : public TRpcOperationRequestActor<
@@ -75,4 +77,4 @@ std::function<void(std::unique_ptr<IRequestOpCtx>, const IFacilityProvider&)> Ge
     };
 }
 
-} // namespace NKikimr::NGRpcService::NYdbOverFq
+} // namespace NKikimr::NGRpcService::NYdbOverFq
diff --git a/ydb/core/grpc_services/ydb_over_fq/keep_alive.cpp b/ydb/core/grpc_services/ydb_over_fq/keep_alive.cpp
@@ -2,6 +2,7 @@
 
 #include <ydb/core/grpc_services/base/base.h>
 #include <ydb/core/grpc_services/rpc_deferrable.h>
+#include <ydb/public/api/protos/ydb_table.pb.h>
 
 namespace NKikimr::NGRpcService::NYdbOverFq {
 
diff --git a/ydb/services/lib/actors/pq_schema_actor.cpp b/ydb/services/lib/actors/pq_schema_actor.cpp
@@ -7,6 +7,8 @@
 
 #include <ydb/public/lib/jwt/jwt.h>
 
+#include <ydb/public/api/protos/ydb_topic.pb.h>
+
 #include <ydb/library/yql/public/decimal/yql_decimal.h>
 
 #include <util/string/vector.h>
diff --git a/ydb/services/lib/actors/pq_schema_actor.h b/ydb/services/lib/actors/pq_schema_actor.h
@@ -28,6 +28,10 @@ struct TYdbPqCodes {
         PQCode(PQCode) {}
 };
 
+namespace Ydb::Topic {
+    class CreateTopicRequest;
+    class AlterTopicRequest;
+}
 
 namespace NKikimr::NGRpcProxy::V1 {
 
