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

Initialize fields needed for CA (preps for WA removing) #1513

Merged
merged 1 commit into from
Feb 1, 2024
+36 −0
Merged

Initialize fields needed for CA (preps for WA removing) #1513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 29 additions & 0 deletions ydb/library/yql/providers/dq/global_worker_manager/global_worker_manager_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
#include <ydb/library/yql/providers/dq/common/attrs.h>
#include <ydb/library/yql/providers/dq/actors/dynamic_nameserver.h>
#include <ydb/library/yql/providers/dq/actors/resource_allocator.h>
#include <ydb/library/yql/minikql/invoke_builtins/mkql_builtins.h>
#include <ydb/library/yql/dq/integration/transform/yql_dq_task_transform.h>
#include <ydb/library/yql/dq/comp_nodes/yql_common_dq_factory.h>
#include <ydb/library/yql/providers/common/comp_nodes/yql_factory.h>
#include <ydb/library/yql/minikql/comp_nodes/mkql_factories.h>
#include <ydb/library/yql/dq/transform/yql_common_dq_transform.h>
#include <ydb/library/yql/providers/dq/task_runner/tasks_runner_local.h>

using namespace NYql;
using namespace NActors;
Expand Down Expand Up @@ -178,11 +185,26 @@ class TGlobalWorkerManagerTest: public TTestBase {
TActorSetupCmd{gwmActor, TMailboxType::Simple, 0});

// Local WM.
FunctionRegistry_ = CreateFunctionRegistry(NKikimr::NMiniKQL::CreateBuiltinRegistry());
auto dqCompFactory = NKikimr::NMiniKQL::GetCompositeWithBuiltinFactory({
NYql::GetCommonDqFactory(),
NKikimr::NMiniKQL::GetYqlFactory()
});

auto dqTaskTransformFactory = NYql::CreateCompositeTaskTransformFactory({
NYql::CreateCommonDqTaskTransformFactory()
});

auto patternCache = std::make_shared<NKikimr::NMiniKQL::TComputationPatternLRUCache>(NKikimr::NMiniKQL::TComputationPatternLRUCache::Config(200_MB, 200_MB));

auto factory = NTaskRunnerProxy::CreateFactory(FunctionRegistry_.Get(), dqCompFactory, dqTaskTransformFactory, patternCache, true);
for (ui32 i = 1; i < nodesNumber; i++) {
NYql::NDqs::TLocalWorkerManagerOptions lwmOptions;
lwmOptions.TaskRunnerInvokerFactory = new NDqs::TTaskRunnerInvokerFactory();
lwmOptions.TaskRunnerActorFactory = NYql::NDq::NTaskRunnerActor::CreateTaskRunnerActorFactory(
lwmOptions.Factory, lwmOptions.TaskRunnerInvokerFactory);
lwmOptions.FunctionRegistry = FunctionRegistry_.Get();
lwmOptions.Factory = factory;
auto localWM = CreateLocalWorkerManager(lwmOptions);
ActorRuntime_->AddLocalService(MakeWorkerManagerActorID(NodeId(i)),
TActorSetupCmd{localWM, TMailboxType::Simple, 0}, i);
Expand All @@ -192,6 +214,10 @@ class TGlobalWorkerManagerTest: public TTestBase {

ActorRuntime_->Initialize();

for (ui32 i = 1; i < nodesNumber; i++) {
ActorRuntime_->GetLogSettings(i)->Mask = 0xffffffff;
}

NActors::TDispatchOptions options;
options.FinalEvents.emplace_back(NActors::TEvents::TSystem::Bootstrap, nodesNumber);
ActorRuntime_->DispatchEvents(options);
Expand Down Expand Up @@ -360,6 +386,8 @@ class TGlobalWorkerManagerTest: public TTestBase {
TActorId RegisterResourceAllocator(const ui32 workersCount, const TActorId& execActor) const {
TIntrusivePtr<NMonitoring::TDynamicCounters> counters = MakeIntrusive<NMonitoring::TDynamicCounters>();
auto gwmActor = MakeWorkerManagerActorID(NodeId());
TVector<NYql::NDqProto::TDqTask> tasks(workersCount);
//auto allocator = CreateResourceAllocator(gwmActor, execActor, execActor, workersCount, "TraceId", new TDqConfiguration(), counters, tasks, "sync");
auto allocator = CreateResourceAllocator(gwmActor, execActor, execActor, workersCount, "TraceId", new TDqConfiguration(), counters);
const auto allocatorId = ActorRuntime_->Register(allocator);
return allocatorId;
Expand Down Expand Up @@ -434,6 +462,7 @@ class TGlobalWorkerManagerTest: public TTestBase {
}

THolder<NActors::TTestActorRuntimeBase> ActorRuntime_;
TIntrusivePtr<NKikimr::NMiniKQL::IFunctionRegistry> FunctionRegistry_;
};

UNIT_TEST_SUITE_REGISTRATION(TGlobalWorkerManagerTest)
7 changes: 7 additions & 0 deletions ydb/library/yql/providers/dq/global_worker_manager/ut/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ PEERDIR(
ydb/library/yql/dq/actors/compute
ydb/library/yql/minikql/computation/llvm14
ydb/library/yql/minikql/comp_nodes/llvm14

ydb/library/yql/dq/integration/transform
ydb/library/yql/dq/comp_nodes
ydb/library/yql/providers/common/comp_nodes
ydb/library/yql/minikql/comp_nodes
ydb/library/yql/dq/transform
ydb/library/yql/providers/dq/task_runner
)

SRCS(
Expand Down
Loading