aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzverevgeny <zverevgeny@ydb.tech>2024-04-18 16:55:44 +0300
committerGitHub <noreply@github.com>2024-04-18 16:55:44 +0300
commit8a724ac89bd3299f446498361a244a6ff961030a (patch)
treee4142e95b877f19d74c2471ce4648bb6d182c9a6
parent98d7fc848ae8e9daf88a5096596ceb9c72e3de22 (diff)
downloadydb-8a724ac89bd3299f446498361a244a6ff961030a.tar.gz
YQ-2068 remove unused IFunctionRegistry from compute actors (#2230)
-rw-r--r--ydb/core/kqp/compute_actor/kqp_compute_actor.cpp3
-rw-r--r--ydb/core/kqp/compute_actor/kqp_compute_actor.h2
-rw-r--r--ydb/core/kqp/compute_actor/kqp_pure_compute_actor.cpp6
-rw-r--r--ydb/core/kqp/compute_actor/kqp_pure_compute_actor.h2
-rw-r--r--ydb/core/kqp/compute_actor/kqp_scan_compute_actor.cpp4
-rw-r--r--ydb/core/kqp/compute_actor/kqp_scan_compute_actor.h1
-rw-r--r--ydb/core/kqp/executer_actor/kqp_planner.cpp2
-rw-r--r--ydb/core/kqp/node_service/kqp_node_service.cpp4
-rw-r--r--ydb/library/yql/dq/actors/compute/dq_async_compute_actor.cpp6
-rw-r--r--ydb/library/yql/dq/actors/compute/dq_async_compute_actor.h1
-rw-r--r--ydb/library/yql/dq/actors/compute/dq_compute_actor.cpp6
-rw-r--r--ydb/library/yql/dq/actors/compute/dq_compute_actor.h1
-rw-r--r--ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h3
-rw-r--r--ydb/library/yql/providers/dq/actors/compute_actor.cpp2
14 files changed, 12 insertions, 31 deletions
diff --git a/ydb/core/kqp/compute_actor/kqp_compute_actor.cpp b/ydb/core/kqp/compute_actor/kqp_compute_actor.cpp
index 7527bae3c6..d8b9e14d4e 100644
--- a/ydb/core/kqp/compute_actor/kqp_compute_actor.cpp
+++ b/ydb/core/kqp/compute_actor/kqp_compute_actor.cpp
@@ -132,11 +132,10 @@ using namespace NYql::NDqProto;
IActor* CreateKqpScanComputeActor(const TActorId& executerId, ui64 txId,
TDqTask* task, IDqAsyncIoFactory::TPtr asyncIoFactory,
- const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry,
const NYql::NDq::TComputeRuntimeSettings& settings, const TComputeMemoryLimits& memoryLimits, NWilson::TTraceId traceId,
TIntrusivePtr<NActors::TProtoArenaHolder> arena) {
return new NScanPrivate::TKqpScanComputeActor(executerId, txId, task, std::move(asyncIoFactory),
- functionRegistry, settings, memoryLimits, std::move(traceId), std::move(arena));
+ settings, memoryLimits, std::move(traceId), std::move(arena));
}
IActor* CreateKqpScanFetcher(const NKikimrKqp::TKqpSnapshot& snapshot, std::vector<NActors::TActorId>&& computeActors,
diff --git a/ydb/core/kqp/compute_actor/kqp_compute_actor.h b/ydb/core/kqp/compute_actor/kqp_compute_actor.h
index 84001de2af..564339c4c6 100644
--- a/ydb/core/kqp/compute_actor/kqp_compute_actor.h
+++ b/ydb/core/kqp/compute_actor/kqp_compute_actor.h
@@ -44,7 +44,6 @@ public:
IActor* CreateKqpComputeActor(const TActorId& executerId, ui64 txId, NYql::NDqProto::TDqTask* task,
NYql::NDq::IDqAsyncIoFactory::TPtr asyncIoFactory,
- const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry,
const NYql::NDq::TComputeRuntimeSettings& settings, const NYql::NDq::TComputeMemoryLimits& memoryLimits,
NWilson::TTraceId traceId,
TIntrusivePtr<NActors::TProtoArenaHolder> arena,
@@ -52,7 +51,6 @@ IActor* CreateKqpComputeActor(const TActorId& executerId, ui64 txId, NYql::NDqPr
IActor* CreateKqpScanComputeActor(const TActorId& executerId, ui64 txId,
NYql::NDqProto::TDqTask* task, NYql::NDq::IDqAsyncIoFactory::TPtr asyncIoFactory,
- const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry,
const NYql::NDq::TComputeRuntimeSettings& settings, const NYql::NDq::TComputeMemoryLimits& memoryLimits, NWilson::TTraceId traceId,
TIntrusivePtr<NActors::TProtoArenaHolder> arena);
diff --git a/ydb/core/kqp/compute_actor/kqp_pure_compute_actor.cpp b/ydb/core/kqp/compute_actor/kqp_pure_compute_actor.cpp
index fc39685f18..1bc343f9f5 100644
--- a/ydb/core/kqp/compute_actor/kqp_pure_compute_actor.cpp
+++ b/ydb/core/kqp/compute_actor/kqp_pure_compute_actor.cpp
@@ -12,11 +12,10 @@ bool TKqpComputeActor::IsDebugLogEnabled(const TActorSystem* actorSystem) {
TKqpComputeActor::TKqpComputeActor(const TActorId& executerId, ui64 txId, NDqProto::TDqTask* task,
IDqAsyncIoFactory::TPtr asyncIoFactory,
- const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry,
const TComputeRuntimeSettings& settings, const TComputeMemoryLimits& memoryLimits,
NWilson::TTraceId traceId, TIntrusivePtr<NActors::TProtoArenaHolder> arena,
const std::optional<TKqpFederatedQuerySetup>& federatedQuerySetup)
- : TBase(executerId, txId, task, std::move(asyncIoFactory), functionRegistry, settings, memoryLimits, /* ownMemoryQuota = */ true, /* passExceptions = */ true, /*taskCounters = */ nullptr, std::move(traceId), std::move(arena))
+ : TBase(executerId, txId, task, std::move(asyncIoFactory), settings, memoryLimits, /* ownMemoryQuota = */ true, /* passExceptions = */ true, /*taskCounters = */ nullptr, std::move(traceId), std::move(arena))
, ComputeCtx(settings.StatsMode)
, FederatedQuerySetup(federatedQuerySetup)
{
@@ -279,13 +278,12 @@ void TKqpComputeActor::HandleExecute(TEvKqpCompute::TEvScanError::TPtr& ev) {
IActor* CreateKqpComputeActor(const TActorId& executerId, ui64 txId, NDqProto::TDqTask* task,
IDqAsyncIoFactory::TPtr asyncIoFactory,
- const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry,
const TComputeRuntimeSettings& settings, const TComputeMemoryLimits& memoryLimits,
NWilson::TTraceId traceId, TIntrusivePtr<NActors::TProtoArenaHolder> arena,
const std::optional<TKqpFederatedQuerySetup>& federatedQuerySetup)
{
return new TKqpComputeActor(executerId, txId, task, std::move(asyncIoFactory),
- functionRegistry, settings, memoryLimits, std::move(traceId), std::move(arena), federatedQuerySetup);
+ settings, memoryLimits, std::move(traceId), std::move(arena), federatedQuerySetup);
}
} // namespace NKqp
diff --git a/ydb/core/kqp/compute_actor/kqp_pure_compute_actor.h b/ydb/core/kqp/compute_actor/kqp_pure_compute_actor.h
index c331065c34..f0b68549b8 100644
--- a/ydb/core/kqp/compute_actor/kqp_pure_compute_actor.h
+++ b/ydb/core/kqp/compute_actor/kqp_pure_compute_actor.h
@@ -27,7 +27,6 @@ public:
TKqpComputeActor(const TActorId& executerId, ui64 txId, NDqProto::TDqTask* task,
IDqAsyncIoFactory::TPtr asyncIoFactory,
- const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry,
const TComputeRuntimeSettings& settings, const TComputeMemoryLimits& memoryLimits,
NWilson::TTraceId traceId, TIntrusivePtr<NActors::TProtoArenaHolder> arena,
const std::optional<TKqpFederatedQuerySetup>& federatedQuerySetup);
@@ -67,7 +66,6 @@ private:
IActor* CreateKqpComputeActor(const TActorId& executerId, ui64 txId, NDqProto::TDqTask* task,
IDqAsyncIoFactory::TPtr asyncIoFactory,
- const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry,
const TComputeRuntimeSettings& settings, const TComputeMemoryLimits& memoryLimits,
NWilson::TTraceId traceId, TIntrusivePtr<NActors::TProtoArenaHolder> arena,
const std::optional<TKqpFederatedQuerySetup>& federatedQuerySetup);
diff --git a/ydb/core/kqp/compute_actor/kqp_scan_compute_actor.cpp b/ydb/core/kqp/compute_actor/kqp_scan_compute_actor.cpp
index c1f2bf2969..45c0cb4ee1 100644
--- a/ydb/core/kqp/compute_actor/kqp_scan_compute_actor.cpp
+++ b/ydb/core/kqp/compute_actor/kqp_scan_compute_actor.cpp
@@ -24,10 +24,10 @@ static constexpr TDuration RL_MAX_BATCH_DELAY = TDuration::Seconds(50);
} // anonymous namespace
TKqpScanComputeActor::TKqpScanComputeActor(const TActorId& executerId, ui64 txId, NDqProto::TDqTask* task,
- IDqAsyncIoFactory::TPtr asyncIoFactory, const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry,
+ IDqAsyncIoFactory::TPtr asyncIoFactory,
const TComputeRuntimeSettings& settings, const TComputeMemoryLimits& memoryLimits, NWilson::TTraceId traceId,
TIntrusivePtr<NActors::TProtoArenaHolder> arena)
- : TBase(executerId, txId, task, std::move(asyncIoFactory), functionRegistry, settings,
+ : TBase(executerId, txId, task, std::move(asyncIoFactory), settings,
memoryLimits, /* ownMemoryQuota = */ true, /* passExceptions = */ true, /*taskCounters = */ nullptr, std::move(traceId), std::move(arena))
, ComputeCtx(settings.StatsMode)
{
diff --git a/ydb/core/kqp/compute_actor/kqp_scan_compute_actor.h b/ydb/core/kqp/compute_actor/kqp_scan_compute_actor.h
index dd9d78091e..69b0bb613c 100644
--- a/ydb/core/kqp/compute_actor/kqp_scan_compute_actor.h
+++ b/ydb/core/kqp/compute_actor/kqp_scan_compute_actor.h
@@ -32,7 +32,6 @@ public:
TKqpScanComputeActor(const TActorId& executerId, ui64 txId,
NYql::NDqProto::TDqTask* task, NYql::NDq::IDqAsyncIoFactory::TPtr asyncIoFactory,
- const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry,
const NYql::NDq::TComputeRuntimeSettings& settings, const NYql::NDq::TComputeMemoryLimits& memoryLimits, NWilson::TTraceId traceId,
TIntrusivePtr<NActors::TProtoArenaHolder> arena);
diff --git a/ydb/core/kqp/executer_actor/kqp_planner.cpp b/ydb/core/kqp/executer_actor/kqp_planner.cpp
index cee268c666..6c3a5ac51d 100644
--- a/ydb/core/kqp/executer_actor/kqp_planner.cpp
+++ b/ydb/core/kqp/executer_actor/kqp_planner.cpp
@@ -349,7 +349,7 @@ void TKqpPlanner::ExecuteDataComputeTask(ui64 taskId, bool shareMailbox, bool op
limits.MemoryQuotaManager = std::make_shared<NYql::NDq::TGuaranteeQuotaManager>(limit * 2, limit);
auto computeActor = NKikimr::NKqp::CreateKqpComputeActor(ExecuterId, TxId, taskDesc, AsyncIoFactory,
- AppData()->FunctionRegistry, settings, limits, ExecuterSpan.GetTraceId(), TasksGraph.GetMeta().GetArenaIntrusivePtr(), FederatedQuerySetup);
+ settings, limits, ExecuterSpan.GetTraceId(), TasksGraph.GetMeta().GetArenaIntrusivePtr(), FederatedQuerySetup);
if (optimizeProtoForLocalExecution) {
TVector<google::protobuf::Message*>& taskSourceSettings = static_cast<TKqpComputeActor*>(computeActor)->MutableTaskSourceSettings();
diff --git a/ydb/core/kqp/node_service/kqp_node_service.cpp b/ydb/core/kqp/node_service/kqp_node_service.cpp
index 5687c6cc6d..29081dca96 100644
--- a/ydb/core/kqp/node_service/kqp_node_service.cpp
+++ b/ydb/core/kqp/node_service/kqp_node_service.cpp
@@ -493,14 +493,14 @@ private:
if (tableKind == ETableKind::Datashard || tableKind == ETableKind::Olap) {
auto& info = computesByStage.UpsertTaskWithScan(dqTask, meta, !AppData()->FeatureFlags.GetEnableSeparationComputeActorsFromRead());
computeActor = CreateKqpScanComputeActor(request.Executer, txId, &dqTask,
- AsyncIoFactory, AppData()->FunctionRegistry, runtimeSettings, memoryLimits,
+ AsyncIoFactory, runtimeSettings, memoryLimits,
NWilson::TTraceId(ev->TraceId), ev->Get()->Arena);
taskCtx.ComputeActorId = Register(computeActor);
info.MutableActorIds().emplace_back(taskCtx.ComputeActorId);
} else {
if (Y_LIKELY(!CaFactory)) {
computeActor = CreateKqpComputeActor(request.Executer, txId, &dqTask, AsyncIoFactory,
- AppData()->FunctionRegistry, runtimeSettings, memoryLimits, NWilson::TTraceId(ev->TraceId), ev->Get()->Arena, FederatedQuerySetup);
+ runtimeSettings, memoryLimits, NWilson::TTraceId(ev->TraceId), ev->Get()->Arena, FederatedQuerySetup);
taskCtx.ComputeActorId = Register(computeActor);
} else {
computeActor = CaFactory->CreateKqpComputeActor(request.Executer, txId, &dqTask,
diff --git a/ydb/library/yql/dq/actors/compute/dq_async_compute_actor.cpp b/ydb/library/yql/dq/actors/compute/dq_async_compute_actor.cpp
index e8db0e2441..54a4c785c6 100644
--- a/ydb/library/yql/dq/actors/compute/dq_async_compute_actor.cpp
+++ b/ydb/library/yql/dq/actors/compute/dq_async_compute_actor.cpp
@@ -76,13 +76,12 @@ public:
TDqAsyncComputeActor(const TActorId& executerId, const TTxId& txId, NDqProto::TDqTask* task,
IDqAsyncIoFactory::TPtr asyncIoFactory,
- const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry,
const TComputeRuntimeSettings& settings, const TComputeMemoryLimits& memoryLimits,
const NTaskRunnerActor::ITaskRunnerActorFactory::TPtr& taskRunnerActorFactory,
const ::NMonitoring::TDynamicCounterPtr& taskCounters,
const TActorId& quoterServiceActorId,
bool ownCounters)
- : TBase(executerId, txId, task, std::move(asyncIoFactory), functionRegistry, settings, memoryLimits, /* ownMemoryQuota = */ false, false, taskCounters)
+ : TBase(executerId, txId, task, std::move(asyncIoFactory), settings, memoryLimits, /* ownMemoryQuota = */ false, false, taskCounters)
, TaskRunnerActorFactory(taskRunnerActorFactory)
, ReadyToCheckpointFlag(false)
, SentStatsRequest(false)
@@ -996,7 +995,6 @@ private:
IActor* CreateDqAsyncComputeActor(const TActorId& executerId, const TTxId& txId, NYql::NDqProto::TDqTask* task,
IDqAsyncIoFactory::TPtr asyncIoFactory,
- const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry,
const TComputeRuntimeSettings& settings, const TComputeMemoryLimits& memoryLimits,
const NTaskRunnerActor::ITaskRunnerActorFactory::TPtr& taskRunnerActorFactory,
::NMonitoring::TDynamicCounterPtr taskCounters,
@@ -1004,7 +1002,7 @@ IActor* CreateDqAsyncComputeActor(const TActorId& executerId, const TTxId& txId,
bool ownCounters)
{
return new TDqAsyncComputeActor(executerId, txId, task, std::move(asyncIoFactory),
- functionRegistry, settings, memoryLimits, taskRunnerActorFactory, taskCounters, quoterServiceActorId, ownCounters);
+ settings, memoryLimits, taskRunnerActorFactory, taskCounters, quoterServiceActorId, ownCounters);
}
} // namespace NDq
diff --git a/ydb/library/yql/dq/actors/compute/dq_async_compute_actor.h b/ydb/library/yql/dq/actors/compute/dq_async_compute_actor.h
index d1549500b5..4d07bc6be4 100644
--- a/ydb/library/yql/dq/actors/compute/dq_async_compute_actor.h
+++ b/ydb/library/yql/dq/actors/compute/dq_async_compute_actor.h
@@ -19,7 +19,6 @@ namespace NDq {
NActors::IActor* CreateDqAsyncComputeActor(const NActors::TActorId& executerId, const TTxId& txId, NDqProto::TDqTask* task,
IDqAsyncIoFactory::TPtr asyncIoFactory,
- const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry,
const TComputeRuntimeSettings& settings, const TComputeMemoryLimits& memoryLimits,
const NTaskRunnerActor::ITaskRunnerActorFactory::TPtr& taskRunnerActorFactory,
::NMonitoring::TDynamicCounterPtr taskCounters = nullptr,
diff --git a/ydb/library/yql/dq/actors/compute/dq_compute_actor.cpp b/ydb/library/yql/dq/actors/compute/dq_compute_actor.cpp
index 160e6813c0..ec819a33a5 100644
--- a/ydb/library/yql/dq/actors/compute/dq_compute_actor.cpp
+++ b/ydb/library/yql/dq/actors/compute/dq_compute_actor.cpp
@@ -35,11 +35,10 @@ public:
TDqComputeActor(const TActorId& executerId, const TTxId& txId, NDqProto::TDqTask* task,
IDqAsyncIoFactory::TPtr asyncIoFactory,
- const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry,
const TComputeRuntimeSettings& settings, const TComputeMemoryLimits& memoryLimits,
const TTaskRunnerFactory& taskRunnerFactory,
::NMonitoring::TDynamicCounterPtr taskCounters)
- : TBase(executerId, txId, task, std::move(asyncIoFactory), functionRegistry, settings, memoryLimits, true, false, taskCounters)
+ : TBase(executerId, txId, task, std::move(asyncIoFactory), settings, memoryLimits, true, false, taskCounters)
, TaskRunnerFactory(taskRunnerFactory)
{
InitializeTask();
@@ -75,13 +74,12 @@ private:
IActor* CreateDqComputeActor(const TActorId& executerId, const TTxId& txId, NYql::NDqProto::TDqTask* task,
IDqAsyncIoFactory::TPtr asyncIoFactory,
- const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry,
const TComputeRuntimeSettings& settings, const TComputeMemoryLimits& memoryLimits,
const TTaskRunnerFactory& taskRunnerFactory,
::NMonitoring::TDynamicCounterPtr taskCounters)
{
return new TDqComputeActor(executerId, txId, task, std::move(asyncIoFactory),
- functionRegistry, settings, memoryLimits, taskRunnerFactory, taskCounters);
+ settings, memoryLimits, taskRunnerFactory, taskCounters);
}
} // namespace NDq
diff --git a/ydb/library/yql/dq/actors/compute/dq_compute_actor.h b/ydb/library/yql/dq/actors/compute/dq_compute_actor.h
index e0439b5bfe..31c153de88 100644
--- a/ydb/library/yql/dq/actors/compute/dq_compute_actor.h
+++ b/ydb/library/yql/dq/actors/compute/dq_compute_actor.h
@@ -377,7 +377,6 @@ void FillTaskRunnerStats(ui64 taskId, ui32 stageId, const TTaskRunnerStatsBase&
NActors::IActor* CreateDqComputeActor(const NActors::TActorId& executerId, const TTxId& txId, NDqProto::TDqTask* task,
IDqAsyncIoFactory::TPtr asyncIoFactory,
- const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry,
const TComputeRuntimeSettings& settings, const TComputeMemoryLimits& memoryLimits,
const TTaskRunnerFactory& taskRunnerFactory,
::NMonitoring::TDynamicCounterPtr taskCounters = nullptr);
diff --git a/ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h b/ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h
index d5df65df1a..5fca53868e 100644
--- a/ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h
+++ b/ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h
@@ -160,7 +160,6 @@ public:
protected:
TDqComputeActorBase(const NActors::TActorId& executerId, const TTxId& txId, NDqProto::TDqTask* task,
IDqAsyncIoFactory::TPtr asyncIoFactory,
- const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry,
const TComputeRuntimeSettings& settings, const TComputeMemoryLimits& memoryLimits,
bool ownMemoryQuota = true, bool passExceptions = false,
const ::NMonitoring::TDynamicCounterPtr& taskCounters = nullptr,
@@ -173,7 +172,6 @@ protected:
, MemoryLimits(memoryLimits)
, CanAllocateExtraMemory(RuntimeSettings.ExtraMemoryAllocationPool != 0)
, AsyncIoFactory(std::move(asyncIoFactory))
- , FunctionRegistry(functionRegistry)
, CheckpointingMode(GetTaskCheckpointingMode(Task))
, State(Task.GetCreateSuspended() ? NDqProto::COMPUTE_STATE_UNKNOWN : NDqProto::COMPUTE_STATE_EXECUTING)
, WatermarksTracker(this->SelfId(), TxId, Task.GetId())
@@ -1857,7 +1855,6 @@ protected:
TComputeMemoryLimits MemoryLimits;
const bool CanAllocateExtraMemory = false;
const IDqAsyncIoFactory::TPtr AsyncIoFactory;
- const NKikimr::NMiniKQL::IFunctionRegistry* FunctionRegistry = nullptr;
const NDqProto::ECheckpointingMode CheckpointingMode;
TDqComputeActorChannels* Channels = nullptr;
TDqComputeActorCheckpoints* Checkpoints = nullptr;
diff --git a/ydb/library/yql/providers/dq/actors/compute_actor.cpp b/ydb/library/yql/providers/dq/actors/compute_actor.cpp
index ed4d2ad580..3167b3644c 100644
--- a/ydb/library/yql/providers/dq/actors/compute_actor.cpp
+++ b/ydb/library/yql/providers/dq/actors/compute_actor.cpp
@@ -67,7 +67,6 @@ IActor* CreateComputeActor(
operationId,
task,
options.AsyncIoFactory,
- options.FunctionRegistry,
computeRuntimeSettings,
memoryLimits,
taskRunnerFactory,
@@ -78,7 +77,6 @@ IActor* CreateComputeActor(
operationId,
task,
options.AsyncIoFactory,
- options.FunctionRegistry,
computeRuntimeSettings,
memoryLimits,
taskRunnerActorFactory,