Skip to content

Yql 17542 simplify alloc in compute actor #1452

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

Merged
merged 3 commits into from
Feb 1, 2024
Merged

Yql 17542 simplify alloc in compute actor #1452

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
ccf5503
YQL-17542 Simplify allocator usage in ComputeActors
zverevgeny Jan 31, 2024
7a32c18
fix build
zverevgeny Jan 31, 2024
07fff54
fix dup
zverevgeny Jan 31, 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
12 changes: 0 additions & 12 deletions ydb/library/yql/dq/actors/compute/dq_async_compute_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,18 +461,6 @@ class TDqAsyncComputeActor : public TDqComputeActorBase<TDqAsyncComputeActor, TC
return inputChannel->FreeSpace;
}

TGuard<NKikimr::NMiniKQL::TScopedAlloc> BindAllocator() override {
return TypeEnv->BindAllocator();
}

std::optional<TGuard<NKikimr::NMiniKQL::TScopedAlloc>> MaybeBindAllocator() override {
std::optional<TGuard<NKikimr::NMiniKQL::TScopedAlloc>> guard;
if (TypeEnv) {
guard.emplace(TypeEnv->BindAllocator());
}
return guard;
}

void OnTaskRunnerCreated(NTaskRunnerActor::TEvTaskRunnerCreateFinished::TPtr& ev) {
const auto& secureParams = ev->Get()->SecureParams;
const auto& taskParams = ev->Get()->TaskParams;
Expand Down
12 changes: 4 additions & 8 deletions ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ class TDqComputeActorBase : public NActors::TActorBootstrapped<TDerived>
}

{
auto guard = MaybeBindAllocator(); // Source/Sink could destroy mkql values inside PassAway, which requires allocator to be bound
auto guard = BindAllocator(); // Source/Sink could destroy mkql values inside PassAway, which requires allocator to be bound

for (auto& [_, source] : SourcesMap) {
if (source.Actor) {
Expand Down Expand Up @@ -1087,12 +1087,8 @@ class TDqComputeActorBase : public NActors::TActorBootstrapped<TDerived>
TerminateSources(TIssues({TIssue(message)}), success);
}

virtual TGuard<NKikimr::NMiniKQL::TScopedAlloc> BindAllocator() {
return TaskRunner->BindAllocator();
}

virtual std::optional<TGuard<NKikimr::NMiniKQL::TScopedAlloc>> MaybeBindAllocator() {
return TaskRunner->BindAllocator();
TGuard<NKikimr::NMiniKQL::TScopedAlloc> BindAllocator() {
return Guard(GetAllocator());
}

virtual bool SayHelloOnBootstrap() {
Expand Down Expand Up @@ -1503,7 +1499,7 @@ class TDqComputeActorBase : public NActors::TActorBootstrapped<TDerived>
.TypeEnv = typeEnv,
.HolderFactory = holderFactory,
.TaskCounters = TaskCounters,
.Alloc = TaskRunner ? Alloc : nullptr,
.Alloc = Alloc,
.MemoryQuotaManager = MemoryLimits.MemoryQuotaManager,
.SourceSettings = (!settings.empty() ? settings.at(inputIndex) : nullptr),
.Arena = Task.GetArena(),
Expand Down
3 changes: 2 additions & 1 deletion ydb/library/yql/dq/actors/compute/dq_sync_compute_actor_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ class TDqSyncComputeActorBase: public TDqComputeActorBase<TDerived, TComputeActo
void PrepareTaskRunner(const IDqTaskRunnerExecutionContext& execCtx) {
YQL_ENSURE(this->TaskRunner);

auto guard = this->TaskRunner->BindAllocator(this->MemoryQuota->GetMkqlMemoryLimit());
auto guard = TBase::BindAllocator();
auto* alloc = guard.GetMutex();
alloc->SetLimit(this->MemoryQuota->GetMkqlMemoryLimit());

this->MemoryQuota->TrySetIncreaseMemoryLimitCallback(alloc);

Expand Down