[refactoring] Do not include "scheme_board/events.h" into "grpc_services/base/base.h" (#10089)

dcherednik · web-flow · commit 356eb15a94ac · 2024-10-07T14:52:56.000+05:00
diff --git a/ydb/core/grpc_services/base/base.h b/ydb/core/grpc_services/base/base.h
@@ -24,14 +24,17 @@
 #include <ydb/core/jaeger_tracing/request_discriminator.h>
 #include <ydb/core/grpc_services/counters/proxy_counters.h>
 #include <ydb/core/grpc_streaming/grpc_streaming.h>
-#include <ydb/core/tx/scheme_board/events.h>
 #include <ydb/core/base/events.h>
 #include <ydb/core/util/ulid.h>
 
 #include <ydb/library/actors/wilson/wilson_span.h>
 
 #include <util/stream/str.h>
 
+namespace NKikimrScheme {
+    class TEvDescribeSchemeResult;
+}
+
 namespace NKikimr {
 
 namespace NSchemeCache {
@@ -356,7 +359,7 @@ class IFacilityProvider {
 
 struct TRequestAuxSettings {
     TRateLimiterMode RlMode = TRateLimiterMode::Off;
-    void (*CustomAttributeProcessor)(const TSchemeBoardEvents::TDescribeSchemeResult& schemeData, ICheckerIface*) = nullptr;
+    void (*CustomAttributeProcessor)(const NKikimrScheme::TEvDescribeSchemeResult& schemeData, ICheckerIface*) = nullptr;
     TAuditMode AuditMode = TAuditMode::Off;
     NJaegerTracing::ERequestType RequestType = NJaegerTracing::ERequestType::UNSPECIFIED;
 };
@@ -416,7 +419,7 @@ class IRequestProxyCtx
     virtual void SetRespHook(TRespHook&& hook) = 0;
     virtual void SetRlPath(TMaybe<NRpcService::TRlPath>&& path) = 0;
     virtual TRateLimiterMode GetRlMode() const = 0;
-    virtual bool TryCustomAttributeProcess(const TSchemeBoardEvents::TDescribeSchemeResult& schemeData,
+    virtual bool TryCustomAttributeProcess(const NKikimrScheme::TEvDescribeSchemeResult& schemeData,
         ICheckerIface* iface) = 0;
 
     // Pass request for next processing
@@ -665,7 +668,7 @@ class TRefreshTokenImpl
         return TRateLimiterMode::Off;
     }
 
-    bool TryCustomAttributeProcess(const TSchemeBoardEvents::TDescribeSchemeResult&, ICheckerIface*) override {
+    bool TryCustomAttributeProcess(const NKikimrScheme::TEvDescribeSchemeResult&, ICheckerIface*) override {
         return false;
     }
 
@@ -763,7 +766,7 @@ class TGRpcRequestBiStreamWrapper
         return RlAllowed_ ? RateLimitMode : TRateLimiterMode::Off;
     }
 
-    bool TryCustomAttributeProcess(const TSchemeBoardEvents::TDescribeSchemeResult&, ICheckerIface*) override {
+    bool TryCustomAttributeProcess(const NKikimrScheme::TEvDescribeSchemeResult&, ICheckerIface*) override {
         return false;
     }
 
@@ -1447,7 +1450,7 @@ class TGrpcRequestCall
         return AuxSettings.RlMode;
     }
 
-    bool TryCustomAttributeProcess(const TSchemeBoardEvents::TDescribeSchemeResult& schemeData,
+    bool TryCustomAttributeProcess(const NKikimrScheme::TEvDescribeSchemeResult& schemeData,
         ICheckerIface* iface) override
     {
         if (!AuxSettings.CustomAttributeProcessor) {
@@ -1500,7 +1503,7 @@ class TGRpcRequestWrapper
         return RateLimitMode;
     }
 
-    bool TryCustomAttributeProcess(const TSchemeBoardEvents::TDescribeSchemeResult&, ICheckerIface*) override {
+    bool TryCustomAttributeProcess(const NKikimrScheme::TEvDescribeSchemeResult&, ICheckerIface*) override {
         return false;
     }
 };
@@ -1524,7 +1527,7 @@ class TGRpcRequestWrapperNoAuth
         return RateLimitMode;
     }
 
-    bool TryCustomAttributeProcess(const TSchemeBoardEvents::TDescribeSchemeResult&, ICheckerIface*) override {
+    bool TryCustomAttributeProcess(const NKikimrScheme::TEvDescribeSchemeResult&, ICheckerIface*) override {
         return false;
     }
 
@@ -1553,7 +1556,7 @@ class TGRpcRequestValidationWrapper
         return RlAllowed ? RateLimitMode : TRateLimiterMode::Off;
     }
 
-    bool TryCustomAttributeProcess(const TSchemeBoardEvents::TDescribeSchemeResult&, ICheckerIface*) override {
+    bool TryCustomAttributeProcess(const NKikimrScheme::TEvDescribeSchemeResult&, ICheckerIface*) override {
         return false;
     }
 
@@ -1702,7 +1705,7 @@ class TEvRequestAuthAndCheck
         return TRateLimiterMode::Rps;
     }
 
-    bool TryCustomAttributeProcess(const TSchemeBoardEvents::TDescribeSchemeResult& /*schemeData*/, ICheckerIface* /*iface*/) override {
+    bool TryCustomAttributeProcess(const NKikimrScheme::TEvDescribeSchemeResult& /*schemeData*/, ICheckerIface* /*iface*/) override {
         return false;
     }
 
diff --git a/ydb/core/grpc_services/grpc_request_check_actor.h b/ydb/core/grpc_services/grpc_request_check_actor.h
@@ -16,6 +16,7 @@
 #include <ydb/library/ydb_issue/issue_helpers.h>
 #include <ydb/core/grpc_services/counters/proxy_counters.h>
 #include <ydb/core/security/secure_request.h>
+#include <ydb/core/tx/scheme_board/events.h>
 #include <ydb/core/tx/scheme_cache/scheme_cache.h>
 #include <ydb/library/wilson_ids/wilson.h>
 
diff --git a/ydb/core/grpc_services/service_fq.h b/ydb/core/grpc_services/service_fq.h
@@ -5,6 +5,7 @@
 
 #include <ydb/core/base/ticket_parser.h>
 #include <ydb/core/fq/libs/control_plane_proxy/utils/utils.h>
+#include <ydb/core/tx/scheme_board/events.h>
 
 namespace NKikimr {
 namespace NGRpcService {
diff --git a/ydb/core/persqueue/pq_rl_helpers.h b/ydb/core/persqueue/pq_rl_helpers.h
@@ -3,6 +3,7 @@
 #include <ydb/core/grpc_services/local_rate_limiter.h>
 #include <ydb/core/metering/stream_ru_calculator.h>
 #include <ydb/core/protos/pqconfig.pb.h>
+#include <ydb/core/tx/scheme_board/events.h>
 
 #include <util/datetime/base.h>
 
diff --git a/ydb/core/tx/schemeshard/ut_index_build/ut_index_build.cpp b/ydb/core/tx/schemeshard/ut_index_build/ut_index_build.cpp
@@ -1,4 +1,5 @@
 #include <ydb/core/base/table_index.h>
+#include <ydb/core/tx/scheme_board/events.h>
 #include <ydb/core/tx/schemeshard/ut_helpers/helpers.h>
 #include <ydb/core/tx/schemeshard/schemeshard_billing_helpers.h>
 #include <ydb/core/testlib/tablet_helpers.h>
diff --git a/ydb/services/datastreams/grpc_service.cpp b/ydb/services/datastreams/grpc_service.cpp
@@ -7,6 +7,7 @@
 #include <ydb/core/grpc_services/grpc_helper.h>
 #include <ydb/core/grpc_services/base/base.h>
 #include <ydb/core/tx/scheme_board/cache.h>
+#include <ydb/core/tx/scheme_board/events.h>
 
 namespace {
 
diff --git a/ydb/services/local_discovery/grpc_func_call.h b/ydb/services/local_discovery/grpc_func_call.h
@@ -1,4 +1,5 @@
 #include <ydb/core/grpc_services/base/base.h>
+#include <ydb/core/tx/scheme_board/events.h>
 
 #include <util/system/hostname.h>
 
diff --git a/ydb/services/persqueue_v1/actors/events.h b/ydb/services/persqueue_v1/actors/events.h
@@ -7,6 +7,7 @@
 #include <ydb/core/protos/pqconfig.pb.h>
 #include <ydb/core/persqueue/key.h>
 #include <ydb/core/persqueue/percentile_counter.h>
+#include <ydb/core/tx/scheme_board/events.h>
 
 #include <ydb/public/api/protos/persqueue_error_codes_v1.pb.h>
 #include <ydb/public/api/protos/ydb_status_codes.pb.h>

Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,17 @@`
`24`	`24`	`#include <ydb/core/jaeger_tracing/request_discriminator.h>`
`25`	`25`	`#include <ydb/core/grpc_services/counters/proxy_counters.h>`
`26`	`26`	`#include <ydb/core/grpc_streaming/grpc_streaming.h>`
`27`		`-#include <ydb/core/tx/scheme_board/events.h>`
`28`	`27`	`#include <ydb/core/base/events.h>`
`29`	`28`	`#include <ydb/core/util/ulid.h>`
`30`	`29`
`31`	`30`	`#include <ydb/library/actors/wilson/wilson_span.h>`
`32`	`31`
`33`	`32`	`#include <util/stream/str.h>`
`34`	`33`
	`34`	`+namespace NKikimrScheme {`
	`35`	`+ class TEvDescribeSchemeResult;`
	`36`	`+}`
	`37`	`+`
`35`	`38`	`namespace NKikimr {`
`36`	`39`
`37`	`40`	`namespace NSchemeCache {`
`@@ -356,7 +359,7 @@ class IFacilityProvider {`
`356`	`359`
`357`	`360`	`struct TRequestAuxSettings {`
`358`	`361`	`TRateLimiterMode RlMode = TRateLimiterMode::Off;`
`359`		`- void (CustomAttributeProcessor)(const TSchemeBoardEvents::TDescribeSchemeResult& schemeData, ICheckerIface) = nullptr;`
	`362`	`+ void (CustomAttributeProcessor)(const NKikimrScheme::TEvDescribeSchemeResult& schemeData, ICheckerIface) = nullptr;`
`360`	`363`	`TAuditMode AuditMode = TAuditMode::Off;`
`361`	`364`	`NJaegerTracing::ERequestType RequestType = NJaegerTracing::ERequestType::UNSPECIFIED;`
`362`	`365`	`};`
`@@ -416,7 +419,7 @@ class IRequestProxyCtx`
`416`	`419`	`virtual void SetRespHook(TRespHook&& hook) = 0;`
`417`	`420`	`virtual void SetRlPath(TMaybe<NRpcService::TRlPath>&& path) = 0;`
`418`	`421`	`virtual TRateLimiterMode GetRlMode() const = 0;`
`419`		`- virtual bool TryCustomAttributeProcess(const TSchemeBoardEvents::TDescribeSchemeResult& schemeData,`
	`422`	`+ virtual bool TryCustomAttributeProcess(const NKikimrScheme::TEvDescribeSchemeResult& schemeData,`
`420`	`423`	`ICheckerIface* iface) = 0;`
`421`	`424`
`422`	`425`	`// Pass request for next processing`
`@@ -665,7 +668,7 @@ class TRefreshTokenImpl`
`665`	`668`	`return TRateLimiterMode::Off;`
`666`	`669`	`}`
`667`	`670`
`668`		`- bool TryCustomAttributeProcess(const TSchemeBoardEvents::TDescribeSchemeResult&, ICheckerIface*) override {`
	`671`	`+ bool TryCustomAttributeProcess(const NKikimrScheme::TEvDescribeSchemeResult&, ICheckerIface*) override {`
`669`	`672`	`return false;`
`670`	`673`	`}`
`671`	`674`
`@@ -763,7 +766,7 @@ class TGRpcRequestBiStreamWrapper`
`763`	`766`	`return RlAllowed_ ? RateLimitMode : TRateLimiterMode::Off;`
`764`	`767`	`}`
`765`	`768`
`766`		`- bool TryCustomAttributeProcess(const TSchemeBoardEvents::TDescribeSchemeResult&, ICheckerIface*) override {`
	`769`	`+ bool TryCustomAttributeProcess(const NKikimrScheme::TEvDescribeSchemeResult&, ICheckerIface*) override {`
`767`	`770`	`return false;`
`768`	`771`	`}`
`769`	`772`
`@@ -1447,7 +1450,7 @@ class TGrpcRequestCall`
`1447`	`1450`	`return AuxSettings.RlMode;`
`1448`	`1451`	`}`
`1449`	`1452`
`1450`		`- bool TryCustomAttributeProcess(const TSchemeBoardEvents::TDescribeSchemeResult& schemeData,`
	`1453`	`+ bool TryCustomAttributeProcess(const NKikimrScheme::TEvDescribeSchemeResult& schemeData,`
`1451`	`1454`	`ICheckerIface* iface) override`
`1452`	`1455`	`{`
`1453`	`1456`	`if (!AuxSettings.CustomAttributeProcessor) {`
`@@ -1500,7 +1503,7 @@ class TGRpcRequestWrapper`
`1500`	`1503`	`return RateLimitMode;`
`1501`	`1504`	`}`
`1502`	`1505`
`1503`		`- bool TryCustomAttributeProcess(const TSchemeBoardEvents::TDescribeSchemeResult&, ICheckerIface*) override {`
	`1506`	`+ bool TryCustomAttributeProcess(const NKikimrScheme::TEvDescribeSchemeResult&, ICheckerIface*) override {`
`1504`	`1507`	`return false;`
`1505`	`1508`	`}`
`1506`	`1509`	`};`
`@@ -1524,7 +1527,7 @@ class TGRpcRequestWrapperNoAuth`
`1524`	`1527`	`return RateLimitMode;`
`1525`	`1528`	`}`
`1526`	`1529`
`1527`		`- bool TryCustomAttributeProcess(const TSchemeBoardEvents::TDescribeSchemeResult&, ICheckerIface*) override {`
	`1530`	`+ bool TryCustomAttributeProcess(const NKikimrScheme::TEvDescribeSchemeResult&, ICheckerIface*) override {`
`1528`	`1531`	`return false;`
`1529`	`1532`	`}`
`1530`	`1533`
`@@ -1553,7 +1556,7 @@ class TGRpcRequestValidationWrapper`
`1553`	`1556`	`return RlAllowed ? RateLimitMode : TRateLimiterMode::Off;`
`1554`	`1557`	`}`
`1555`	`1558`
`1556`		`- bool TryCustomAttributeProcess(const TSchemeBoardEvents::TDescribeSchemeResult&, ICheckerIface*) override {`
	`1559`	`+ bool TryCustomAttributeProcess(const NKikimrScheme::TEvDescribeSchemeResult&, ICheckerIface*) override {`
`1557`	`1560`	`return false;`
`1558`	`1561`	`}`
`1559`	`1562`
`@@ -1702,7 +1705,7 @@ class TEvRequestAuthAndCheck`
`1702`	`1705`	`return TRateLimiterMode::Rps;`
`1703`	`1706`	`}`
`1704`	`1707`
`1705`		`- bool TryCustomAttributeProcess(const TSchemeBoardEvents::TDescribeSchemeResult& /schemeData/, ICheckerIface* /iface/) override {`
	`1708`	`+ bool TryCustomAttributeProcess(const NKikimrScheme::TEvDescribeSchemeResult& /schemeData/, ICheckerIface* /iface/) override {`
`1706`	`1709`	`return false;`
`1707`	`1710`	`}`
`1708`	`1711`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include <ydb/core/base/table_index.h>`
	`2`	`+#include <ydb/core/tx/scheme_board/events.h>`
`2`	`3`	`#include <ydb/core/tx/schemeshard/ut_helpers/helpers.h>`
`3`	`4`	`#include <ydb/core/tx/schemeshard/schemeshard_billing_helpers.h>`
`4`	`5`	`#include <ydb/core/testlib/tablet_helpers.h>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include <ydb/core/grpc_services/base/base.h>`
	`2`	`+#include <ydb/core/tx/scheme_board/events.h>`
`2`	`3`
`3`	`4`	`#include <util/system/hostname.h>`
`4`	`5`