Remove most of New/OldEngine mentions from code. ()

22 files changed, 38 insertions, 123 deletions

diff --git a/ydb/core/kqp/common/kqp_transform.h b/ydb/core/kqp/common/kqp_transform.h
index 856fd8ef76..e5b994a082 100644
--- a/ydb/core/kqp/common/kqp_transform.h
+++ b/ydb/core/kqp/common/kqp_transform.h
@@ -106,10 +106,6 @@ public:
         return DeferredEffects.empty();
     }
 
-    std::optional<TKqpTransactionInfo::EEngine> GetEngine() const {
-        return Engine;
-    }
-
     ui64 Size() const {
         return DeferredEffects.size();
     }
@@ -125,20 +121,15 @@ public:
 private:
     [[nodiscard]]
     bool Add(const NYql::NNodes::TExprBase& node) {
-        if (Engine.has_value() && *Engine != TKqpTransactionInfo::EEngine::OldEngine) {
-            return false;
-        }
-        Engine.emplace(TKqpTransactionInfo::EEngine::OldEngine);
-        DeferredEffects.emplace_back(node);
-        return true;
+        Y_UNUSED(node);
+
+        // TODO: Remove legacy deferred effects
+        YQL_ENSURE(false, "Unexpected deferred effect kind (OldEngine)");
+        return false;
     }
 
     [[nodiscard]]
     bool Add(std::shared_ptr<const NKqpProto::TKqpPhyTx>&& physicalTx, TParamValueMap&& params) {
-        if (Engine.has_value() && *Engine != TKqpTransactionInfo::EEngine::NewEngine) {
-            return false;
-        }
-        Engine.emplace(TKqpTransactionInfo::EEngine::NewEngine);
         DeferredEffects.emplace_back(std::move(physicalTx));
         DeferredEffects.back().Params = std::move(params);
         return true;
@@ -146,12 +137,10 @@ private:
 
     void Clear() {
         DeferredEffects.clear();
-        Engine.reset();
     }
 
 private:
     TVector<TDeferredEffect> DeferredEffects;
-    std::optional<TKqpTransactionInfo::EEngine> Engine;
 
     friend class TKqpTransactionContext;
 };
diff --git a/ydb/core/kqp/common/kqp_tx_info.h b/ydb/core/kqp/common/kqp_tx_info.h
index 0c26981bd3..d3bf26cd55 100644
--- a/ydb/core/kqp/common/kqp_tx_info.h
+++ b/ydb/core/kqp/common/kqp_tx_info.h
@@ -21,15 +21,9 @@ struct TKqpTransactionInfo {
         Aborted
     };
 
-    enum class EEngine {
-        OldEngine,
-        NewEngine
-    };
-
 public:
     EStatus Status;
     EKind Kind;
-    std::optional<EEngine> TxEngine;
     TDuration TotalDuration;
     TDuration ServerDuration;
     ui32 QueriesCount = 0;
diff --git a/ydb/core/kqp/counters/kqp_counters.h b/ydb/core/kqp/counters/kqp_counters.h
index 286b0b76da..29f9158381 100644
--- a/ydb/core/kqp/counters/kqp_counters.h
+++ b/ydb/core/kqp/counters/kqp_counters.h
@@ -382,7 +382,7 @@ struct TKqpRequestCounters : public TThrRefBase {
 
     TIntrusivePtr<TKqpCounters> Counters;
     TIntrusivePtr<TKqpDbCounters> DbCounters; // may be null
-    TIntrusivePtr<NTxProxy::TTxProxyMon> TxProxyMon; // OldEngine compatibility
+    TIntrusivePtr<NTxProxy::TTxProxyMon> TxProxyMon;
 };
 
 } // namespace NKqp
diff --git a/ydb/core/kqp/host/kqp_host.cpp b/ydb/core/kqp/host/kqp_host.cpp
index 3b8c052879..94f83f4f2f 100644
--- a/ydb/core/kqp/host/kqp_host.cpp
+++ b/ydb/core/kqp/host/kqp_host.cpp
@@ -1169,18 +1169,6 @@ public:
         return ImplicitTransaction->GetInfo();
     }
 
