Skip to content

Commit cf894d2

Browse files
authored
remove ydb provider from peerdirs, sort paths (#9263)
1 parent 142a9a9 commit cf894d2

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

ydb/core/fq/libs/init/init.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@
4444
#include <ydb/library/yql/providers/pq/async_io/dq_pq_read_actor.h>
4545
#include <ydb/library/yql/providers/pq/async_io/dq_pq_write_actor.h>
4646
#include <ydb/library/yql/providers/solomon/async_io/dq_solomon_write_actor.h>
47-
#include <ydb/library/yql/providers/ydb/actors/yql_ydb_source_factory.h>
48-
#include <ydb/library/yql/providers/ydb/comp_nodes/yql_ydb_factory.h>
49-
#include <ydb/library/yql/providers/ydb/comp_nodes/yql_ydb_dq_transform.h>
50-
#include <ydb/library/yql/providers/ydb/actors/yql_ydb_source_factory.h>
5147
#include <ydb/library/yql/providers/common/http_gateway/yql_http_default_retry_policy.h>
5248

5349

@@ -157,16 +153,14 @@ void Init(
157153

158154
TVector<NKikimr::NMiniKQL::TComputationNodeFactory> compNodeFactories = {
159155
NYql::GetCommonDqFactory(),
160-
NYql::GetDqYdbFactory(yqSharedResources->UserSpaceYdbDriver),
161156
NKikimr::NMiniKQL::GetYqlFactory()
162157
};
163158

164159
compNodeFactories.insert(compNodeFactories.end(), additionalCompNodeFactories.begin(), additionalCompNodeFactories.end());
165160
NKikimr::NMiniKQL::TComputationNodeFactory dqCompFactory = NKikimr::NMiniKQL::GetCompositeWithBuiltinFactory(std::move(compNodeFactories));
166161

167162
NYql::TTaskTransformFactory dqTaskTransformFactory = NYql::CreateCompositeTaskTransformFactory({
168-
NYql::CreateCommonDqTaskTransformFactory(),
169-
NYql::CreateYdbDqTaskTransformFactory()
163+
NYql::CreateCommonDqTaskTransformFactory()
170164
});
171165

172166
auto asyncIoFactory = MakeIntrusive<NYql::NDq::TDqAsyncIoFactory>();
@@ -201,7 +195,6 @@ void Init(
201195

202196
RegisterDqInputTransformLookupActorFactory(*asyncIoFactory);
203197
RegisterDqPqReadActorFactory(*asyncIoFactory, yqSharedResources->UserSpaceYdbDriver, credentialsFactory, yqCounters->GetSubgroup("subsystem", "DqSourceTracker"));
204-
RegisterYdbReadActorFactory(*asyncIoFactory, yqSharedResources->UserSpaceYdbDriver, credentialsFactory);
205198

206199
s3ActorsFactory->RegisterS3ReadActorFactory(*asyncIoFactory, credentialsFactory, httpGateway, s3HttpRetryPolicy, readActorFactoryCfg,
207200
yqCounters->GetSubgroup("subsystem", "S3ReadActor"), protoConfig.GetGateways().GetS3().GetAllowLocalFiles());

ydb/core/fq/libs/init/ya.make

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ SRCS(
55
)
66

77
PEERDIR(
8-
ydb/library/actors/core
9-
ydb/library/actors/http
108
ydb/core/base
119
ydb/core/fq/libs/actors
1210
ydb/core/fq/libs/audit
@@ -27,15 +25,16 @@ PEERDIR(
2725
ydb/core/fq/libs/shared_resources
2826
ydb/core/fq/libs/test_connection
2927
ydb/core/protos
28+
ydb/library/actors/core
29+
ydb/library/actors/http
3030
ydb/library/folder_service
3131
ydb/library/folder_service/proto
3232
ydb/library/security
33-
ydb/library/yql/minikql/comp_nodes
34-
ydb/library/yql/utils/actor_log
3533
ydb/library/yql/dq/actors/compute
3634
ydb/library/yql/dq/actors/input_transforms
3735
ydb/library/yql/dq/comp_nodes
3836
ydb/library/yql/dq/transform
37+
ydb/library/yql/minikql/comp_nodes
3938
ydb/library/yql/providers/common/comp_nodes
4039
ydb/library/yql/providers/common/metrics
4140
ydb/library/yql/providers/dq/actors
@@ -56,9 +55,7 @@ PEERDIR(
5655
ydb/library/yql/providers/solomon/gateway
5756
ydb/library/yql/providers/solomon/proto
5857
ydb/library/yql/providers/solomon/provider
59-
ydb/library/yql/providers/ydb/actors
60-
ydb/library/yql/providers/ydb/comp_nodes
61-
ydb/library/yql/providers/ydb/provider
58+
ydb/library/yql/utils/actor_log
6259
)
6360

6461
YQL_LAST_ABI_VERSION()

0 commit comments

Comments
 (0)