remove set enable mvcc in datashard ut tests

ydb/core/base/feature_flags.h

@@ -24,10 +24,6 @@ public:
         }
     }
 
-    inline void SetEnableMvccSnapshotReadsForTest(bool value) {
-        SetEnableMvccSnapshotReads(value);
-    }
-
     inline void SetEnableBackgroundCompactionForTest(bool value) {
         SetEnableBackgroundCompaction(value);
     }
@@ -39,12 +35,6 @@ public:
     inline void SetEnableBorrowedSplitCompactionForTest(bool value) {
         SetEnableBorrowedSplitCompaction(value);
     }
-
-    inline void SetEnableMvccForTest(bool value) {
-        SetEnableMvcc(value
-            ? NKikimrConfig::TFeatureFlags::VALUE_TRUE
-            : NKikimrConfig::TFeatureFlags::VALUE_FALSE);
-    }
 };
 
 } // NKikimr

ydb/core/client/flat_ut.cpp

@@ -3172,10 +3172,11 @@ Y_UNIT_TEST_SUITE(TFlatTest) {
         UNIT_ASSERT_VALUES_EQUAL(partitions.size(), 6);
     }
 
+/*  // to be fixed in KIKIMR-17201
     Y_UNIT_TEST(AutoSplitMergeQueue) {
         TPortManager pm;
         ui16 port = pm.GetPort(2134);
-        TServer cleverServer = TServer(TServerSettings(port).SetEnableMvcc(false));
+        TServer cleverServer = TServer(TServerSettings(port).SetKeepSnapshotTimeout(TDuration::Seconds(1)));
         DisableSplitMergePartCountLimit(cleverServer);
 
         cleverServer.GetRuntime()->SetLogPriority(NKikimrServices::OPS_COMPACT, NActors::NLog::PRI_ERROR);
@@ -3247,6 +3248,7 @@ Y_UNIT_TEST_SUITE(TFlatTest) {
         UNIT_ASSERT_VALUES_EQUAL_C(finalPartitions.size(), 1, "Empty table didn't merge into 1 shard");
         UNIT_ASSERT_VALUES_UNEQUAL_C(finalPartitions[0], initialPartitions[0], "Partitions din't change");
     }
+*/
 
     Y_UNIT_TEST(GetTabletCounters) {
         TPortManager pm;

ydb/core/testlib/basics/appdata.cpp

@@ -58,13 +58,8 @@ namespace NKikimr {
         app->MeteringConfig = MeteringConfig;
         app->FeatureFlags = FeatureFlags;
 
-        if (app->FeatureFlags.GetEnableMvcc() && !*app->FeatureFlags.GetEnableMvcc()) {
-            // Make sure we don't try to use snapshot isolation without mvcc
-            app->FeatureFlags.SetEnableMvccSnapshotReadsForTest(false);
-        } else {
-            // This is a special setting active in test runtime only
-            app->EnableMvccSnapshotWithLegacyDomainRoot = true;
-        }
+        // This is a special setting active in test runtime only
+        app->EnableMvccSnapshotWithLegacyDomainRoot = true;
 
         auto tempKeys = std::move(Keys);
         auto keyGenerator = [tempKeys] (ui32 node) {

ydb/core/testlib/basics/feature_flags.h

@@ -45,18 +45,6 @@ public:
     FEATURE_FLAG_SETTER(EnableDataShardVolatileTransactions)
     FEATURE_FLAG_SETTER(EnableTopicServiceTx)
 
-    TDerived& SetEnableMvcc(std::optional<bool> value) {
-        if (value) {
-            if (*value) {
-                FeatureFlags.SetEnableMvcc(NKikimrConfig::TFeatureFlags::VALUE_TRUE);
-            } else {
-                FeatureFlags.SetEnableMvcc(NKikimrConfig::TFeatureFlags::VALUE_FALSE);
-            }
-        }
-
-        return *static_cast<TDerived*>(this);
-    }
-
     #undef FEATURE_FLAG_SETTER
 };
 

ydb/core/tx/datashard/datashard_ut_common.cpp

@@ -30,6 +30,7 @@ const bool ENABLE_DATASHARD_LOG = true;
 const bool DUMP_RESULT = false;
 
 void TTester::Setup(TTestActorRuntime& runtime, const TOptions& opts) {
+    Y_UNUSED(opts);
     if (ENABLE_DATASHARD_LOG) {
         runtime.SetLogPriority(NKikimrServices::TX_DATASHARD, NActors::NLog::PRI_TRACE);
     }
@@ -40,7 +41,6 @@ void TTester::Setup(TTestActorRuntime& runtime, const TOptions& opts) {
 
     TAppPrepare app;
 
-    app.SetEnableMvcc(opts.Mvcc);
 
     auto domain = TDomainsInfo::TDomain::ConstructDomainWithExplicitTabletIds(
                       "dc-1", domainId, FAKE_SCHEMESHARD_TABLET_ID,

ydb/core/tx/datashard/datashard_ut_common.h

@@ -456,21 +456,6 @@ struct TShardedTableOptions {
 #undef TABLE_OPTION_IMPL
 };
 
-#define Y_UNIT_TEST_WITH_MVCC_IMPL(N, OPT)                                                                         \
-    template<bool OPT> void N(NUnitTest::TTestContext&);                                                           \
-    struct TTestRegistration##N {                                                                                  \
-        TTestRegistration##N() {                                                                                   \
-            TCurrentTest::AddTest(#N, static_cast<void (*)(NUnitTest::TTestContext&)>(&N<false>), false);          \
-            TCurrentTest::AddTest("Mvcc" #N, static_cast<void (*)(NUnitTest::TTestContext&)>(&N<true>), false);    \
-        }                                                                                                          \
-    };                                                                                                             \
-    static TTestRegistration##N testRegistration##N;                                                               \
-    template<bool OPT>                                                                                             \
-    void N(NUnitTest::TTestContext&)
-
-#define Y_UNIT_TEST_WITH_MVCC(N) Y_UNIT_TEST_WITH_MVCC_IMPL(N, UseMvcc)
-#define WithMvcc UseMvcc
-
 #define Y_UNIT_TEST_QUAD(N, OPT1, OPT2)                                                                                              \
     template<bool OPT1, bool OPT2> void N(NUnitTest::TTestContext&);                                                                 \
     struct TTestRegistration##N {                                                                                                    \

ydb/core/tx/datashard/datashard_ut_erase_rows.cpp

@@ -355,11 +355,10 @@ void DistributedEraseTx(
 } // anonymous
 
 Y_UNIT_TEST_SUITE(EraseRowsTests) {
-    void EraseRowsShouldSuccess(TMaybe<ui64> injectSchemaVersion, bool enableMvcc) {
+    void EraseRowsShouldSuccess(TMaybe<ui64> injectSchemaVersion) {
         TPortManager pm;
         TServerSettings serverSettings(pm.GetPort(2134));
         serverSettings
-            .SetEnableMvcc(enableMvcc)
             .SetDomainName("Root")
             .SetUseRealThreads(false);
 
@@ -386,15 +385,14 @@ Y_UNIT_TEST_SUITE(EraseRowsTests) {
         UNIT_ASSERT_STRINGS_EQUAL(StripInPlace(content), "key = 3, value = 2020-04-15T00:00:00.000000Z");
     }
 
-    Y_UNIT_TEST_WITH_MVCC(EraseRowsShouldSuccess) {
-        EraseRowsShouldSuccess(Nothing(), WithMvcc);
+    Y_UNIT_TEST(EraseRowsShouldSuccess) {
+        EraseRowsShouldSuccess(Nothing());
     }
 
-    Y_UNIT_TEST_WITH_MVCC(EraseRowsShouldFailOnVariousErrors) {
+    Y_UNIT_TEST(EraseRowsShouldFailOnVariousErrors) {
         TPortManager pm;
         TServerSettings serverSettings(pm.GetPort(2134));
         serverSettings
-            .SetEnableMvcc(WithMvcc)
             .SetDomainName("Root")
             .SetUseRealThreads(false);
 
@@ -427,13 +425,12 @@ Y_UNIT_TEST_SUITE(EraseRowsTests) {
             TProto::TEvEraseResponse::SCHEME_ERROR, "Cell count doesn't match row scheme");
     }
 
-    void ConditionalEraseShouldSuccess(const TString& ttlColType, EUnit unit, const TString& toUpload, const TString& afterErase, bool enableMvcc = false) {
+    void ConditionalEraseShouldSuccess(const TString& ttlColType, EUnit unit, const TString& toUpload, const TString& afterErase) {
         using TEvResponse = TEvDataShard::TEvConditionalEraseRowsResponse;
 
         TPortManager pm;
         TServerSettings serverSettings(pm.GetPort(2134));
         serverSettings
-            .SetEnableMvcc(enableMvcc)
             .SetDomainName("Root")
             .SetUseRealThreads(false);
 
@@ -457,7 +454,7 @@ Y_UNIT_TEST_SUITE(EraseRowsTests) {
         UNIT_ASSERT_STRINGS_EQUAL(StripInPlace(content), Strip(afterErase));
     }
 
-    Y_UNIT_TEST_WITH_MVCC(ConditionalEraseRowsShouldErase) {
+    Y_UNIT_TEST(ConditionalEraseRowsShouldErase) {
         ConditionalEraseShouldSuccess("Timestamp", TUnit::AUTO, R"(
 UPSERT INTO `/Root/table-1` (key, value) VALUES
 (1, CAST("1970-01-01T00:00:00.000000Z" AS Timestamp)),
@@ -467,10 +464,10 @@ UPSERT INTO `/Root/table-1` (key, value) VALUES
         )", R"(
 key = 3, value = 2030-04-15T00:00:00.000000Z
 key = 4, value = (empty maybe)
-        )", WithMvcc);
+        )");
     }
 
-    Y_UNIT_TEST_WITH_MVCC(ConditionalEraseRowsShouldNotErase) {
+    Y_UNIT_TEST(ConditionalEraseRowsShouldNotErase) {
         ConditionalEraseShouldSuccess("Timestamp", TUnit::AUTO, R"(
 UPSERT INTO `/Root/table-1` (key, value) VALUES
 (1, CAST("2030-04-15T00:00:00.000000Z" AS Timestamp)),
@@ -480,10 +477,10 @@ UPSERT INTO `/Root/table-1` (key, value) VALUES
 key = 1, value = 2030-04-15T00:00:00.000000Z
 key = 2, value = 2030-04-15T00:00:00.000000Z
 key = 3, value = 2030-04-15T00:00:00.000000Z
-        )", WithMvcc);
+        )");
     }
 
-    Y_UNIT_TEST_WITH_MVCC(ConditionalEraseRowsShouldEraseOnUint32) {
+    Y_UNIT_TEST(ConditionalEraseRowsShouldEraseOnUint32) {
         ConditionalEraseShouldSuccess("Uint32", TUnit::SECONDS, R"(
 UPSERT INTO `/Root/table-1` (key, value) VALUES
 (1, 0),
@@ -493,10 +490,10 @@ UPSERT INTO `/Root/table-1` (key, value) VALUES
         )", R"(
 key = 3, value = 1902441600
 key = 4, value = (empty maybe)
-        )", WithMvcc);
+        )");
     }
 
-    Y_UNIT_TEST_WITH_MVCC(ConditionalEraseRowsShouldEraseOnUint64Seconds) {
+    Y_UNIT_TEST(ConditionalEraseRowsShouldEraseOnUint64Seconds) {
         ConditionalEraseShouldSuccess("Uint64", TUnit::SECONDS, R"(
 UPSERT INTO `/Root/table-1` (key, value) VALUES
 (1, 0),
@@ -506,10 +503,10 @@ UPSERT INTO `/Root/table-1` (key, value) VALUES
         )", R"(
 key = 3, value = 1902441600
 key = 4, value = (empty maybe)
-        )", WithMvcc);
+        )");
     }
 
-    Y_UNIT_TEST_WITH_MVCC(ConditionalEraseRowsShouldEraseOnUint64MilliSeconds) {
+    Y_UNIT_TEST(ConditionalEraseRowsShouldEraseOnUint64MilliSeconds) {
         ConditionalEraseShouldSuccess("Uint64", TUnit::MILLISECONDS, R"(
 UPSERT INTO `/Root/table-1` (key, value) VALUES
 (1, 0),
@@ -519,10 +516,10 @@ UPSERT INTO `/Root/table-1` (key, value) VALUES
         )", R"(
 key = 3, value = 1902441600000
 key = 4, value = (empty maybe)
-        )", WithMvcc);
+        )");
     }
 
-    Y_UNIT_TEST_WITH_MVCC(ConditionalEraseRowsShouldEraseOnUint64MicroSeconds) {
+    Y_UNIT_TEST(ConditionalEraseRowsShouldEraseOnUint64MicroSeconds) {
         ConditionalEraseShouldSuccess("Uint64", TUnit::MICROSECONDS, R"(
 UPSERT INTO `/Root/table-1` (key, value) VALUES
 (1, 0),
@@ -532,10 +529,10 @@ UPSERT INTO `/Root/table-1` (key, value) VALUES
         )", R"(
 key = 3, value = 1902441600000000
 key = 4, value = (empty maybe)
-        )", WithMvcc);
+        )");
     }
 
-    Y_UNIT_TEST_WITH_MVCC(ConditionalEraseRowsShouldEraseOnUint64NanoSeconds) {
+    Y_UNIT_TEST(ConditionalEraseRowsShouldEraseOnUint64NanoSeconds) {
         ConditionalEraseShouldSuccess("Uint64", TUnit::NANOSECONDS, R"(
 UPSERT INTO `/Root/table-1` (key, value) VALUES
 (1, 0),
@@ -545,10 +542,10 @@ UPSERT INTO `/Root/table-1` (key, value) VALUES
         )", R"(
 key = 3, value = 1902441600000000000
 key = 4, value = (empty maybe)
-        )", WithMvcc);
+        )");
     }
 
-    Y_UNIT_TEST_WITH_MVCC(ConditionalEraseRowsShouldEraseOnDyNumberSeconds) {
+    Y_UNIT_TEST(ConditionalEraseRowsShouldEraseOnDyNumberSeconds) {
         ConditionalEraseShouldSuccess("DyNumber", TUnit::SECONDS, R"(
 --!syntax_v1
 UPSERT INTO `/Root/table-1` (key, value) VALUES
@@ -563,10 +560,10 @@ UPSERT INTO `/Root/table-1` (key, value) VALUES
 key = 5, value = .19024416e10
 key = 6, value = .6362496e12
 key = 7, value = (empty maybe)
-        )", WithMvcc);
+        )");
     }
 
-    Y_UNIT_TEST_WITH_MVCC(ConditionalEraseRowsShouldEraseOnDyNumberMilliSeconds) {
+    Y_UNIT_TEST(ConditionalEraseRowsShouldEraseOnDyNumberMilliSeconds) {
         ConditionalEraseShouldSuccess("DyNumber", TUnit::MILLISECONDS, R"(
 --!syntax_v1
 UPSERT INTO `/Root/table-1` (key, value) VALUES
@@ -579,10 +576,10 @@ UPSERT INTO `/Root/table-1` (key, value) VALUES
 key = 3, value = .19024416e13
 key = 4, value = .6362496e15
 key = 5, value = (empty maybe)
-        )", WithMvcc);
+        )");
     }
 
-    Y_UNIT_TEST_WITH_MVCC(ConditionalEraseRowsShouldEraseOnDyNumberMicroSeconds) {
+    Y_UNIT_TEST(ConditionalEraseRowsShouldEraseOnDyNumberMicroSeconds) {
         ConditionalEraseShouldSuccess("DyNumber", TUnit::MICROSECONDS, R"(
 --!syntax_v1
 UPSERT INTO `/Root/table-1` (key, value) VALUES
@@ -598,10 +595,10 @@ UPSERT INTO `/Root/table-1` (key, value) VALUES
 key = 6, value = .19024416e16
 key = 7, value = .99999999999999999999999999999999999999e126
 key = 8, value = (empty maybe)
-        )", WithMvcc);
+        )");
     }
 
-    Y_UNIT_TEST_WITH_MVCC(ConditionalEraseRowsShouldEraseOnDyNumberNanoSeconds) {
+    Y_UNIT_TEST(ConditionalEraseRowsShouldEraseOnDyNumberNanoSeconds) {
         ConditionalEraseShouldSuccess("DyNumber", TUnit::NANOSECONDS, R"(
 --!syntax_v1
 UPSERT INTO `/Root/table-1` (key, value) VALUES
@@ -612,16 +609,15 @@ UPSERT INTO `/Root/table-1` (key, value) VALUES
         )", R"(
 key = 3, value = .19024416e19
 key = 4, value = (empty maybe)
-        )", WithMvcc);
+        )");
     }
 
-    Y_UNIT_TEST_WITH_MVCC(ConditionalEraseRowsShouldFailOnVariousErrors) {
+    Y_UNIT_TEST(ConditionalEraseRowsShouldFailOnVariousErrors) {
         using TEvResponse = TEvDataShard::TEvConditionalEraseRowsResponse;
 
         TPortManager pm;
         TServerSettings serverSettings(pm.GetPort(2134));
         serverSettings
-            .SetEnableMvcc(WithMvcc)
             .SetDomainName("Root")
             .SetUseRealThreads(false);
 
@@ -661,15 +657,14 @@ key = 4, value = (empty maybe)
         }
     }
 
-    Y_UNIT_TEST_WITH_MVCC(ConditionalEraseRowsShouldBreakLocks) {
+    Y_UNIT_TEST_TWIN(ConditionalEraseRowsShouldBreakLocks, StreamLookup) {
         using TEvResponse = TEvDataShard::TEvConditionalEraseRowsResponse;
 
         TPortManager pm;
         NKikimrConfig::TAppConfig appConfig;
-        appConfig.MutableTableServiceConfig()->SetEnableKqpDataQueryStreamLookup(WithMvcc);
+        appConfig.MutableTableServiceConfig()->SetEnableKqpDataQueryStreamLookup(StreamLookup);
         TServerSettings serverSettings(pm.GetPort(2134));
         serverSettings
-            .SetEnableMvcc(WithMvcc)
             .SetAppConfig(appConfig)
             .SetDomainName("Root")
             .SetUseRealThreads(false);
@@ -717,13 +712,12 @@ key = 4, value = (empty maybe)
         }
     }
 
-    Y_UNIT_TEST_WITH_MVCC(ConditionalEraseRowsShouldNotEraseModifiedRows) {
+    Y_UNIT_TEST(ConditionalEraseRowsShouldNotEraseModifiedRows) {
         using TEvResponse = TEvDataShard::TEvConditionalEraseRowsResponse;
 
         TPortManager pm;
         TServerSettings serverSettings(pm.GetPort(2134));
         serverSettings
-            .SetEnableMvcc(WithMvcc)
             .SetDomainName("Root")
             .SetUseRealThreads(false);
 

ydb/core/tx/datashard/datashard_ut_followers.cpp

@@ -16,7 +16,6 @@ Y_UNIT_TEST_SUITE(DataShardFollowers) {
         TPortManager pm;
         TServerSettings serverSettings(pm.GetPort(2134));
         serverSettings.SetDomainName("Root")
-            .SetEnableMvcc(true)
             .SetUseRealThreads(false);
 
         Tests::TServer::TPtr server = new TServer(serverSettings);

ydb/core/tx/datashard/datashard_ut_init.cpp

@@ -51,48 +51,6 @@ TString GetTablePath(TTestActorRuntime &runtime,
 }
 
 Y_UNIT_TEST_SUITE(TTxDataShardTestInit) {
-    Y_UNIT_TEST(TestMvccStateSwitch) {
-        TPortManager pm;
-        TServerSettings serverSettings(pm.GetPort(2134));
-        serverSettings.SetDomainName("Root")
-            .SetEnableMvcc(true)
-            .SetUseRealThreads(false);
-
-        Tests::TServer::TPtr server = new TServer(serverSettings);
-        auto &runtime = *server->GetRuntime();
-        auto sender = runtime.AllocateEdgeActor();
-        runtime.SetLogPriority(NKikimrServices::TX_DATASHARD, NLog::PRI_DEBUG);
-        InitRoot(server, sender);
-
-        CreateShardedTable(server, sender, "/Root", "table-1", 1);
-
-        auto tabletId = GetTableShards(server, sender, "/Root/table-1")[0];
-        auto actorId = ResolveTablet(runtime, tabletId);
-        auto datashard = dynamic_cast<NDataShard::TDataShard*>(runtime.FindActor(actorId));
-
-        UNIT_ASSERT_EQUAL(datashard->GetSnapshotManager().GetMvccState(), NDataShard::EMvccState::MvccEnabled);
-
-        runtime.GetAppData().FeatureFlags.SetEnableMvccForTest(false);
-
-        GracefulRestartTablet(runtime, tabletId, sender);
-
-        auto waitFor = [&](const auto& condition, const TString& description) {
-            if (!condition()) {
-                Cerr << "... waiting for " << description << Endl;
-                TDispatchOptions options;
-                options.CustomFinalCondition = [&]() {
-                    return condition();
-                };
-                runtime.DispatchEvents(options);
-                UNIT_ASSERT_C(condition(), "... failed to wait for " << description);
-            }
-        };
-
-        actorId = ResolveTablet(runtime, tabletId);
-        datashard = dynamic_cast<NDataShard::TDataShard*>(runtime.FindActor(actorId));
-
-        waitFor([&]{ return datashard->GetSnapshotManager().GetMvccState() == NDataShard::EMvccState::MvccDisabled; }, "mvcc disabled");
-    }
 
     Y_UNIT_TEST(TestGetShardStateAfterInitialization) {
         TTestBasicRuntime runtime;

ydb/core/tx/datashard/datashard_ut_kqp_scan.cpp

@@ -49,7 +49,7 @@ Y_UNIT_TEST_SUITE(KqpScan) {
      * kill tablet after that. So in order to complete scan ComputeActor need to handle scan restart after
      * each ScanData.
      */
-    Y_UNIT_TEST_WITH_MVCC(ScanRetryRead) {
+    Y_UNIT_TEST(ScanRetryRead) {
         NKikimrConfig::TAppConfig appCfg;
 
         auto* rm = appCfg.MutableTableServiceConfig()->MutableResourceManager();
@@ -59,7 +59,6 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         TPortManager pm;
         TServerSettings serverSettings(pm.GetPort(2134));
         serverSettings.SetDomainName("Root")
-            .SetEnableMvcc(WithMvcc)
             .SetNodeCount(2)
             .SetAppConfig(appCfg)
             .SetUseRealThreads(false);
@@ -158,13 +157,12 @@ Y_UNIT_TEST_SUITE(KqpScan) {
     /*
      * Force remote scans by meddling with EvShardsResolveStatus. Check that remote scan actually took place.
      */
-    Y_UNIT_TEST_WITH_MVCC(RemoteShardScan) {
+    Y_UNIT_TEST(RemoteShardScan) {
         NKikimrConfig::TAppConfig appCfg;
 
         TPortManager pm;
         TServerSettings serverSettings(pm.GetPort(2134));
         serverSettings.SetDomainName("Root")
-            .SetEnableMvcc(WithMvcc)
             .SetNodeCount(2)
             .SetAppConfig(appCfg)
             .SetUseRealThreads(false);
@@ -245,7 +243,7 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         UNIT_ASSERT_VALUES_EQUAL(result, 596400);
     }
 
-    Y_UNIT_TEST_WITH_MVCC(ScanDuringSplitThenMerge) {
+    Y_UNIT_TEST(ScanDuringSplitThenMerge) {
        NKikimrConfig::TAppConfig appCfg;
 
         auto* rm = appCfg.MutableTableServiceConfig()->MutableResourceManager();
@@ -255,7 +253,6 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         TPortManager pm;
         TServerSettings serverSettings(pm.GetPort(2134));
         serverSettings.SetDomainName("Root")
-            .SetEnableMvcc(WithMvcc)
             .SetNodeCount(2)
             .SetAppConfig(appCfg)
             .SetUseRealThreads(false);
@@ -378,7 +375,7 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         UNIT_ASSERT_VALUES_EQUAL(result, 596400);
     }
 
-    Y_UNIT_TEST_WITH_MVCC(ScanDuringSplit) {
+    Y_UNIT_TEST(ScanDuringSplit) {
        NKikimrConfig::TAppConfig appCfg;
 
         auto* rm = appCfg.MutableTableServiceConfig()->MutableResourceManager();
@@ -388,7 +385,6 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         TPortManager pm;
         TServerSettings serverSettings(pm.GetPort(2134));
         serverSettings.SetDomainName("Root")
-            .SetEnableMvcc(WithMvcc)
             .SetNodeCount(2)
             .SetAppConfig(appCfg)
             .SetUseRealThreads(false);
@@ -495,7 +491,7 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         UNIT_ASSERT_VALUES_EQUAL(result, 596400);
     }
 
-    Y_UNIT_TEST_WITH_MVCC(ScanRetryReadRanges) {
+    Y_UNIT_TEST(ScanRetryReadRanges) {
         Y_UNUSED(EnableLogging);
 
         NKikimrConfig::TAppConfig appCfg;
@@ -507,7 +503,6 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         TPortManager pm;
         TServerSettings serverSettings(pm.GetPort(2134));
         serverSettings.SetDomainName("Root")
-            .SetEnableMvcc(WithMvcc)
             .SetNodeCount(2)
             .SetAppConfig(appCfg)
             .SetUseRealThreads(false);