-    void ForceTxOldEngine(const TString& txId) override {
-        Y_UNUSED(txId);
-        Y_ENSURE(false, "Unsupported ForceTxOldEngine");
-    }
-
-    void ForceTxNewEngine(const TString& txId, ui32 percent, ui32 level) override {
-        Y_UNUSED(txId);
-        Y_UNUSED(percent);
-        Y_UNUSED(level);
-        Y_ENSURE(false, "Unsupported ForceTxNewEngine");
-    }
-
     TMaybe<TKqpTransactionInfo> GetTransactionInfo(const TString& txId) override {
         auto tx = FindTransaction(txId);
         if (!tx) {
@@ -1649,7 +1637,6 @@ private:
         auto query = std::make_unique<NKikimrKqp::TPreparedQuery>();
         auto settings1 = settings;
 
-        settings1.UseNewEngine = true;
         query->SetVersion(NKikimrKqp::TPreparedQuery::VERSION_PHYSICAL_V1);
         query->MutablePhysicalQuery()->SetType(NKqpProto::TKqpPhyQuery::TYPE_DATA);
 
@@ -1698,7 +1685,6 @@ private:
                 IKikimrQueryExecutor::TExecuteSettings settings;
                 settings.RollbackTx = true;
                 settings.Deadlines.TimeoutAt = TInstant::Now() + TDuration::Minutes(1);
-                settings.UseNewEngine = true;
 
                 return RollbackTransactionInternal(tx, settings, ctx);
             });
@@ -1767,7 +1753,6 @@ private:
         // TODO: Use empty tx context
         TIntrusivePtr<TKikimrTransactionContextBase> tempTxCtx = MakeIntrusive<TKqpTransactionContext>(true);
         IKikimrQueryExecutor::TExecuteSettings execSettings;
-        execSettings.UseNewEngine = settings.UseNewEngine;
         SetupDataQueryAstTransformer(execSettings, tempTxCtx);
 
         SessionCtx->Query().Type = EKikimrQueryType::Dml;
@@ -1924,7 +1909,6 @@ private:
         (*maybeTx)->OnBeginQuery();
 
         TPrepareSettings prepareSettings;
-        prepareSettings.UseNewEngine = settings.UseNewEngine;
         prepareSettings.DocumentApiRestricted = settings.DocumentApiRestricted;
 
         auto prepareResult = isSql
@@ -2233,8 +2217,6 @@ TKqpTransactionInfo TKqpTransactionContext::GetInfo() const {
     txInfo.ServerDuration = QueriesDuration;
     txInfo.QueriesCount = QueriesCount;
 
-    txInfo.TxEngine = DeferredEffects.GetEngine();
-
     return txInfo;
 }
 
diff --git a/ydb/core/kqp/host/kqp_host.h b/ydb/core/kqp/host/kqp_host.h
index 721f04c8c4..c726390327 100644
--- a/ydb/core/kqp/host/kqp_host.h
+++ b/ydb/core/kqp/host/kqp_host.h
@@ -25,12 +25,10 @@ public:
     };
 
     struct TPrepareSettings {
-        TMaybe<bool> UseNewEngine;
         TMaybe<bool> DocumentApiRestricted;
 
         TString ToString() const {
-            return TStringBuilder() << "TPrepareSettings{ UseNewEngine: " << UseNewEngine
-                << ", DocumentApiRestricted: " << DocumentApiRestricted << " }";
+            return TStringBuilder() << "TPrepareSettings{ DocumentApiRestricted: " << DocumentApiRestricted << " }";
         }
     };
 
@@ -43,9 +41,6 @@ public:
 
     virtual TMaybe<TKqpTransactionInfo> GetTransactionInfo() = 0;
 
