Remove WorkerActor code path

4 files changed, 5 insertions, 13 deletions

diff --git a/ydb/core/kqp/proxy/kqp_proxy_service.cpp b/ydb/core/kqp/proxy/kqp_proxy_service.cpp
index 034b69f16ab..f43e8dbc07d 100644
--- a/ydb/core/kqp/proxy/kqp_proxy_service.cpp
+++ b/ydb/core/kqp/proxy/kqp_proxy_service.cpp
@@ -854,9 +854,8 @@ public:
 
                 str << Endl;
 
-                str << "EnableSessionActor: "
-                    << (TableServiceConfig.GetEnableKqpSessionActor() ? "true" : "false") << Endl;
-                str << "Active workers/session_actors count on node: " << LocalSessions->size() << Endl;
+                str << "EnableSessionActor: always on" << Endl;
+                str << "Active session_actors count on node: " << LocalSessions->size() << Endl;
 
                 const auto& sessionsShutdownInFlight = LocalSessions->GetShutdownInFlight();
                 if (!sessionsShutdownInFlight.empty()) {
@@ -1119,10 +1118,8 @@ private:
 
         auto config = CreateConfig(KqpSettings, workerSettings);
 
-        IActor* workerActor = TableServiceConfig.GetEnableKqpSessionActor() && config->HasKqpForceNewEngine()
-                ? CreateKqpSessionActor(SelfId(), sessionId, KqpSettings, workerSettings, ModuleResolverState, Counters)
-                : CreateKqpWorkerActor(SelfId(), sessionId, KqpSettings, workerSettings, ModuleResolverState, Counters);
-        auto workerId = TlsActivationContext->ExecutorThread.RegisterActor(workerActor, TMailboxType::HTSwap, AppData()->UserPoolId);
+        IActor* sessionActor = CreateKqpSessionActor(SelfId(), sessionId, KqpSettings, workerSettings, ModuleResolverState, Counters);
+        auto workerId = TlsActivationContext->ExecutorThread.RegisterActor(sessionActor, TMailboxType::HTSwap, AppData()->UserPoolId);
         TKqpSessionInfo* sessionInfo = LocalSessions->Create(sessionId, workerId, database, dbCounters, supportsBalancing);
 
         KQP_PROXY_LOG_D(requestInfo << "Created new session"
diff --git a/ydb/core/kqp/ut/common/kqp_ut_common.h b/ydb/core/kqp/ut/common/kqp_ut_common.h
index 48c4e99f71a..da640449922 100644
--- a/ydb/core/kqp/ut/common/kqp_ut_common.h
+++ b/ydb/core/kqp/ut/common/kqp_ut_common.h
@@ -81,8 +81,6 @@ struct TKikimrSettings: public TTestFeatureFlagsHolder<TKikimrSettings> {
 
     TKikimrSettings()
     {
-        // default value for tests, can be overwritten by SetFeatureFlags()
-        Y_VERIFY(AppConfig.MutableTableServiceConfig()->GetEnableKqpSessionActor());
         this->SetEnableKqpScanQueryStreamLookup(true);
     }
 
diff --git a/ydb/core/protos/config.proto b/ydb/core/protos/config.proto
index c04909f14ab..1bf98300fa7 100644
--- a/ydb/core/protos/config.proto
+++ b/ydb/core/protos/config.proto
@@ -1182,7 +1182,7 @@ message TTableServiceConfig {
     optional uint32 ForceNewEngineLevel = 22 [default = 0];
     optional uint32 CompileQueryCacheTTLSec = 20 [default = 0];
     optional TQueryReplayConfig QueryReplayConfig = 21;
-    optional bool EnableKqpSessionActor = 23 [default = true];
+    reserved 23; // optional bool EnableKqpSessionActor = 23 [default = true];
 };
 
 // Config describes immediate controls and allows
diff --git a/ydb/core/tx/datashard/datashard_ut_snapshot.cpp b/ydb/core/tx/datashard/datashard_ut_snapshot.cpp
index 95d64a85f66..840a018533d 100644
--- a/ydb/core/tx/datashard/datashard_ut_snapshot.cpp
+++ b/ydb/core/tx/datashard/datashard_ut_snapshot.cpp
@@ -3391,8 +3391,6 @@ Y_UNIT_TEST_SUITE(DataShardSnapshots) {
     }
 
     Y_UNIT_TEST_TWIN(LockedWriteWithAsyncIndex, WithRestart) {
-        constexpr bool UseNewEngine = true;
-
         TPortManager pm;
         TServerSettings::TControls controls;
         controls.MutableDataShardControls()->SetPrioritizedMvccSnapshotReads(1);
@@ -3404,7 +3402,6 @@ Y_UNIT_TEST_SUITE(DataShardSnapshots) {
             .SetUseRealThreads(false)
             .SetEnableMvcc(true)
             .SetEnableMvccSnapshotReads(true)
-            .SetEnableKqpSessionActor(UseNewEngine)
             .SetControls(controls);
 
         Tests::TServer::TPtr server = new TServer(serverSettings);