Merge 8ab7a7a into 9bf348b

Author: zverevgeny

ydb/library/yql/dq/actors/compute/dq_compute_actor.h

@@ -364,9 +364,6 @@ struct TComputeMemoryLimits {
     IMemoryQuotaManager::TPtr MemoryQuotaManager;
 };
 
-//temporary flag to integarate changes in interface
-#define Y_YQL_DQ_TASK_RUNNER_REQUIRES_ALLOCATOR 1
-
 using TTaskRunnerFactory = std::function<
     TIntrusivePtr<IDqTaskRunner>(NKikimr::NMiniKQL::TScopedAlloc& alloc, const TDqTaskSettings& task, NDqProto::EDqStatsMode statsMode, const TLogFunc& logFunc)
 >;

ydb/library/yql/dq/actors/task_runner/task_runner_actor.h

@@ -50,8 +50,6 @@ struct ITaskRunnerActorFactory {
         THolder<NYql::NDq::TDqMemoryQuota>&& memoryQuota = {}) = 0;
 };
 
-// temporary for YQL-17542
-#define Y_YQL_DQ_TASK_RUNNER_ACTOR_FACTORY_COMPATIBILITY_1
 ITaskRunnerActorFactory::TPtr CreateLocalTaskRunnerActorFactory(const TTaskRunnerFactory& factory);
 
 } // namespace NTaskRunnerActor

ydb/library/yql/tools/dq/worker_job/dq_worker.cpp

@@ -333,11 +333,7 @@ namespace NYql::NDq::NWorker {
 
         auto proxyFactory = NTaskRunnerProxy::CreatePipeFactory(pfOptions);
         ITaskRunnerInvokerFactory::TPtr invokerFactory = new TConcurrentInvokerFactory(2*capacity);
-#if defined(Y_YQL_DQ_TASK_RUNNER_ACTOR_FACTORY_COMPATIBILITY_1)
-            auto taskRunnerActorFactory = NTaskRunnerActor::CreateTaskRunnerActorFactory(proxyFactory, invokerFactory, coordinator->GetRuntimeData());
-#else
-        auto taskRunnerActorFactory = NTaskRunnerActor::CreateTaskRunnerActorFactory(proxyFactory, invokerFactory, nullptr, coordinator->GetRuntimeData());
-#endif
+        auto taskRunnerActorFactory = NTaskRunnerActor::CreateTaskRunnerActorFactory(proxyFactory, invokerFactory, coordinator->GetRuntimeData());
 
         TLocalWorkerManagerOptions lwmOptions;
         lwmOptions.Factory = proxyFactory;