enable EnableOlapSchemaOperations by default

11 files changed, 11 insertions, 68 deletions

diff --git a/ydb/core/base/feature_flags.h b/ydb/core/base/feature_flags.h
index 75b7158fa71..d733e8abeab 100644
--- a/ydb/core/base/feature_flags.h
+++ b/ydb/core/base/feature_flags.h
@@ -36,10 +36,6 @@ public:
         SetEnableBackgroundCompactionServerless(value);
     }
 
-    inline void SetEnableOlapSchemaOperationsForTest(bool value) {
-        SetEnableOlapSchemaOperations(value);
-    }
-
     inline void SetEnableMvccForTest(bool value) {
         SetEnableMvcc(value
             ? NKikimrConfig::TFeatureFlags::VALUE_TRUE
diff --git a/ydb/core/kqp/ut/kqp_olap_ut.cpp b/ydb/core/kqp/ut/kqp_olap_ut.cpp
index 048b622b9d2..0f4018de230 100644
--- a/ydb/core/kqp/ut/kqp_olap_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_olap_ut.cpp
@@ -513,7 +513,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
     Y_UNIT_TEST_TWIN(SimpleQueryOlap, UseSessionActor) {
         auto settings = TKikimrSettings()
             .SetWithSampleTables(false)
-            .SetEnableOlapSchemaOperations(true)
             .SetEnableKqpSessionActor(UseSessionActor);
         TKikimrRunner kikimr(settings);
 
@@ -546,7 +545,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
     Y_UNIT_TEST_TWIN(SimpleLookupOlap, UseSessionActor) {
         auto settings = TKikimrSettings()
             .SetWithSampleTables(false)
-            .SetEnableOlapSchemaOperations(true)
             .SetEnableKqpSessionActor(UseSessionActor);
         TKikimrRunner kikimr(settings);
 
@@ -578,7 +576,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
     Y_UNIT_TEST_TWIN(SimpleRangeOlap, UseSessionActor) {
         auto settings = TKikimrSettings()
             .SetWithSampleTables(false)
-            .SetEnableOlapSchemaOperations(true)
             .SetEnableKqpSessionActor(UseSessionActor);
         TKikimrRunner kikimr(settings);
 
@@ -611,7 +608,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
     Y_UNIT_TEST_TWIN(CompositeRangeOlap, UseSessionActor) {
         auto settings = TKikimrSettings()
             .SetWithSampleTables(false)
-            .SetEnableOlapSchemaOperations(true)
             .SetEnableKqpSessionActor(UseSessionActor);
         TKikimrRunner kikimr(settings);
 
@@ -771,7 +767,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
     Y_UNIT_TEST_TWIN(QueryOltpAndOlap, UseSessionActor) {
         auto settings = TKikimrSettings()
             .SetWithSampleTables(false)
-            .SetEnableOlapSchemaOperations(true)
             .SetEnableKqpSessionActor(UseSessionActor);
         TKikimrRunner kikimr(settings);
 
@@ -805,7 +800,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
     Y_UNIT_TEST_TWIN(EmptyRange, UseSessionActor) {
         auto settings = TKikimrSettings()
             .SetWithSampleTables(false)
-            .SetEnableOlapSchemaOperations(true)
             .SetEnableKqpSessionActor(UseSessionActor);
         TKikimrRunner kikimr(settings);
 
@@ -829,7 +823,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
     Y_UNIT_TEST_TWIN(Aggregation, UseSessionActor) {
         auto settings = TKikimrSettings()
             .SetWithSampleTables(false)
-            .SetEnableOlapSchemaOperations(true)
             .SetEnableKqpSessionActor(UseSessionActor);
         TKikimrRunner kikimr(settings);
 
@@ -907,7 +900,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         auto doTest = [](std::optional<bool> viaSettings, std::optional<bool> viaPragma, bool pushdownPresent) {
             auto settings = TKikimrSettings()
                 .SetWithSampleTables(false)
-                .SetEnableOlapSchemaOperations(true)
                 .SetEnableKqpSessionActor(UseSessionActor);
 
             if (enableLog) {
@@ -1004,7 +996,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
     Y_UNIT_TEST_TWIN(PKDescScan, UseSessionActor) {
         auto settings = TKikimrSettings()
             .SetWithSampleTables(false)
-            .SetEnableOlapSchemaOperations(true)
             .SetEnableKqpSessionActor(UseSessionActor);
         TKikimrRunner kikimr(settings);
 
@@ -1081,7 +1072,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
     Y_UNIT_TEST_TWIN(ExtractRanges, UseSessionActor) {
         auto settings = TKikimrSettings()
             .SetWithSampleTables(false)
-            .SetEnableOlapSchemaOperations(true)
             .SetEnableKqpSessionActor(UseSessionActor);
         TKikimrRunner kikimr(settings);
 
@@ -1110,7 +1100,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
     Y_UNIT_TEST_TWIN(ExtractRangesReverse, UseSessionActor) {
         auto settings = TKikimrSettings()
             .SetWithSampleTables(false)
-            .SetEnableOlapSchemaOperations(true)
             .SetEnableKqpSessionActor(UseSessionActor);
         TKikimrRunner kikimr(settings);
 
@@ -1142,7 +1131,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         constexpr bool logQueries = false;
         auto settings = TKikimrSettings()
             .SetWithSampleTables(false)
-            .SetEnableOlapSchemaOperations(true)
             .SetEnableKqpSessionActor(UseSessionActor);
         TKikimrRunner kikimr(settings);
 
@@ -1283,7 +1271,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
     Y_UNIT_TEST_TWIN(StatsSysView, UseSessionActor) {
         auto settings = TKikimrSettings()
             .SetWithSampleTables(false)
-            .SetEnableOlapSchemaOperations(true)
             .SetEnableKqpSessionActor(UseSessionActor);
         TKikimrRunner kikimr(settings);
         static ui32 numKinds = 5;
@@ -1326,7 +1313,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
     Y_UNIT_TEST_TWIN(StatsSysViewTable, UseSessionActor) {
         auto settings = TKikimrSettings()
             .SetWithSampleTables(false)
-            .SetEnableOlapSchemaOperations(true)
             .SetEnableKqpSessionActor(UseSessionActor);
         TKikimrRunner kikimr(settings);
         static ui32 numKinds = 5;
@@ -1397,7 +1383,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         Tests::TServer::TPtr server = new Tests::TServer(settings);
 
         server->GetRuntime()->GetAppData().FeatureFlags.SetEnableKqpScanQueryMultipleOlapShardsReads(true);
-        server->GetRuntime()->GetAppData().FeatureFlags.SetEnableOlapSchemaOperationsForTest(true);
 
         auto runtime = server->GetRuntime();
         auto sender = runtime->AllocateEdgeActor();
@@ -1466,7 +1451,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         Tests::TServer::TPtr server = new Tests::TServer(settings);
 
         server->GetRuntime()->GetAppData().FeatureFlags.SetEnableKqpScanQueryMultipleOlapShardsReads(true);
-        server->GetRuntime()->GetAppData().FeatureFlags.SetEnableOlapSchemaOperationsForTest(true);
 
         auto runtime = server->GetRuntime();
         auto sender = runtime->AllocateEdgeActor();
@@ -1555,7 +1539,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
     Y_UNIT_TEST_TWIN(StatsSysViewColumns, UseSessionActor) {
         auto settings = TKikimrSettings()
             .SetWithSampleTables(false)
-            .SetEnableOlapSchemaOperations(true)
             .SetEnableKqpSessionActor(UseSessionActor);
         TKikimrRunner kikimr(settings);
         static ui32 numKinds = 5;
@@ -1617,7 +1600,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
     Y_UNIT_TEST_TWIN(StatsSysViewRanges, UseSessionActor) {
         auto settings = TKikimrSettings()
             .SetWithSampleTables(false)
-            .SetEnableOlapSchemaOperations(true)
             .SetEnableKqpSessionActor(UseSessionActor);
         TKikimrRunner kikimr(settings);
         static ui32 numKinds = 5;
@@ -1704,7 +1686,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
     Y_UNIT_TEST_TWIN(StatsSysViewFilter, UseSessionActor) {
         auto settings = TKikimrSettings()
             .SetWithSampleTables(false)
-            .SetEnableOlapSchemaOperations(true)
             .SetEnableKqpSessionActor(UseSessionActor);
         TKikimrRunner kikimr(settings);
 
@@ -1779,7 +1760,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
     Y_UNIT_TEST_TWIN(StatsSysViewAggregation, UseSessionActor) {
         auto settings = TKikimrSettings()
             .SetWithSampleTables(false)
-            .SetEnableOlapSchemaOperations(true)
             .SetEnableKqpSessionActor(UseSessionActor);
         TKikimrRunner kikimr(settings);
         static ui32 numKinds = 5;
@@ -1958,7 +1938,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         constexpr bool logQueries = true;
         auto settings = TKikimrSettings()
             .SetWithSampleTables(false)
-            .SetEnableOlapSchemaOperations(true)
             .SetEnableKqpSessionActor(UseSessionActor);
         TKikimrRunner kikimr(settings);
 
@@ -2043,7 +2022,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
     Y_UNIT_TEST_TWIN(PredicatePushdownParameterTypesValidation, UseSessionActor) {
         auto settings = TKikimrSettings()
             .SetWithSampleTables(false)
-            .SetEnableOlapSchemaOperations(true)
             .SetEnableKqpSessionActor(UseSessionActor);
         TKikimrRunner kikimr(settings);
 
@@ -2101,7 +2079,6 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
     Y_UNIT_TEST_TWIN(PredicatePushdownCastErrors, UseSessionActor) {
         auto settings = TKikimrSettings()
             .SetWithSampleTables(false)
-            .SetEnableOlapSchemaOperations(true)
             .SetEnableKqpSessionActor(UseSessionActor);
         TKikimrRunner kikimr(settings);
 
diff --git a/ydb/core/kqp/ut/kqp_scan_ut.cpp b/ydb/core/kqp/ut/kqp_scan_ut.cpp
index 9b74df98a47..6c326a5dee4 100644
--- a/ydb/core/kqp/ut/kqp_scan_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_scan_ut.cpp
@@ -1837,7 +1837,6 @@ Y_UNIT_TEST_SUITE(KqpScan) {
     Y_UNIT_TEST_TWIN(LMapFunction, UseSessionActor) {
         auto settings = TKikimrSettings()
             .SetWithSampleTables(false)
-            .SetEnableOlapSchemaOperations(true)
             .SetEnableKqpSessionActor(UseSessionActor);
 
         TKikimrRunner kikimr(settings);
diff --git a/ydb/core/protos/config.proto b/ydb/core/protos/config.proto
index 4df06352d4d..a601216ec0a 100644
--- a/ydb/core/protos/config.proto
+++ b/ydb/core/protos/config.proto
@@ -676,7 +676,7 @@ message TFeatureFlags {
     optional bool EnableAsyncIndexes = 41 [default = true];
     optional bool AllowStreamExecuteYqlScript = 42 [default = true];
     optional bool EnableKqpScanOverPersistentSnapshot = 43 [default = true]; // deprecated: always true
-    optional bool EnableOlapSchemaOperations = 44 [default = false];
+    optional bool EnableOlapSchemaOperations = 44 [default = true];
     optional bool EnableVPatch = 45 [default = false];
     optional bool EnableMvccSnapshotReads = 46 [default = true];
     optional Tribool EnableMvcc = 47 [default = VALUE_TRUE];
diff --git a/ydb/core/tx/schemeshard/ut_helpers/test_env.h b/ydb/core/tx/schemeshard/ut_helpers/test_env.h
index 9611ece55d9..ae7594615ad 100644
--- a/ydb/core/tx/schemeshard/ut_helpers/test_env.h
+++ b/ydb/core/tx/schemeshard/ut_helpers/test_env.h
@@ -38,7 +38,7 @@ namespace NSchemeShardUT_Private {
         OPTION(std::optional<bool>, AllowUpdateChannelsBindingOfSolomonPartitions, std::nullopt);
         OPTION(std::optional<bool>, EnableAsyncIndexes, std::nullopt);
         OPTION(std::optional<bool>, EnableNotNullColumns, std::nullopt);
-        OPTION(std::optional<bool>, EnableOlapSchemaOperations, std::nullopt);
+        OPTION(std::optional<bool>, EnableOlapSchemaOperations, true);
         OPTION(std::optional<bool>, EnableProtoSourceIdInfo, std::nullopt);
         OPTION(std::optional<bool>, EnableBackgroundCompaction, std::nullopt);
         OPTION(std::optional<bool>, DisableStatsBatching, std::nullopt);
diff --git a/ydb/core/tx/schemeshard/ut_olap.cpp b/ydb/core/tx/schemeshard/ut_olap.cpp
index e5899f5272d..0c4466dcac6 100644
--- a/ydb/core/tx/schemeshard/ut_olap.cpp
+++ b/ydb/core/tx/schemeshard/ut_olap.cpp
@@ -130,7 +130,7 @@ void PlanCommit(TTestBasicRuntime& runtime, TActorId& sender, ui64 tabletId, ui6
 Y_UNIT_TEST_SUITE(TOlap) {
     Y_UNIT_TEST(CreateStore) {
         TTestBasicRuntime runtime;
-        TTestEnv env(runtime, TTestEnvOptions().EnableOlapSchemaOperations(true));
+        TTestEnv env(runtime);
         ui64 txId = 100;
 
         const TString& olapSchema = defaultStoreSchema;
@@ -161,7 +161,7 @@ Y_UNIT_TEST_SUITE(TOlap) {
 
     Y_UNIT_TEST(CreateStoreWithDirs) {
         TTestBasicRuntime runtime;
-        TTestEnv env(runtime, TTestEnvOptions().EnableOlapSchemaOperations(true));
+        TTestEnv env(runtime);
         ui64 txId = 100;
 
         TestCreateOlapStore(runtime, ++txId, "/MyRoot", R"(
@@ -184,7 +184,7 @@ Y_UNIT_TEST_SUITE(TOlap) {
 
     Y_UNIT_TEST(CreateTable) {
         TTestBasicRuntime runtime;
-        TTestEnv env(runtime, TTestEnvOptions().EnableOlapSchemaOperations(true));
+        TTestEnv env(runtime);
         ui64 txId = 100;
 
         const TString& olapSchema = defaultStoreSchema;
@@ -314,7 +314,7 @@ Y_UNIT_TEST_SUITE(TOlap) {
 
     Y_UNIT_TEST(CustomDefaultPresets) {
         TTestBasicRuntime runtime;
-        TTestEnv env(runtime, TTestEnvOptions().EnableOlapSchemaOperations(true));
+        TTestEnv env(runtime);
         ui64 txId = 100;
 
         const TString& olapSchema = defaultStoreSchema;
@@ -335,7 +335,7 @@ Y_UNIT_TEST_SUITE(TOlap) {
 
     Y_UNIT_TEST(CreateDropTable) {
         TTestBasicRuntime runtime;
-        TTestEnv env(runtime, TTestEnvOptions().EnableOlapSchemaOperations(true));
+        TTestEnv env(runtime);
         ui64 txId = 100;
 
         const TString& olapSchema = defaultStoreSchema;
@@ -377,7 +377,7 @@ Y_UNIT_TEST_SUITE(TOlap) {
 
     Y_UNIT_TEST(CreateTableTtl) {
         TTestBasicRuntime runtime;
-        TTestEnv env(runtime, TTestEnvOptions().EnableOlapSchemaOperations(true));
+        TTestEnv env(runtime);
         ui64 txId = 100;
 
         TString olapSchema = R"(
@@ -468,7 +468,7 @@ Y_UNIT_TEST_SUITE(TOlap) {
 
     Y_UNIT_TEST(AlterStore) {
         TTestBasicRuntime runtime;
-        TTestEnv env(runtime, TTestEnvOptions().EnableOlapSchemaOperations(true));
+        TTestEnv env(runtime);
         ui64 txId = 100;
 
         const TString& olapSchema = defaultStoreSchema;
@@ -520,7 +520,7 @@ Y_UNIT_TEST_SUITE(TOlap) {
 
     Y_UNIT_TEST(AlterTtl) {
         TTestBasicRuntime runtime;
-        TTestEnv env(runtime, TTestEnvOptions().EnableOlapSchemaOperations(true));
+        TTestEnv env(runtime);
         ui64 txId = 100;
 
         TString olapSchema = R"(
@@ -609,7 +609,7 @@ Y_UNIT_TEST_SUITE(TOlap) {
 
     Y_UNIT_TEST(StoreStats) {
         TTestBasicRuntime runtime;
-        TTestEnv env(runtime, TTestEnvOptions().EnableOlapSchemaOperations(true));
+        TTestEnv env(runtime);
         runtime.SetLogPriority(NKikimrServices::TX_COLUMNSHARD, NActors::NLog::PRI_DEBUG);
         runtime.UpdateCurrentTime(TInstant::Now() - TDuration::Seconds(600));
 
diff --git a/ydb/core/tx/schemeshard/ut_olap_reboots.cpp b/ydb/core/tx/schemeshard/ut_olap_reboots.cpp
index 35d74e0dda0..f07276278e9 100644
--- a/ydb/core/tx/schemeshard/ut_olap_reboots.cpp
+++ b/ydb/core/tx/schemeshard/ut_olap_reboots.cpp
@@ -9,7 +9,6 @@ Y_UNIT_TEST_SUITE(TOlapReboots) {
     Y_UNIT_TEST(CreateStore) {
         TTestWithReboots t(false);
         t.Run([&](TTestActorRuntime& runtime, bool& activeZone) {
-            runtime.GetAppData().FeatureFlags.SetEnableOlapSchemaOperationsForTest(true);
 
             {
                 TInactiveZone inactive(activeZone);
@@ -45,7 +44,6 @@ Y_UNIT_TEST_SUITE(TOlapReboots) {
     Y_UNIT_TEST(CreateTable) {
         TTestWithReboots t(false);
         t.Run([&](TTestActorRuntime& runtime, bool& activeZone) {
-            runtime.GetAppData().FeatureFlags.SetEnableOlapSchemaOperationsForTest(true);
 
             {
                 TInactiveZone inactive(activeZone);
@@ -84,7 +82,6 @@ Y_UNIT_TEST_SUITE(TOlapReboots) {
     Y_UNIT_TEST(CreateDropTable) {
         TTestWithReboots t(false);
         t.Run([&](TTestActorRuntime& runtime, bool& activeZone) {
-            runtime.GetAppData().FeatureFlags.SetEnableOlapSchemaOperationsForTest(true);
 
             {
                 TInactiveZone inactive(activeZone);
@@ -125,7 +122,6 @@ Y_UNIT_TEST_SUITE(TOlapReboots) {
     Y_UNIT_TEST(CreateMultipleTables) {
         TTestWithReboots t(false);
         t.Run([&](TTestActorRuntime& runtime, bool& activeZone) {
-            runtime.GetAppData().FeatureFlags.SetEnableOlapSchemaOperationsForTest(true);
 
             {
                 TInactiveZone inactive(activeZone);
@@ -170,7 +166,6 @@ Y_UNIT_TEST_SUITE(TOlapReboots) {
     Y_UNIT_TEST(DropMultipleTables) {
         TTestWithReboots t(false);
         t.Run([&](TTestActorRuntime& runtime, bool& activeZone) {
-            runtime.GetAppData().FeatureFlags.SetEnableOlapSchemaOperationsForTest(true);
 
             {
                 TInactiveZone inactive(activeZone);
@@ -221,7 +216,6 @@ Y_UNIT_TEST_SUITE(TOlapReboots) {
     Y_UNIT_TEST(CreateDropStore) {
         TTestWithReboots t(false);
         t.Run([&](TTestActorRuntime& runtime, bool& activeZone) {
-            runtime.GetAppData().FeatureFlags.SetEnableOlapSchemaOperationsForTest(true);
 
             {
                 TInactiveZone inactive(activeZone);
@@ -263,7 +257,6 @@ Y_UNIT_TEST_SUITE(TOlapReboots) {
     Y_UNIT_TEST(DropTableThenStore) {
         TTestWithReboots t(false);
         t.Run([&](TTestActorRuntime& runtime, bool& activeZone) {
-            runtime.GetAppData().FeatureFlags.SetEnableOlapSchemaOperationsForTest(true);
 
             {
                 TInactiveZone inactive(activeZone);
@@ -311,7 +304,6 @@ Y_UNIT_TEST_SUITE(TOlapReboots) {
     Y_UNIT_TEST(AlterTtlSettings) {
         TTestWithReboots t(false);
         t.Run([&](TTestActorRuntime& runtime, bool& activeZone) {
-            runtime.GetAppData().FeatureFlags.SetEnableOlapSchemaOperationsForTest(true);
 
             {
                 TInactiveZone inactive(activeZone);
diff --git a/ydb/services/ydb/ydb_bulk_upsert_olap_ut.cpp b/ydb/services/ydb/ydb_bulk_upsert_olap_ut.cpp
index e03928e85c6..3db641abf7d 100644
--- a/ydb/services/ydb/ydb_bulk_upsert_olap_ut.cpp
+++ b/ydb/services/ydb/ydb_bulk_upsert_olap_ut.cpp
@@ -75,7 +75,6 @@ Y_UNIT_TEST_SUITE(YdbTableBulkUpsertOlap) {
 
     Y_UNIT_TEST(UpsertArrowBatch) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableFeatureFlags()->SetEnableOlapSchemaOperations(true);
         TKikimrWithGrpcAndRootSchema server(appConfig);
         server.Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_COLUMNSHARD, NActors::NLog::PRI_DEBUG);
 
@@ -161,7 +160,6 @@ Y_UNIT_TEST_SUITE(YdbTableBulkUpsertOlap) {
 
     Y_UNIT_TEST(UpsertCSV) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableFeatureFlags()->SetEnableOlapSchemaOperations(true);
         TKikimrWithGrpcAndRootSchema server(appConfig);
         server.Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_COLUMNSHARD, NActors::NLog::PRI_DEBUG);
 
diff --git a/ydb/services/ydb/ydb_logstore_ut.cpp b/ydb/services/ydb/ydb_logstore_ut.cpp
index 1097127efac..3aa92c376c4 100644
--- a/ydb/services/ydb/ydb_logstore_ut.cpp
+++ b/ydb/services/ydb/ydb_logstore_ut.cpp
@@ -61,7 +61,6 @@ Y_UNIT_TEST_SUITE(YdbLogStore) {
 
     Y_UNIT_TEST(LogStore) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableFeatureFlags()->SetEnableOlapSchemaOperations(true);
         TKikimrWithGrpcAndRootSchema server(appConfig);
         EnableDebugLogs(server);
 
@@ -105,7 +104,6 @@ Y_UNIT_TEST_SUITE(YdbLogStore) {
 
     Y_UNIT_TEST(LogStoreTiers) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableFeatureFlags()->SetEnableOlapSchemaOperations(true);
         TKikimrWithGrpcAndRootSchema server(appConfig);
         EnableDebugLogs(server);
 
@@ -156,7 +154,6 @@ Y_UNIT_TEST_SUITE(YdbLogStore) {
 
     Y_UNIT_TEST(LogStoreNegative) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableFeatureFlags()->SetEnableOlapSchemaOperations(true);
         TKikimrWithGrpcAndRootSchema server(appConfig);
         EnableDebugLogs(server);
 
@@ -221,7 +218,6 @@ Y_UNIT_TEST_SUITE(YdbLogStore) {
 
     Y_UNIT_TEST(Dirs) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableFeatureFlags()->SetEnableOlapSchemaOperations(true);
         TKikimrWithGrpcAndRootSchema server(appConfig);
         EnableDebugLogs(server);
 
@@ -278,7 +274,6 @@ Y_UNIT_TEST_SUITE(YdbLogStore) {
 
     Y_UNIT_TEST(LogTable) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableFeatureFlags()->SetEnableOlapSchemaOperations(true);
         TKikimrWithGrpcAndRootSchema server(appConfig);
         EnableDebugLogs(server);
 
@@ -417,7 +412,6 @@ Y_UNIT_TEST_SUITE(YdbLogStore) {
 
     Y_UNIT_TEST(AlterLogStore) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableFeatureFlags()->SetEnableOlapSchemaOperations(true);
         TKikimrWithGrpcAndRootSchema server(appConfig);
         EnableDebugLogs(server);
 
@@ -434,7 +428,6 @@ Y_UNIT_TEST_SUITE(YdbLogStore) {
 
     Y_UNIT_TEST(AlterLogTable) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableFeatureFlags()->SetEnableOlapSchemaOperations(true);
         TKikimrWithGrpcAndRootSchema server(appConfig);
         EnableDebugLogs(server);
 
diff --git a/ydb/services/ydb/ydb_long_tx_ut.cpp b/ydb/services/ydb/ydb_long_tx_ut.cpp
index 94518e8e582..7670e711c40 100644
--- a/ydb/services/ydb/ydb_long_tx_ut.cpp
+++ b/ydb/services/ydb/ydb_long_tx_ut.cpp
@@ -122,7 +122,6 @@ Y_UNIT_TEST_SUITE(YdbLongTx) {
 
     Y_UNIT_TEST(BeginWriteCommit) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableFeatureFlags()->SetEnableOlapSchemaOperations(true);
         TKikimrWithGrpcAndRootSchema server(appConfig);
         server.Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_COLUMNSHARD, NActors::NLog::PRI_DEBUG);
 
@@ -150,7 +149,6 @@ Y_UNIT_TEST_SUITE(YdbLongTx) {
 
     Y_UNIT_TEST(BeginWriteRollback) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableFeatureFlags()->SetEnableOlapSchemaOperations(true);
         TKikimrWithGrpcAndRootSchema server(appConfig);
         server.Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_COLUMNSHARD, NActors::NLog::PRI_DEBUG);
 
@@ -178,7 +176,6 @@ Y_UNIT_TEST_SUITE(YdbLongTx) {
 
     Y_UNIT_TEST(BeginRead) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableFeatureFlags()->SetEnableOlapSchemaOperations(true);
         TKikimrWithGrpcAndRootSchema server(appConfig);
         server.Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_COLUMNSHARD, NActors::NLog::PRI_DEBUG);
 
@@ -202,7 +199,6 @@ Y_UNIT_TEST_SUITE(YdbLongTx) {
 
     Y_UNIT_TEST(WriteThenRead) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableFeatureFlags()->SetEnableOlapSchemaOperations(true);
         TKikimrWithGrpcAndRootSchema server(appConfig);
         server.Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_COLUMNSHARD, NActors::NLog::PRI_DEBUG);
 
@@ -280,7 +276,6 @@ Y_UNIT_TEST_SUITE(YdbLongTx) {
 
     Y_UNIT_TEST(ReadFutureSnapshot) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableFeatureFlags()->SetEnableOlapSchemaOperations(true);
         TKikimrWithGrpcAndRootSchema server(appConfig);
         server.Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_COLUMNSHARD, NActors::NLog::PRI_DEBUG);
 
@@ -335,7 +330,6 @@ Y_UNIT_TEST_SUITE(YdbLongTx) {
 
     Y_UNIT_TEST(WriteAclChecks) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableFeatureFlags()->SetEnableOlapSchemaOperations(true);
         appConfig.MutableDomainsConfig()->MutableSecurityConfig()->SetEnforceUserTokenRequirement(true);
         TKikimrWithGrpcAndRootSchema server(appConfig);
         server.Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_COLUMNSHARD, NActors::NLog::PRI_DEBUG);
@@ -399,7 +393,6 @@ Y_UNIT_TEST_SUITE(YdbLongTx) {
 
     Y_UNIT_TEST(ReadAclChecks) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableFeatureFlags()->SetEnableOlapSchemaOperations(true);
         appConfig.MutableDomainsConfig()->MutableSecurityConfig()->SetEnforceUserTokenRequirement(true);
         TKikimrWithGrpcAndRootSchema server(appConfig);
         server.Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_COLUMNSHARD, NActors::NLog::PRI_DEBUG);
@@ -453,7 +446,6 @@ Y_UNIT_TEST_SUITE(YdbLongTx) {
 
     Y_UNIT_TEST(CreateOlapWithDirs) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableFeatureFlags()->SetEnableOlapSchemaOperations(true);
         TKikimrWithGrpcAndRootSchema server(appConfig);
         server.Server_->GetRuntime()->SetLogPriority(NKikimrServices::TX_COLUMNSHARD, NActors::NLog::PRI_DEBUG);
 
diff --git a/ydb/services/ydb/ydb_olapstore_ut.cpp b/ydb/services/ydb/ydb_olapstore_ut.cpp
index f48aee4899a..84294c161bc 100644
--- a/ydb/services/ydb/ydb_olapstore_ut.cpp
+++ b/ydb/services/ydb/ydb_olapstore_ut.cpp
@@ -238,7 +238,6 @@ Y_UNIT_TEST_SUITE(YdbOlapStore) {
 
     Y_UNIT_TEST(BulkUpsert) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableFeatureFlags()->SetEnableOlapSchemaOperations(true);
         TKikimrWithGrpcAndRootSchema server(appConfig);
         EnableDebugLogs(server);
 
@@ -285,7 +284,6 @@ Y_UNIT_TEST_SUITE(YdbOlapStore) {
 
     void TestManyTables(const TString& sharding) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableFeatureFlags()->SetEnableOlapSchemaOperations(true);
         TKikimrWithGrpcAndRootSchema server(appConfig);
         EnableDebugLogs(server);
 
@@ -323,7 +321,6 @@ Y_UNIT_TEST_SUITE(YdbOlapStore) {
 
     void TestDuplicateRows(const TString& sharding) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableFeatureFlags()->SetEnableOlapSchemaOperations(true);
         TKikimrWithGrpcAndRootSchema server(appConfig);
         EnableDebugLogs(server);
 
@@ -374,7 +371,6 @@ Y_UNIT_TEST_SUITE(YdbOlapStore) {
 
     void TestQuery(const TString& query, const TString& sharding) {
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableFeatureFlags()->SetEnableOlapSchemaOperations(true);
         TKikimrWithGrpcAndRootSchema server(appConfig, {}, {}, false, &UdfFrFactory);
 
         auto connection = ConnectToServer(server);