From 3003be661685413e9da0b0af532fa1479255d225 Mon Sep 17 00:00:00 2001 From: Gigoriy Pisarenko Date: Mon, 17 Feb 2025 10:35:25 +0000 Subject: [PATCH 1/3] Removed anonymous namespace --- ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h | 4 ---- 1 file changed, 4 deletions(-) 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 3330016375ad..1080f37f5fd8 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 @@ -42,8 +42,6 @@ namespace NYql { namespace NDq { -namespace { - struct TEvPrivate { enum EEv : ui32 { EvRuntimeError = EventSpaceBegin(NActors::TEvents::ES_PRIVATE), @@ -63,8 +61,6 @@ struct TEvPrivate { }; }; -} // anonymous namespace - struct TSinkCallbacks : public IDqComputeActorAsyncOutput::ICallbacks { void OnAsyncOutputError(ui64 outputIndex, const TIssues& issues, NYql::NDqProto::StatusIds::StatusCode fatalCode) override final { OnSinkError(outputIndex, issues, fatalCode); From 394d5be78cf518884bab2a02c9730328957f606e Mon Sep 17 00:00:00 2001 From: Gigoriy Pisarenko Date: Mon, 17 Feb 2025 10:43:03 +0000 Subject: [PATCH 2/3] Moved into private space --- .../dq/actors/compute/dq_compute_actor_impl.h | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) 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 1080f37f5fd8..8fb070607dff 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 @@ -42,25 +42,6 @@ namespace NYql { namespace NDq { -struct TEvPrivate { - enum EEv : ui32 { - EvRuntimeError = EventSpaceBegin(NActors::TEvents::ES_PRIVATE), - EvEnd - }; - - static_assert(EvEnd < EventSpaceEnd(NActors::TEvents::ES_PRIVATE), "expect EvEnd < EventSpaceEnd(TEvents::ES_PRIVATE)"); - - struct TEvAsyncOutputError : public NActors::TEventLocal { - TEvAsyncOutputError(NYql::NDqProto::StatusIds::StatusCode statusCode, const TIssues& issues) - : StatusCode(statusCode) - , Issues(issues) - {} - - NYql::NDqProto::StatusIds::StatusCode StatusCode; - NYql::TIssues Issues; - }; -}; - struct TSinkCallbacks : public IDqComputeActorAsyncOutput::ICallbacks { void OnAsyncOutputError(ui64 outputIndex, const TIssues& issues, NYql::NDqProto::StatusIds::StatusCode fatalCode) override final { OnSinkError(outputIndex, issues, fatalCode); @@ -117,6 +98,26 @@ class TDqComputeActorBase : public NActors::TActorBootstrapped , public TSinkCallbacks , public TOutputTransformCallbacks { +private: + struct TEvPrivate { + enum EEv : ui32 { + EvRuntimeError = EventSpaceBegin(NActors::TEvents::ES_PRIVATE), + EvEnd + }; + + static_assert(EvEnd < EventSpaceEnd(NActors::TEvents::ES_PRIVATE), "expect EvEnd < EventSpaceEnd(TEvents::ES_PRIVATE)"); + + struct TEvAsyncOutputError : public NActors::TEventLocal { + TEvAsyncOutputError(NYql::NDqProto::StatusIds::StatusCode statusCode, const TIssues& issues) + : StatusCode(statusCode) + , Issues(issues) + {} + + NYql::NDqProto::StatusIds::StatusCode StatusCode; + NYql::TIssues Issues; + }; + }; + protected: enum EEvWakeupTag : ui64 { TimeoutTag = 1, From 38dce73324f53f68e8f2e1617cf410957ca4862c Mon Sep 17 00:00:00 2001 From: Gigoriy Pisarenko Date: Mon, 17 Feb 2025 11:04:36 +0000 Subject: [PATCH 3/3] Fixed event name --- ydb/library/yql/dq/actors/compute/dq_compute_actor_impl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 8fb070607dff..1fabcc5b5b10 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 @@ -101,13 +101,13 @@ class TDqComputeActorBase : public NActors::TActorBootstrapped private: struct TEvPrivate { enum EEv : ui32 { - EvRuntimeError = EventSpaceBegin(NActors::TEvents::ES_PRIVATE), + EvAsyncOutputError = EventSpaceBegin(NActors::TEvents::ES_PRIVATE), EvEnd }; static_assert(EvEnd < EventSpaceEnd(NActors::TEvents::ES_PRIVATE), "expect EvEnd < EventSpaceEnd(TEvents::ES_PRIVATE)"); - struct TEvAsyncOutputError : public NActors::TEventLocal { + struct TEvAsyncOutputError : public NActors::TEventLocal { TEvAsyncOutputError(NYql::NDqProto::StatusIds::StatusCode statusCode, const TIssues& issues) : StatusCode(statusCode) , Issues(issues)