Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Break deps from core/grpc_services to core/fq/libs/actors #1781

Merged
merged 3 commits into from
Feb 10, 2024
Merged

Break deps from core/grpc_services to core/fq/libs/actors #1781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90c15df
Break deps from core/grpc_services to core/fq/libs/actors
Hor911 Feb 9, 2024
d2529f3
Delete random files
Hor911 Feb 9, 2024
eac14c3
Restore old version
Hor911 Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ydb/core/fq/libs/actors/proxy_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ namespace NKikimr {

namespace NFq {

NActors::TActorId MakeYqPrivateProxyId();

NActors::IActor* CreateYqlAnalyticsPrivateProxy(
const NConfig::TPrivateProxyConfig& privateProxyConfig,
TIntrusivePtr<ITimeProvider> timeProvider,
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/fq/libs/control_plane_proxy/control_plane_proxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include "config.h"
#include "control_plane_proxy.h"
#include "probes.h"
#include "utils.h"

#include <ydb/core/fq/libs/actors/logging/log.h>
#include <ydb/core/fq/libs/compute/ydb/control_plane/compute_database_control_plane_service.h>
Expand All @@ -23,6 +22,7 @@
#include <ydb/core/fq/libs/control_plane_proxy/actors/utils.h>
#include <ydb/core/fq/libs/control_plane_proxy/actors/ydb_schema_query_actor.h>
#include <ydb/core/fq/libs/control_plane_proxy/events/events.h>
#include <ydb/core/fq/libs/control_plane_proxy/utils/utils.h>
#include <ydb/public/lib/fq/scope.h>

#include <ydb/library/actors/core/actor.h>
Expand Down
2 changes: 2 additions & 0 deletions ydb/core/fq/libs/control_plane_proxy/events/events.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,4 +394,6 @@ struct TEvControlPlaneProxy {
};
};

NActors::TActorId ControlPlaneProxyActorId();

}
0 ydb/core/fq/libs/control_plane_proxy/utils.h → ...fq/libs/control_plane_proxy/utils/utils.h
View file
Open in desktop
File renamed without changes.
9 changes: 9 additions & 0 deletions ydb/core/fq/libs/control_plane_proxy/utils/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
LIBRARY()

PEERDIR(
ydb/public/api/protos
)

YQL_LAST_ABI_VERSION()

END()
1 change: 1 addition & 0 deletions ydb/core/fq/libs/control_plane_proxy/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ END()
RECURSE(
actors
events
utils
)

RECURSE_FOR_TESTS(
Expand Down
2 changes: 2 additions & 0 deletions ydb/core/fq/libs/events/events.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,8 @@ struct TEvents {
};
};

NActors::TActorId MakeYqPrivateProxyId();

} // namespace NFq

template<>
Expand Down
3 changes: 1 addition & 2 deletions ydb/core/grpc_services/rpc_fq.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
#include <ydb/core/grpc_services/service_fq.h>
#include <ydb/core/fq/libs/audit/events/events.h>
#include <ydb/core/fq/libs/audit/yq_audit_service.h>
#include <ydb/core/fq/libs/control_plane_proxy/control_plane_proxy.h>
#include <ydb/core/fq/libs/control_plane_proxy/events/events.h>
#include <ydb/core/fq/libs/control_plane_proxy/utils.h>
#include <ydb/core/fq/libs/control_plane_proxy/utils/utils.h>
#include <ydb/public/api/protos/draft/fq.pb.h>
#include <ydb/public/lib/fq/scope.h>

Expand Down
1 change: 0 additions & 1 deletion ydb/core/grpc_services/rpc_fq_internal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include "rpc_deferrable.h"

#include <ydb/core/fq/libs/events/events.h>
#include <ydb/core/fq/libs/actors/proxy_private.h>
#include <ydb/core/fq/libs/protos/fq_private.pb.h>

#include <ydb/library/actors/core/hfunc.h>
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/grpc_services/service_fq.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <memory>

#include <ydb/core/base/ticket_parser.h>
#include <ydb/core/fq/libs/control_plane_proxy/utils.h>
#include <ydb/core/fq/libs/control_plane_proxy/utils/utils.h>

namespace NKikimr {
namespace NGRpcService {
Expand Down
3 changes: 1 addition & 2 deletions ydb/core/grpc_services/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ PEERDIR(
ydb/core/discovery
ydb/core/engine
ydb/core/formats
ydb/core/fq/libs/actors
ydb/core/fq/libs/control_plane_proxy
ydb/core/fq/libs/events
ydb/core/fq/libs/control_plane_proxy/events
ydb/core/grpc_services/base
ydb/core/grpc_services/counters
Expand Down
1 change: 1 addition & 0 deletions ydb/core/kqp/executer_actor/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ PEERDIR(
ydb/core/client/minikql_compile
ydb/core/formats
ydb/core/kqp/common
ydb/core/kqp/compute_actor
ydb/core/kqp/query_compiler
ydb/core/kqp/rm_service
ydb/core/kqp/topics
Expand Down
1 change: 1 addition & 0 deletions ydb/core/kqp/node_service/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ PEERDIR(
ydb/core/base
ydb/core/cms/console
ydb/core/kqp/common
ydb/core/kqp/compute_actor
ydb/core/kqp/counters
ydb/core/mind
ydb/core/protos
Expand Down
Loading