diff options
author | zverevgeny <zverevgeny@ydb.tech> | 2024-01-29 10:43:47 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-29 10:43:47 +0300 |
commit | eecc71dc9207f1843120577c55a6197041245d31 (patch) | |
tree | 04e577e9232eb0a6a842339866541430008a88ad | |
parent | a32284c27a7379de8cfb724ce429f89d5e5d2cb6 (diff) | |
download | ydb-eecc71dc9207f1843120577c55a6197041245d31.tar.gz |
YQL-17542 Introduce TDqSyncComputeActorBase (#1361)
5 files changed, 22 insertions, 10 deletions
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 3ecae9079a..32a52c2163 100644 --- a/ydb/core/kqp/compute_actor/kqp_pure_compute_actor.h +++ b/ydb/core/kqp/compute_actor/kqp_pure_compute_actor.h @@ -11,14 +11,14 @@ #include <ydb/core/sys_view/scan.h> #include <ydb/library/yverify_stream/yverify_stream.h> -#include <ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h> +#include <ydb/library/yql/dq/actors/compute/dq_sync_compute_actor_base.h> namespace NKikimr { namespace NKqp { -class TKqpComputeActor : public TDqComputeActorBase<TKqpComputeActor> { - using TBase = TDqComputeActorBase<TKqpComputeActor>; +class TKqpComputeActor : public TDqSyncComputeActorBase<TKqpComputeActor> { + using TBase = TDqSyncComputeActorBase<TKqpComputeActor>; public: static constexpr NKikimrServices::TActivity::EType ActorActivityType() { 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 f904353d68..ccf548819a 100644 --- a/ydb/core/kqp/compute_actor/kqp_scan_compute_actor.h +++ b/ydb/core/kqp/compute_actor/kqp_scan_compute_actor.h @@ -2,15 +2,15 @@ #include "kqp_scan_events.h" #include <ydb/core/kqp/runtime/kqp_scan_data.h> -#include <ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h> +#include <ydb/library/yql/dq/actors/compute/dq_sync_compute_actor_base.h> #include <ydb/library/yql/dq/actors/compute/dq_compute_actor_async_io.h> #include <ydb/library/yql/dq/actors/compute/dq_compute_actor.h> namespace NKikimr::NKqp::NScanPrivate { -class TKqpScanComputeActor: public NYql::NDq::TDqComputeActorBase<TKqpScanComputeActor> { +class TKqpScanComputeActor: public NYql::NDq::TDqSyncComputeActorBase<TKqpScanComputeActor> { private: - using TBase = NYql::NDq::TDqComputeActorBase<TKqpScanComputeActor>; + using TBase = NYql::NDq::TDqSyncComputeActorBase<TKqpScanComputeActor>; NMiniKQL::TKqpScanComputeContext ComputeCtx; NKikimrTxDataShard::TKqpTransaction::TScanTaskMeta Meta; using TBase::TaskRunner; 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 ccb6b638e6..b020257321 100644 --- a/ydb/library/yql/dq/actors/compute/dq_compute_actor.cpp +++ b/ydb/library/yql/dq/actors/compute/dq_compute_actor.cpp @@ -1,4 +1,4 @@ -#include "dq_compute_actor_impl.h" +#include "dq_sync_compute_actor_base.h" #include "dq_compute_actor.h" #include "dq_task_runner_exec_ctx.h" @@ -27,8 +27,8 @@ TDqExecutionSettings& GetDqExecutionSettingsForTests() { return ExecutionSettings; } -class TDqComputeActor : public TDqComputeActorBase<TDqComputeActor> { - using TBase = TDqComputeActorBase<TDqComputeActor>; +class TDqComputeActor : public TDqSyncComputeActorBase<TDqComputeActor> { + using TBase = TDqSyncComputeActorBase<TDqComputeActor>; public: static constexpr char ActorName[] = "DQ_COMPUTE_ACTOR"; 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 854f63e523..f8e194fe2d 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 @@ -126,7 +126,6 @@ protected: RlNoResourceTag = 102, }; - static constexpr bool HasAsyncTaskRunner = false; public: void Bootstrap() { diff --git a/ydb/library/yql/dq/actors/compute/dq_sync_compute_actor_base.h b/ydb/library/yql/dq/actors/compute/dq_sync_compute_actor_base.h new file mode 100644 index 0000000000..41d0401c0a --- /dev/null +++ b/ydb/library/yql/dq/actors/compute/dq_sync_compute_actor_base.h @@ -0,0 +1,13 @@ +#include "./dq_compute_actor_impl.h" + +namespace NYql::NDq { + +template<typename TDerived> +class TDqSyncComputeActorBase: public TDqComputeActorBase<TDerived> { +public: + using TDqComputeActorBase<TDerived>::TDqComputeActorBase; + static constexpr bool HasAsyncTaskRunner = false; +}; + +} //namespace NYql::NDq + |