Skip to content

Commit 54e99cd

Browse files
authored
Initialize fields needed for CA (preps for WA removing) (#1513)
1 parent f099e3d commit 54e99cd

File tree

2 files changed

+36
-0
lines changed

2 files changed

+36
-0
lines changed

ydb/library/yql/providers/dq/global_worker_manager/global_worker_manager_ut.cpp

+29
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@
1010
#include <ydb/library/yql/providers/dq/common/attrs.h>
1111
#include <ydb/library/yql/providers/dq/actors/dynamic_nameserver.h>
1212
#include <ydb/library/yql/providers/dq/actors/resource_allocator.h>
13+
#include <ydb/library/yql/minikql/invoke_builtins/mkql_builtins.h>
14+
#include <ydb/library/yql/dq/integration/transform/yql_dq_task_transform.h>
15+
#include <ydb/library/yql/dq/comp_nodes/yql_common_dq_factory.h>
16+
#include <ydb/library/yql/providers/common/comp_nodes/yql_factory.h>
17+
#include <ydb/library/yql/minikql/comp_nodes/mkql_factories.h>
18+
#include <ydb/library/yql/dq/transform/yql_common_dq_transform.h>
19+
#include <ydb/library/yql/providers/dq/task_runner/tasks_runner_local.h>
1320

1421
using namespace NYql;
1522
using namespace NActors;
@@ -178,11 +185,26 @@ class TGlobalWorkerManagerTest: public TTestBase {
178185
TActorSetupCmd{gwmActor, TMailboxType::Simple, 0});
179186

180187
// Local WM.
188+
FunctionRegistry_ = CreateFunctionRegistry(NKikimr::NMiniKQL::CreateBuiltinRegistry());
189+
auto dqCompFactory = NKikimr::NMiniKQL::GetCompositeWithBuiltinFactory({
190+
NYql::GetCommonDqFactory(),
191+
NKikimr::NMiniKQL::GetYqlFactory()
192+
});
193+
194+
auto dqTaskTransformFactory = NYql::CreateCompositeTaskTransformFactory({
195+
NYql::CreateCommonDqTaskTransformFactory()
196+
});
197+
198+
auto patternCache = std::make_shared<NKikimr::NMiniKQL::TComputationPatternLRUCache>(NKikimr::NMiniKQL::TComputationPatternLRUCache::Config(200_MB, 200_MB));
199+
200+
auto factory = NTaskRunnerProxy::CreateFactory(FunctionRegistry_.Get(), dqCompFactory, dqTaskTransformFactory, patternCache, true);
181201
for (ui32 i = 1; i < nodesNumber; i++) {
182202
NYql::NDqs::TLocalWorkerManagerOptions lwmOptions;
183203
lwmOptions.TaskRunnerInvokerFactory = new NDqs::TTaskRunnerInvokerFactory();
184204
lwmOptions.TaskRunnerActorFactory = NYql::NDq::NTaskRunnerActor::CreateTaskRunnerActorFactory(
185205
lwmOptions.Factory, lwmOptions.TaskRunnerInvokerFactory);
206+
lwmOptions.FunctionRegistry = FunctionRegistry_.Get();
207+
lwmOptions.Factory = factory;
186208
auto localWM = CreateLocalWorkerManager(lwmOptions);
187209
ActorRuntime_->AddLocalService(MakeWorkerManagerActorID(NodeId(i)),
188210
TActorSetupCmd{localWM, TMailboxType::Simple, 0}, i);
@@ -192,6 +214,10 @@ class TGlobalWorkerManagerTest: public TTestBase {
192214

193215
ActorRuntime_->Initialize();
194216

217+
for (ui32 i = 1; i < nodesNumber; i++) {
218+
ActorRuntime_->GetLogSettings(i)->Mask = 0xffffffff;
219+
}
220+
195221
NActors::TDispatchOptions options;
196222
options.FinalEvents.emplace_back(NActors::TEvents::TSystem::Bootstrap, nodesNumber);
197223
ActorRuntime_->DispatchEvents(options);
@@ -360,6 +386,8 @@ class TGlobalWorkerManagerTest: public TTestBase {
360386
TActorId RegisterResourceAllocator(const ui32 workersCount, const TActorId& execActor) const {
361387
TIntrusivePtr<NMonitoring::TDynamicCounters> counters = MakeIntrusive<NMonitoring::TDynamicCounters>();
362388
auto gwmActor = MakeWorkerManagerActorID(NodeId());
389+
TVector<NYql::NDqProto::TDqTask> tasks(workersCount);
390+
//auto allocator = CreateResourceAllocator(gwmActor, execActor, execActor, workersCount, "TraceId", new TDqConfiguration(), counters, tasks, "sync");
363391
auto allocator = CreateResourceAllocator(gwmActor, execActor, execActor, workersCount, "TraceId", new TDqConfiguration(), counters);
364392
const auto allocatorId = ActorRuntime_->Register(allocator);
365393
return allocatorId;
@@ -434,6 +462,7 @@ class TGlobalWorkerManagerTest: public TTestBase {
434462
}
435463

436464
THolder<NActors::TTestActorRuntimeBase> ActorRuntime_;
465+
TIntrusivePtr<NKikimr::NMiniKQL::IFunctionRegistry> FunctionRegistry_;
437466
};
438467

439468
UNIT_TEST_SUITE_REGISTRATION(TGlobalWorkerManagerTest)

ydb/library/yql/providers/dq/global_worker_manager/ut/ya.make

+7
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ PEERDIR(
1313
ydb/library/yql/dq/actors/compute
1414
ydb/library/yql/minikql/computation/llvm14
1515
ydb/library/yql/minikql/comp_nodes/llvm14
16+
17+
ydb/library/yql/dq/integration/transform
18+
ydb/library/yql/dq/comp_nodes
19+
ydb/library/yql/providers/common/comp_nodes
20+
ydb/library/yql/minikql/comp_nodes
21+
ydb/library/yql/dq/transform
22+
ydb/library/yql/providers/dq/task_runner
1623
)
1724

1825
SRCS(

0 commit comments

Comments
 (0)