-    virtual void ForceTxOldEngine(const TString& txId) = 0;
-    virtual void ForceTxNewEngine(const TString& txId, ui32 percent, ui32 level) = 0;
-
     /* Transaction control */
     virtual TBeginTxResult BeginTransaction(NKikimrKqp::EIsolationLevel isolationLevel,
         bool readonly) = 0;
diff --git a/ydb/core/kqp/kqp_ic_gateway.cpp b/ydb/core/kqp/kqp_ic_gateway.cpp
index 5a4a5e737b..8c6aa1ef74 100644
--- a/ydb/core/kqp/kqp_ic_gateway.cpp
+++ b/ydb/core/kqp/kqp_ic_gateway.cpp
@@ -1700,9 +1700,6 @@ public:
             FillParameters(std::move(params), *ev->Record.MutableRequest()->MutableParameters());
         }
 
-        //auto& querySettings = *ev->Record.MutableRequest()->MutableQuerySettings();
-        //querySettings.set_use_new_engine(NYql::GetFlagValue(settings.UseNewEngine));
-
         auto& txControl = *ev->Record.MutableRequest()->MutableTxControl();
         txControl.mutable_begin_tx()->CopyFrom(txSettings);
         txControl.set_commit_tx(true);
@@ -1800,9 +1797,6 @@ public:
             FillParameters(std::move(params), *ev->Record.MutableRequest()->MutableParameters());
         }
 
-        //auto& querySettings = *ev->Record.MutableRequest()->MutableQuerySettings();
-        //querySettings.set_use_new_engine(NYql::GetFlagValue(settings.UseNewEngine));
-
         auto& txControl = *ev->Record.MutableRequest()->MutableTxControl();
         txControl.mutable_begin_tx()->CopyFrom(txSettings);
         txControl.set_commit_tx(true);
diff --git a/ydb/core/kqp/kqp_impl.h b/ydb/core/kqp/kqp_impl.h
index 368d9ca220..adf0fb4db3 100644
--- a/ydb/core/kqp/kqp_impl.h
+++ b/ydb/core/kqp/kqp_impl.h
@@ -93,8 +93,5 @@ Ydb::StatusIds::StatusCode GetYdbStatus(const NYql::TIssues& issues);
 void AddQueryIssues(NKikimrKqp::TQueryResponse& response, const NYql::TIssues& issues);
 bool HasSchemeOrFatalIssues(const NYql::TIssues& issues);
 
-// for tests only
-void FailForcedNewEngineCompilationForTests(bool fail = true);
-
 } // namespace NKqp
 } // namespace NKikimr
diff --git a/ydb/core/kqp/kqp_session_actor.cpp b/ydb/core/kqp/kqp_session_actor.cpp
index 5d2513e89d..93ac42b570 100644
--- a/ydb/core/kqp/kqp_session_actor.cpp
+++ b/ydb/core/kqp/kqp_session_actor.cpp
@@ -583,7 +583,7 @@ public:
         YQL_ENSURE(compileResult->PreparedQuery);
         const ui32 compiledVersion = compileResult->PreparedQuery->GetVersion();
         YQL_ENSURE(compiledVersion == NKikimrKqp::TPreparedQuery::VERSION_PHYSICAL_V1,
-            "SessionActor can not execute OldEngine requests (invalid compiled version: " << compiledVersion << ")");
+            "Unexpected prepared query version: " << compiledVersion);
 
         QueryState->CompileResult = compileResult;
         QueryState->CompileStats.Swap(&ev->Get()->Stats);
