Remove unused actor system ctx param

3 files changed, 32 insertions, 33 deletions

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 862237b5eb..738d17a02e 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
@@ -107,11 +107,11 @@ public:
 private:
     STFUNC(StateFuncBody) {
         switch (ev->GetTypeRewrite()) {
-            HFunc(NTaskRunnerActor::TEvTaskRunFinished, OnRunFinished);
-            HFunc(NTaskRunnerActor::TEvAsyncInputPushFinished, OnAsyncInputPushFinished);
-            HFunc(NTaskRunnerActor::TEvChannelPopFinished, OnPopFinished);
-            HFunc(NTaskRunnerActor::TEvTaskRunnerCreateFinished, OnTaskRunnerCreated);
-            HFunc(NTaskRunnerActor::TEvContinueRun, OnContinueRun); // push finished
+            hFunc(NTaskRunnerActor::TEvTaskRunFinished, OnRunFinished);
+            hFunc(NTaskRunnerActor::TEvAsyncInputPushFinished, OnAsyncInputPushFinished);
+            hFunc(NTaskRunnerActor::TEvChannelPopFinished, OnPopFinished);
+            hFunc(NTaskRunnerActor::TEvTaskRunnerCreateFinished, OnTaskRunnerCreated);
+            hFunc(NTaskRunnerActor::TEvContinueRun, OnContinueRun); // push finished
             hFunc(TEvDqCompute::TEvStateRequest, OnStateRequest);
             hFunc(NTaskRunnerActor::TEvStatistics, OnStatisticsResponse);
             hFunc(NTaskRunnerActor::TEvLoadTaskRunnerFromStateDone, OnTaskRunnerLoaded);
@@ -443,7 +443,7 @@ private:
         return guard;
     }
 
-    void OnTaskRunnerCreated(NTaskRunnerActor::TEvTaskRunnerCreateFinished::TPtr& ev, const NActors::TActorContext& ) {
+    void OnTaskRunnerCreated(NTaskRunnerActor::TEvTaskRunnerCreateFinished::TPtr& ev) {
         const auto& secureParams = ev->Get()->SecureParams;
         const auto& taskParams = ev->Get()->TaskParams;
         const auto& typeEnv = ev->Get()->TypeEnv;
@@ -477,7 +477,7 @@ private:
         return ReadyToCheckpointFlag;
     }
 
-    void OnRunFinished(NTaskRunnerActor::TEvTaskRunFinished::TPtr& ev, const NActors::TActorContext& ) {
+    void OnRunFinished(NTaskRunnerActor::TEvTaskRunFinished::TPtr& ev) {
         if (Stat) {
             Stat->AddCounters2(ev->Get()->Sensors);
         }
@@ -550,7 +550,7 @@ private:
         }
     }
 
-    void OnAsyncInputPushFinished(NTaskRunnerActor::TEvAsyncInputPushFinished::TPtr& ev, const NActors::TActorContext& ) {
+    void OnAsyncInputPushFinished(NTaskRunnerActor::TEvAsyncInputPushFinished::TPtr& ev) {
         auto it = SourcesMap.find(ev->Get()->Index);
         Y_VERIFY(it != SourcesMap.end());
         auto& source = it->second;
@@ -563,7 +563,7 @@ private:
         }
     }
 
-    void OnPopFinished(NTaskRunnerActor::TEvChannelPopFinished::TPtr& ev, const NActors::TActorContext&) {
+    void OnPopFinished(NTaskRunnerActor::TEvChannelPopFinished::TPtr& ev) {
         if (Stat) {
             Stat->AddCounters2(ev->Get()->Sensors);
         }
@@ -674,7 +674,7 @@ private:
         return result;
     }
 
-    void OnContinueRun(NTaskRunnerActor::TEvContinueRun::TPtr& ev, const NActors::TActorContext& ) {
+    void OnContinueRun(NTaskRunnerActor::TEvContinueRun::TPtr& ev) {
         auto it = TakeInputChannelDataRequests.find(ev->Cookie);
         YQL_ENSURE(it != TakeInputChannelDataRequests.end());
 
diff --git a/ydb/library/yql/providers/dq/task_runner_actor/task_runner_actor.cpp b/ydb/library/yql/providers/dq/task_runner_actor/task_runner_actor.cpp
index f539fddbd0..0b375d1544 100644
--- a/ydb/library/yql/providers/dq/task_runner_actor/task_runner_actor.cpp
+++ b/ydb/library/yql/providers/dq/task_runner_actor/task_runner_actor.cpp
@@ -76,12 +76,12 @@ public:
 
     STRICT_STFUNC(Handler, {
         cFunc(NActors::TEvents::TEvPoison::EventType, TTaskRunnerActor::PassAway);
-        HFunc(TEvTaskRunnerCreate, OnDqTask);
-        HFunc(TEvContinueRun, OnContinueRun);
-        HFunc(TEvPop, OnChannelPop);
-        HFunc(TEvPush, OnChannelPush);
-        HFunc(TEvSinkPop, OnSinkPop);
-        HFunc(TEvSinkPopFinished, OnSinkPopFinished);
+        hFunc(TEvTaskRunnerCreate, OnDqTask);
+        hFunc(TEvContinueRun, OnContinueRun);
+        hFunc(TEvPop, OnChannelPop);
+        hFunc(TEvPush, OnChannelPush);
+        hFunc(TEvSinkPop, OnSinkPop);
+        hFunc(TEvSinkPopFinished, OnSinkPopFinished);
     })
 
 private:
@@ -191,12 +191,12 @@ private:
         TActor<TTaskRunnerActor>::PassAway();
     }
 
-    void OnContinueRun(TEvContinueRun::TPtr& ev, const TActorContext& ctx) {
-        Run(ev, ctx);
+    void OnContinueRun(TEvContinueRun::TPtr& ev) {
+        Run(ev);
     }
 
-    void OnChannelPush(TEvPush::TPtr& ev, const NActors::TActorContext& ctx) {
-        auto* actorSystem = ctx.ExecutorThread.ActorSystem;
+    void OnChannelPush(TEvPush::TPtr& ev) {
+        auto* actorSystem = TActivationContext::ActorSystem();
         auto replyTo = ev->Sender;
         auto selfId = SelfId();
         auto hasData = ev->Get()->HasData;
@@ -286,8 +286,8 @@ private:
         });
     }
 
-    void OnChannelPop(TEvPop::TPtr& ev, const NActors::TActorContext& ctx) {
-        auto* actorSystem = ctx.ExecutorThread.ActorSystem;
+    void OnChannelPop(TEvPop::TPtr& ev) {
+        auto* actorSystem = TActivationContext::ActorSystem();
         auto replyTo = ev->Sender;
         auto selfId = SelfId();
         auto cookie = ev->Cookie;
@@ -358,8 +358,7 @@ private:
         });
     }
 
-    void OnSinkPopFinished(TEvSinkPopFinished::TPtr& ev, const NActors::TActorContext& ctx) {
-        Y_UNUSED(ctx);
+    void OnSinkPopFinished(TEvSinkPopFinished::TPtr& ev) {
         auto guard = TaskRunner->BindAllocator();
         NKikimr::NMiniKQL::TUnboxedValueVector batch;
         for (auto& row: ev->Get()->Strings) {
@@ -375,9 +374,9 @@ private:
             ev->Get()->Changed);
     }
 
-    void OnSinkPop(TEvSinkPop::TPtr& ev, const NActors::TActorContext& ctx) {
+    void OnSinkPop(TEvSinkPop::TPtr& ev) {
         auto selfId = SelfId();
-        auto* actorSystem = ctx.ExecutorThread.ActorSystem;
+        auto* actorSystem = TActivationContext::ActorSystem();
 
         Invoker->Invoke([taskRunner=TaskRunner, selfId, actorSystem, ev=std::move(ev), settings=Settings, stageId=StageId] {
             auto cookie = ev->Cookie;
@@ -426,7 +425,7 @@ private:
         });
     }
 
-    void OnDqTask(TEvTaskRunnerCreate::TPtr& ev, const NActors::TActorContext& ctx) {
+    void OnDqTask(TEvTaskRunnerCreate::TPtr& ev) {
         auto replyTo = ev->Sender;
         auto selfId = SelfId();
         auto cookie = ev->Cookie;
@@ -454,7 +453,7 @@ private:
             return;
         }
 
-        auto* actorSystem = ctx.ExecutorThread.ActorSystem;
+        auto* actorSystem = TActivationContext::ActorSystem();
         {
             Yql::DqsProto::TTaskMeta taskMeta;
             ev->Get()->Task.GetMeta().UnpackTo(&taskMeta);
@@ -496,8 +495,8 @@ private:
         });
     }
 
-    void Run(TEvContinueRun::TPtr& ev, const TActorContext& ctx) {
-        auto* actorSystem = ctx.ExecutorThread.ActorSystem;
+    void Run(TEvContinueRun::TPtr& ev) {
+        auto* actorSystem = TActivationContext::ActorSystem();
         auto replyTo = ev->Sender;
         auto selfId = SelfId();
         auto cookie = ev->Cookie;
diff --git a/ydb/library/yql/providers/pq/async_io/dq_pq_read_actor.cpp b/ydb/library/yql/providers/pq/async_io/dq_pq_read_actor.cpp
index 312d677c16..55dbf335d1 100644
--- a/ydb/library/yql/providers/pq/async_io/dq_pq_read_actor.cpp
+++ b/ydb/library/yql/providers/pq/async_io/dq_pq_read_actor.cpp
@@ -238,13 +238,13 @@ public:
 
 private:
     STRICT_STFUNC(StateFunc,
-        HFunc(TEvPrivate::TEvSourceDataReady, Handle);
+        hFunc(TEvPrivate::TEvSourceDataReady, Handle);
     )
 
-    void Handle(TEvPrivate::TEvSourceDataReady::TPtr&, const TActorContext& ctx) {
+    void Handle(TEvPrivate::TEvSourceDataReady::TPtr&) {
         SRC_LOG_T("Source data ready");
         SubscribedOnEvent = false;
-        ctx.Send(ComputeActorId, new TEvNewAsyncInputDataArrived(InputIndex));
+        Send(ComputeActorId, new TEvNewAsyncInputDataArrived(InputIndex));
     }
 
     // IActor & IDqComputeActorAsyncInput