Skip to content

YQL-17542 move PrepareTaskRunner to TDqSyncComputeActorBase #1416

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
aakulaga-ydb merged 1 commit into from
Jan 31, 2024
Merged

YQL-17542 move PrepareTaskRunner to TDqSyncComputeActorBase #1416

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
26 changes: 0 additions & 26 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 @@ -1461,32 +1461,6 @@ class TDqComputeActorBase : public NActors::TActorBootstrapped<TDerived>
}

protected:
void SetTaskRunner(const TIntrusivePtr<IDqTaskRunner>& taskRunner) {
TaskRunner = taskRunner;
}

void PrepareTaskRunner(const IDqTaskRunnerExecutionContext& execCtx) {
YQL_ENSURE(TaskRunner);

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

MemoryQuota->TrySetIncreaseMemoryLimitCallback(alloc);

TDqTaskRunnerMemoryLimits limits;
limits.ChannelBufferSize = MemoryLimits.ChannelBufferSize;
limits.OutputChunkMaxSize = GetDqExecutionSettings().FlowControl.MaxOutputChunkSize;

TaskRunner->Prepare(Task, limits, execCtx);

FillIoMaps(
TaskRunner->GetHolderFactory(),
TaskRunner->GetTypeEnv(),
TaskRunner->GetSecureParams(),
TaskRunner->GetTaskParams(),
TaskRunner->GetReadRanges());
}

void FillIoMaps(
const NKikimr::NMiniKQL::THolderFactory& holderFactory,
const NKikimr::NMiniKQL::TTypeEnvironment& typeEnv,
Expand Down
16 changes: 8 additions & 8 deletions ydb/library/yql/dq/actors/compute/dq_compute_actor_log.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
#endif

#define CA_LOG_T(s) \
LOG_TRACE_S(*NActors::TlsActivationContext, NKikimrServices::KQP_COMPUTE, LogPrefix << s)
LOG_TRACE_S(*NActors::TlsActivationContext, NKikimrServices::KQP_COMPUTE, this->LogPrefix << s)
#define CA_LOG_D(s) \
LOG_DEBUG_S(*NActors::TlsActivationContext, NKikimrServices::KQP_COMPUTE, LogPrefix << s)
LOG_DEBUG_S(*NActors::TlsActivationContext, NKikimrServices::KQP_COMPUTE, this->LogPrefix << s)
#define CA_LOG_I(s) \
LOG_INFO_S(*NActors::TlsActivationContext, NKikimrServices::KQP_COMPUTE, LogPrefix << s)
LOG_INFO_S(*NActors::TlsActivationContext, NKikimrServices::KQP_COMPUTE, this->LogPrefix << s)
#define CA_LOG_W(s) \
LOG_WARN_S(*NActors::TlsActivationContext, NKikimrServices::KQP_COMPUTE, LogPrefix << s)
LOG_WARN_S(*NActors::TlsActivationContext, NKikimrServices::KQP_COMPUTE, this->LogPrefix << s)
#define CA_LOG_N(s) \
LOG_NOTICE_S(*NActors::TlsActivationContext, NKikimrServices::KQP_COMPUTE, LogPrefix << s)
LOG_NOTICE_S(*NActors::TlsActivationContext, NKikimrServices::KQP_COMPUTE, this->LogPrefix << s)
#define CA_LOG_E(s) \
LOG_ERROR_S(*NActors::TlsActivationContext, NKikimrServices::KQP_COMPUTE, LogPrefix << s)
LOG_ERROR_S(*NActors::TlsActivationContext, NKikimrServices::KQP_COMPUTE, this->LogPrefix << s)
#define CA_LOG_C(s) \
LOG_CRIT_S(*NActors::TlsActivationContext, NKikimrServices::KQP_COMPUTE, LogPrefix << s)
LOG_CRIT_S(*NActors::TlsActivationContext, NKikimrServices::KQP_COMPUTE, this->LogPrefix << s)
#define CA_LOG(prio, s) \
LOG_LOG_S(*NActors::TlsActivationContext, prio, NKikimrServices::KQP_COMPUTE, LogPrefix << s)
LOG_LOG_S(*NActors::TlsActivationContext, prio, NKikimrServices::KQP_COMPUTE, this->LogPrefix << s)

26 changes: 26 additions & 0 deletions 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 @@ -43,6 +43,32 @@ class TDqSyncComputeActorBase: public TDqComputeActorBase<TDerived, TComputeActo
{
return inputTransformInfo.Buffer.Get();
}
protected:
void SetTaskRunner(const TIntrusivePtr<IDqTaskRunner>& taskRunner) {
this->TaskRunner = taskRunner;
}

void PrepareTaskRunner(const IDqTaskRunnerExecutionContext& execCtx) {
YQL_ENSURE(this->TaskRunner);

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

this->MemoryQuota->TrySetIncreaseMemoryLimitCallback(alloc);

TDqTaskRunnerMemoryLimits limits;
limits.ChannelBufferSize = this->MemoryLimits.ChannelBufferSize;
limits.OutputChunkMaxSize = GetDqExecutionSettings().FlowControl.MaxOutputChunkSize;

this->TaskRunner->Prepare(this->Task, limits, execCtx);

TBase::FillIoMaps(
this->TaskRunner->GetHolderFactory(),
this->TaskRunner->GetTypeEnv(),
this->TaskRunner->GetSecureParams(),
this->TaskRunner->GetTaskParams(),
this->TaskRunner->GetReadRanges());
}
};

} //namespace NYql::NDq
Expand Down