diff --git a/ydb/core/kqp/kqp_worker_actor.cpp b/ydb/core/kqp/kqp_worker_actor.cpp
index 3fa3428873..b4f0d24b47 100644
--- a/ydb/core/kqp/kqp_worker_actor.cpp
+++ b/ydb/core/kqp/kqp_worker_actor.cpp
@@ -1344,7 +1344,7 @@ private:
 
         /*
          * TODO:
-         * For Scan/NewEngine plan will be set later on rpc_* level from stats and execution profiles, so
+         * For Scan/Data plan will be set later on rpc_* level from stats and execution profiles, so
          * QUERY_REPLY_FLAG_PLAN doesn't matter much. However it's may be a good idea to move FillQueryStats here,
          * but for that we need to set QueryStats for scan query earlier in pipeline (now ExecutionProfiles are
          * handled in rpc_stream_execute_scan_query). Other option is to remove REPLY_FLAGs at all.
diff --git a/ydb/core/kqp/provider/yql_kikimr_provider.h b/ydb/core/kqp/provider/yql_kikimr_provider.h
index 352ea6ff4b..396bdc1252 100644
--- a/ydb/core/kqp/provider/yql_kikimr_provider.h
+++ b/ydb/core/kqp/provider/yql_kikimr_provider.h
@@ -44,13 +44,10 @@ public:
         bool RawResults = false; // TODO: deprecate
         TMaybe<TString> IsolationLevel; // TODO: deprecate
         TMaybe<bool> StrictDml; // TODO: deprecate
-        TMaybe<bool> UseNewEngine;
         TMaybe<bool> UseScanQuery;
         EKikimrStatsMode StatsMode = EKikimrStatsMode::None;
         TMaybe<bool> DocumentApiRestricted;
         TMaybe<NKikimrKqp::TRlPath> RlPath;
-
-        bool ForceNewEngine() const { return UseNewEngine && *UseNewEngine; }
     };
 
     virtual ~IKikimrQueryExecutor() {}
diff --git a/ydb/core/kqp/ut/CMakeLists.darwin.txt b/ydb/core/kqp/ut/CMakeLists.darwin.txt
index 099ce198dd..f976fcfb61 100644
--- a/ydb/core/kqp/ut/CMakeLists.darwin.txt
+++ b/ydb/core/kqp/ut/CMakeLists.darwin.txt
@@ -47,25 +47,25 @@ target_sources(ydb-core-kqp-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_acl_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_arrow_in_channels_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_document_api_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_effects_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_explain_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_flip_join_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_flowcontrol_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_index_lookup_join_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_indexes_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_indexes_multishard_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_inplace_update_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_join_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_limits_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_locks_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_merge_connection_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_mvcc_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_ne_effects_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_ne_flowcontrol_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_ne_inplace_update_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_ne_perf_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_ne_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_not_null_columns_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_olap_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_params_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_pragma_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_query_perf_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_query_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_scan_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_scheme_ut.cpp
diff --git a/ydb/core/kqp/ut/CMakeLists.linux-aarch64.txt b/ydb/core/kqp/ut/CMakeLists.linux-aarch64.txt
index 4243348b29..f7727b0ec0 100644
--- a/ydb/core/kqp/ut/CMakeLists.linux-aarch64.txt
+++ b/ydb/core/kqp/ut/CMakeLists.linux-aarch64.txt
@@ -49,25 +49,25 @@ target_sources(ydb-core-kqp-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_acl_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_arrow_in_channels_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_document_api_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_effects_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_explain_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_flip_join_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_flowcontrol_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_index_lookup_join_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_indexes_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_indexes_multishard_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_inplace_update_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_join_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_limits_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_locks_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_merge_connection_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_mvcc_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_ne_effects_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_ne_flowcontrol_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_ne_inplace_update_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_ne_perf_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_ne_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_not_null_columns_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_olap_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_params_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_pragma_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_query_perf_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_query_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_scan_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_scheme_ut.cpp
diff --git a/ydb/core/kqp/ut/CMakeLists.linux.txt b/ydb/core/kqp/ut/CMakeLists.linux.txt
index 9e2c302fcb..afcbc8f0b4 100644
--- a/ydb/core/kqp/ut/CMakeLists.linux.txt
+++ b/ydb/core/kqp/ut/CMakeLists.linux.txt
@@ -51,25 +51,25 @@ target_sources(ydb-core-kqp-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_acl_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_arrow_in_channels_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_document_api_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_effects_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_explain_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_flip_join_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_flowcontrol_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_index_lookup_join_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_indexes_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_indexes_multishard_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_inplace_update_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_join_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_limits_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_locks_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_merge_connection_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_mvcc_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_ne_effects_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_ne_flowcontrol_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_ne_inplace_update_ut.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_ne_perf_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_ne_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_not_null_columns_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_olap_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_params_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_pragma_ut.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_query_perf_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_query_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_scan_ut.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/kqp/ut/kqp_scheme_ut.cpp
diff --git a/ydb/core/kqp/ut/kqp_acl_ut.cpp b/ydb/core/kqp/ut/kqp_acl_ut.cpp
index e4bf99bf78..1ea3da6bfe 100644
--- a/ydb/core/kqp/ut/kqp_acl_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_acl_ut.cpp
@@ -9,7 +9,7 @@ namespace NKqp {
 using namespace NYdb;
 using namespace NYdb::NTable;
 
-Y_UNIT_TEST_SUITE(KqpNewEngineAcl) {
+Y_UNIT_TEST_SUITE(KqpAcl) {
     Y_UNIT_TEST(FailNavigate) {
         TKikimrRunner kikimr("user0@builtin");
 
diff --git a/ydb/core/kqp/ut/kqp_ne_effects_ut.cpp b/ydb/core/kqp/ut/kqp_effects_ut.cpp
index b8dca5c860..445136b701 100644
--- a/ydb/core/kqp/ut/kqp_ne_effects_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_effects_ut.cpp
@@ -8,7 +8,7 @@ namespace NKqp {
 using namespace NYdb;
 using namespace NYdb::NTable;
 
-Y_UNIT_TEST_SUITE(KqpNewEngineEffects) {
+Y_UNIT_TEST_SUITE(KqpEffects) {
     Y_UNIT_TEST(InsertAbort_Literal_Success) {
         auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
diff --git a/ydb/core/kqp/ut/kqp_explain_ut.cpp b/ydb/core/kqp/ut/kqp_explain_ut.cpp
index 22a5b9dc40..70df769112 100644
--- a/ydb/core/kqp/ut/kqp_explain_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_explain_ut.cpp
@@ -441,24 +441,7 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
         UNIT_ASSERT_EQUAL(unionNode.GetMap().at("Plans").GetArraySafe().size(), 4);
     }
 
-    Y_UNIT_TEST(ExplainDataQueryOldEngine) {
-        auto kikimr = DefaultKikimrRunner();
-        auto db = kikimr.GetTableClient();
-        auto session = db.CreateSession().GetValueSync().GetSession();
-
-        auto result = session.ExplainDataQuery(R"(
-            SELECT Key, Value FROM `/Root/KeyValue` WHERE Key IN (1, 2, 3, 42) ORDER BY Key;
-        )").ExtractValueSync();
-        result.GetIssues().PrintTo(Cerr);
-
-        NJson::TJsonValue plan;
-        NJson::ReadJsonTree(result.GetPlan(), &plan, true);
-        UNIT_ASSERT(ValidatePlanNodeIds(plan));
-
-        UNIT_ASSERT_EQUAL(plan.GetMapSafe().at("tables").GetArraySafe()[0].GetMapSafe().at("name").GetStringSafe(), "/Root/KeyValue");
-    }
-
-    Y_UNIT_TEST(ExplainDataQueryNewEngine) {
+    Y_UNIT_TEST(ExplainDataQuery) {
         auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
diff --git a/ydb/core/kqp/ut/kqp_ne_flowcontrol_ut.cpp b/ydb/core/kqp/ut/kqp_flowcontrol_ut.cpp
index 9bc95479d0..376e55e152 100644
--- a/ydb/core/kqp/ut/kqp_ne_flowcontrol_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_flowcontrol_ut.cpp
@@ -59,11 +59,12 @@ void DoFlowControlTest(ui64 limit, bool hasBlockedByCapacity) {
         .SetAppConfig(appCfg)
         .SetKqpSettings({})
         .SetEnableKqpScanQueryStreamLookup(false);
+
     TKikimrRunner kikimr{kikimrSettings};
-//    kikimr.GetTestServer().GetRuntime()->SetLogPriority(NKikimrServices::KQP_EXECUTER, NActors::NLog::PRI_DEBUG);
-//    kikimr.GetTestServer().GetRuntime()->SetLogPriority(NKikimrServices::KQP_COMPUTE, NActors::NLog::PRI_DEBUG);
-//    kikimr.GetTestServer().GetRuntime()->SetLogPriority(NKikimrServices::KQP_GATEWAY, NActors::NLog::PRI_DEBUG);
-//    kikimr.GetTestServer().GetRuntime()->SetLogPriority(NKikimrServices::KQP_RESOURCE_MANAGER, NActors::NLog::PRI_DEBUG);
+    // kikimr.GetTestServer().GetRuntime()->SetLogPriority(NKikimrServices::KQP_EXECUTER, NActors::NLog::PRI_DEBUG);
+    // kikimr.GetTestServer().GetRuntime()->SetLogPriority(NKikimrServices::KQP_COMPUTE, NActors::NLog::PRI_DEBUG);
+    // kikimr.GetTestServer().GetRuntime()->SetLogPriority(NKikimrServices::KQP_GATEWAY, NActors::NLog::PRI_DEBUG);
+    // kikimr.GetTestServer().GetRuntime()->SetLogPriority(NKikimrServices::KQP_RESOURCE_MANAGER, NActors::NLog::PRI_DEBUG);
 
     CreateSampleTables(kikimr);
     auto db = kikimr.GetTableClient();
diff --git a/ydb/core/kqp/ut/kqp_ne_inplace_update_ut.cpp b/ydb/core/kqp/ut/kqp_inplace_update_ut.cpp
index bf3c944cd3..39eae8229f 100644
--- a/ydb/core/kqp/ut/kqp_ne_inplace_update_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_inplace_update_ut.cpp
@@ -8,7 +8,7 @@ namespace NKqp {
 using namespace NYdb;
 using namespace NYdb::NTable;
 
-Y_UNIT_TEST_SUITE(KqpNewEngineInplaceUpdate) {
+Y_UNIT_TEST_SUITE(KqpInplaceUpdate) {
 
 void PrepareTable(TSession& session) {
     auto ret = session.ExecuteSchemeQuery(R"(
diff --git a/ydb/core/kqp/ut/kqp_ne_perf_ut.cpp b/ydb/core/kqp/ut/kqp_query_perf_ut.cpp
index 5389d273cc..816bcec8a2 100644
--- a/ydb/core/kqp/ut/kqp_ne_perf_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_query_perf_ut.cpp
@@ -119,7 +119,7 @@ TParams BuildInsertIndexParams(TTableClient& client) {
 
 } // namespace
 
-Y_UNIT_TEST_SUITE(KqpPerf) {
+Y_UNIT_TEST_SUITE(KqpQueryPerf) {
     Y_UNIT_TEST(Upsert) {
         auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
@@ -145,7 +145,7 @@ Y_UNIT_TEST_SUITE(KqpPerf) {
 
         auto& stats = NYdb::TProtoAccessor::GetProto(*result.GetStats());
 
-        // TODO: Get rid of additional precompute stage for adding optionality to row members in NewEngine
+        // TODO: Get rid of additional precompute stage for adding optionality to row members
         UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 2);
 
         for (const auto& phase : stats.query_phases()) {
@@ -178,7 +178,7 @@ Y_UNIT_TEST_SUITE(KqpPerf) {
 
         auto& stats = NYdb::TProtoAccessor::GetProto(*result.GetStats());
 
-        // Single-phase REPLACE in NewEngine require additional runtime write callable
+        // Single-phase REPLACE require additional runtime write callable
         UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 2);
 
         for (const auto& phase : stats.query_phases()) {
@@ -211,7 +211,7 @@ Y_UNIT_TEST_SUITE(KqpPerf) {
 
         auto& stats = NYdb::TProtoAccessor::GetProto(*result.GetStats());
 
-        // Two-phase UPDATE ON in NewEngine require more complex runtime callables
+        // Two-phase UPDATE ON require more complex runtime callables
         UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 3);
 
         for (const auto& phase : stats.query_phases()) {
@@ -244,7 +244,7 @@ Y_UNIT_TEST_SUITE(KqpPerf) {
 
         auto& stats = NYdb::TProtoAccessor::GetProto(*result.GetStats());
 
-        // Three-phase INSERT in NewEngine require more complex runtime callables
+        // Three-phase INSERT require more complex runtime callables
         UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 4);
 
         for (const auto& phase : stats.query_phases()) {
@@ -277,7 +277,7 @@ Y_UNIT_TEST_SUITE(KqpPerf) {
 
         auto& stats = NYdb::TProtoAccessor::GetProto(*result.GetStats());
 
-        // TODO: Get rid of additional precompute stage for adding optionality to row members in NewEngine
+        // TODO: Get rid of additional precompute stage for adding optionality to row members
         UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 2);
 
         for (const auto& phase : stats.query_phases()) {
diff --git a/ydb/core/kqp/ut/kqp_stats_ut.cpp b/ydb/core/kqp/ut/kqp_stats_ut.cpp
index 7c97c8c5d2..d8253a9afc 100644
--- a/ydb/core/kqp/ut/kqp_stats_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_stats_ut.cpp
@@ -208,23 +208,6 @@ Y_UNIT_TEST(DataQueryWithEffects) {
     UNIT_ASSERT_EQUAL(node.GetMap().at("Stats").GetMapSafe().at("TotalTasks").GetIntegerSafe(), 2);
 }
 
-Y_UNIT_TEST(DataQueryOldEngine) {
-    auto kikimr = DefaultKikimrRunner();
-    auto db = kikimr.GetTableClient();
-    auto session = db.CreateSession().GetValueSync().GetSession();
-
-    TExecDataQuerySettings settings;
-    settings.CollectQueryStats(ECollectQueryStatsMode::Full);
-
-    auto result = session.ExecuteDataQuery(R"(
-
-        UPSERT INTO `/Root/TwoShard`
-        SELECT Key + 1u AS Key, Value1 FROM `/Root/TwoShard`;
-    )", TTxControl::BeginTx(TTxSettings::SerializableRW()).CommitTx(), settings).ExtractValueSync();
-    result.GetIssues().PrintTo(Cerr);
-    AssertSuccessResult(result);
-}
-
 Y_UNIT_TEST(DataQueryMulti) {
     auto kikimr = DefaultKikimrRunner();
     auto db = kikimr.GetTableClient();
diff --git a/ydb/core/protos/kqp.proto b/ydb/core/protos/kqp.proto
index e6601be250..65ad8a6bb9 100644
--- a/ydb/core/protos/kqp.proto
+++ b/ydb/core/protos/kqp.proto
@@ -71,7 +71,7 @@ message TKqlSettings {
     optional bool RollbackTx = 2;
     optional bool RawResults = 3;
     optional EIsolationLevel IsolationLevel = 5;
-    optional bool NewEngine = 6;
+    reserved 6; // (deprecated) NewEngine
 };
 
 message TTopicOperations {
diff --git a/ydb/core/sys_view/ut_kqp.cpp b/ydb/core/sys_view/ut_kqp.cpp
index 9f51991dd7..898272e5ca 100644
--- a/ydb/core/sys_view/ut_kqp.cpp
+++ b/ydb/core/sys_view/ut_kqp.cpp
@@ -261,7 +261,7 @@ Y_UNIT_TEST_SUITE(SystemView) {
         }
     }
 
-    Y_UNIT_TEST(PartitionStatsOneSchemeShardDataQueryNewEngine) {
+    Y_UNIT_TEST(PartitionStatsOneSchemeShardDataQuery) {
         TTestEnv env;
         CreateTenantsAndTables(env, false);