Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions ydb/core/kqp/compute_actor/kqp_pure_compute_actor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions ydb/core/kqp/compute_actor/kqp_scan_compute_actor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ydb/library/yql/dq/actors/compute/dq_compute_actor.cpp
Original file line number Diff line number Diff line change
@@ -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"

Expand Down Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ class TDqComputeActorBase : public NActors::TActorBootstrapped<TDerived>
RlNoResourceTag = 102,
};

static constexpr bool HasAsyncTaskRunner = false;

public:
void Bootstrap() {
Expand Down
13 changes: 13 additions & 0 deletions ydb/library/yql/dq/actors/compute/dq_sync_compute_actor_base.h
Original file line number Diff line number Diff line change
@@ -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