Skip to content

Commit 18208d6

Browse files
Hor911Hor911
authored
Merge d2529f3 into e463939 
2 parents e463939 + d2529f3 commit 18208d6

File tree

14 files changed

+23
-12
lines changed

14 files changed

+23
-12
lines changed

‎ydb/core/fq/libs/actors/proxy_private.h

-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ namespace NKikimr {
2222

2323
namespace NFq {
2424

25-
NActors::TActorId MakeYqPrivateProxyId();
26-
2725
NActors::IActor* CreateYqlAnalyticsPrivateProxy(
2826
const NConfig::TPrivateProxyConfig& privateProxyConfig,
2927
TIntrusivePtr<ITimeProvider> timeProvider,

‎ydb/core/fq/libs/control_plane_proxy/control_plane_proxy.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#include "config.h"
22
#include "control_plane_proxy.h"
33
#include "probes.h"
4-
#include "utils.h"
54

65
#include <ydb/core/fq/libs/actors/logging/log.h>
76
#include <ydb/core/fq/libs/compute/ydb/control_plane/compute_database_control_plane_service.h>
@@ -23,6 +22,7 @@
2322
#include <ydb/core/fq/libs/control_plane_proxy/actors/utils.h>
2423
#include <ydb/core/fq/libs/control_plane_proxy/actors/ydb_schema_query_actor.h>
2524
#include <ydb/core/fq/libs/control_plane_proxy/events/events.h>
25+
#include <ydb/core/fq/libs/control_plane_proxy/utils/utils.h>
2626
#include <ydb/public/lib/fq/scope.h>
2727

2828
#include <ydb/library/actors/core/actor.h>

‎ydb/core/fq/libs/control_plane_proxy/events/events.h

+2
Original file line numberDiff line numberDiff line change
@@ -394,4 +394,6 @@ struct TEvControlPlaneProxy {
394394
};
395395
};
396396

397+
NActors::TActorId ControlPlaneProxyActorId();
398+
397399
}

‎ydb/core/fq/libs/control_plane_proxy/utils.h renamed to ‎ydb/core/fq/libs/control_plane_proxy/utils/utils.h

File renamed without changes.

‎ydb/core/fq/libs/control_plane_proxy/utils/ya.make

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
LIBRARY()
2+
3+
PEERDIR(
4+
ydb/public/api/protos
5+
)
6+
7+
YQL_LAST_ABI_VERSION()
8+
9+
END()

‎ydb/core/fq/libs/control_plane_proxy/ya.make

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ END()
3333
RECURSE(
3434
actors
3535
events
36+
utils
3637
)
3738

3839
RECURSE_FOR_TESTS(

‎ydb/core/fq/libs/events/events.h

+2
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,8 @@ struct TEvents {
250250
};
251251
};
252252

253+
NActors::TActorId MakeYqPrivateProxyId();
254+
253255
} // namespace NFq
254256

255257
template<>

‎ydb/core/grpc_services/rpc_fq.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
#include <ydb/core/grpc_services/service_fq.h>
55
#include <ydb/core/fq/libs/audit/events/events.h>
66
#include <ydb/core/fq/libs/audit/yq_audit_service.h>
7-
#include <ydb/core/fq/libs/control_plane_proxy/control_plane_proxy.h>
87
#include <ydb/core/fq/libs/control_plane_proxy/events/events.h>
9-
#include <ydb/core/fq/libs/control_plane_proxy/utils.h>
8+
#include <ydb/core/fq/libs/control_plane_proxy/utils/utils.h>
109
#include <ydb/public/api/protos/draft/fq.pb.h>
1110
#include <ydb/public/lib/fq/scope.h>
1211

‎ydb/core/grpc_services/rpc_fq_internal.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include "rpc_deferrable.h"
44

55
#include <ydb/core/fq/libs/events/events.h>
6-
#include <ydb/core/fq/libs/actors/proxy_private.h>
76
#include <ydb/core/fq/libs/protos/fq_private.pb.h>
87

98
#include <ydb/library/actors/core/hfunc.h>

‎ydb/core/grpc_services/service_fq.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <memory>
55

66
#include <ydb/core/base/ticket_parser.h>
7-
#include <ydb/core/fq/libs/control_plane_proxy/utils.h>
7+
#include <ydb/core/fq/libs/control_plane_proxy/utils/utils.h>
88

99
namespace NKikimr {
1010
namespace NGRpcService {

‎ydb/core/grpc_services/ya.make

+1-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ PEERDIR(
9595
ydb/core/discovery
9696
ydb/core/engine
9797
ydb/core/formats
98-
ydb/core/fq/libs/actors
99-
ydb/core/fq/libs/control_plane_proxy
98+
ydb/core/fq/libs/events
10099
ydb/core/fq/libs/control_plane_proxy/events
101100
ydb/core/grpc_services/base
102101
ydb/core/grpc_services/counters

‎ydb/core/kqp/executer_actor/ya.make

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ PEERDIR(
2626
ydb/core/client/minikql_compile
2727
ydb/core/formats
2828
ydb/core/kqp/common
29+
ydb/core/kqp/compute_actor
2930
ydb/core/kqp/query_compiler
3031
ydb/core/kqp/rm_service
3132
ydb/core/kqp/topics

‎ydb/core/kqp/host/kqp_host.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1476,11 +1476,11 @@ class TKqpHost : public IKqpHost {
14761476
state->Configuration->WriteThroughDqIntegration = true;
14771477
state->Configuration->AllowAtomicUploadCommit = queryType == EKikimrQueryType::Script;
14781478
state->MaxTasksPerStage = SessionCtx->ConfigPtr()->MaxTasksPerStage.Get();
1479-
14801479
state->Configuration->Init(FederatedQuerySetup->S3GatewayConfig, TypesCtx);
1480+
state->Gateway = FederatedQuerySetup->HttpGateway;
14811481

1482-
auto dataSource = NYql::CreateS3DataSource(state, FederatedQuerySetup->HttpGateway);
1483-
auto dataSink = NYql::CreateS3DataSink(state, FederatedQuerySetup->HttpGateway);
1482+
auto dataSource = NYql::CreateS3DataSource(state);
1483+
auto dataSink = NYql::CreateS3DataSink(state);
14841484

14851485
TypesCtx->AddDataSource(NYql::S3ProviderName, std::move(dataSource));
14861486
TypesCtx->AddDataSink(NYql::S3ProviderName, std::move(dataSink));

‎ydb/core/kqp/node_service/ya.make

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ PEERDIR(
1010
ydb/core/base
1111
ydb/core/cms/console
1212
ydb/core/kqp/common
13+
ydb/core/kqp/compute_actor
1314
ydb/core/kqp/counters
1415
ydb/core/mind
1516
ydb/core/protos

0 commit comments

Comments
 (0)