From 161596ac58962ca7ef06f05bca3e24ac10ac7606 Mon Sep 17 00:00:00 2001 From: kungasc Date: Thu, 4 Jul 2024 16:03:26 +0000 Subject: [PATCH 1/2] fix executor default --- ydb/core/tablet_flat/flat_executor_ut.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ydb/core/tablet_flat/flat_executor_ut.cpp b/ydb/core/tablet_flat/flat_executor_ut.cpp index 5f9552f6f833..64e6db8b01d9 100644 --- a/ydb/core/tablet_flat/flat_executor_ut.cpp +++ b/ydb/core/tablet_flat/flat_executor_ut.cpp @@ -6228,13 +6228,15 @@ Y_UNIT_TEST_SUITE(TFlatTableExecutorBTreeIndex) { } }; - Y_UNIT_TEST(EnableLocalDBBtreeIndex_Default) { // uses b-tree index + Y_UNIT_TEST(EnableLocalDBBtreeIndex_Default) { // uses flat index TMyEnvBase env; TRowsModel rows; auto &appData = env->GetAppData(); UNIT_ASSERT_VALUES_EQUAL(appData.FeatureFlags.HasEnableLocalDBBtreeIndex(), false); UNIT_ASSERT_VALUES_EQUAL(appData.FeatureFlags.HasEnableLocalDBFlatIndex(), false); + UNIT_ASSERT_VALUES_EQUAL(appData.FeatureFlags.GetEnableLocalDBBtreeIndex(), false); + UNIT_ASSERT_VALUES_EQUAL(appData.FeatureFlags.GetEnableLocalDBFlatIndex(), true); auto counters = MakeIntrusive(env->GetDynamicCounters()); int readRows = 0, failedAttempts = 0; @@ -6250,8 +6252,8 @@ Y_UNIT_TEST_SUITE(TFlatTableExecutorBTreeIndex) { env.SendSync(new NFake::TEvCompact(TRowsModel::TableId)); env.WaitFor(); - // all pages are always kept in shared cache (except flat index) - UNIT_ASSERT_VALUES_EQUAL(counters->ActivePages->Val(), 334); + // all pages are always kept in shared cache + UNIT_ASSERT_VALUES_EQUAL(counters->ActivePages->Val(), 290); env.SendSync(new NFake::TEvExecute{ new TTxFullScan(readRows, failedAttempts) }); UNIT_ASSERT_VALUES_EQUAL(readRows, 1000); @@ -6264,7 +6266,7 @@ Y_UNIT_TEST_SUITE(TFlatTableExecutorBTreeIndex) { // after restart we have no pages in private cache env.SendSync(new NFake::TEvExecute{ new TTxFullScan(readRows, failedAttempts) }, true); UNIT_ASSERT_VALUES_EQUAL(readRows, 1000); - UNIT_ASSERT_VALUES_EQUAL(failedAttempts, 330); + UNIT_ASSERT_VALUES_EQUAL(failedAttempts, 288); } Y_UNIT_TEST(EnableLocalDBBtreeIndex_True) { // uses b-tree index From 8319edb1d518a8ffed81cb2444550c4fbbd5f834 Mon Sep 17 00:00:00 2001 From: kungasc Date: Thu, 4 Jul 2024 16:30:44 +0000 Subject: [PATCH 2/2] fix follower test --- ydb/core/tx/datashard/datashard_ut_followers.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ydb/core/tx/datashard/datashard_ut_followers.cpp b/ydb/core/tx/datashard/datashard_ut_followers.cpp index f32604f21b8b..49b738f97dc4 100644 --- a/ydb/core/tx/datashard/datashard_ut_followers.cpp +++ b/ydb/core/tx/datashard/datashard_ut_followers.cpp @@ -426,7 +426,8 @@ Y_UNIT_TEST_SUITE(DataShardFollowers) { Cerr << "Captured pages request" << Endl; for (auto pageId : msg->Fetch->Pages) { auto type = NTable::NPage::EPage(msg->Fetch->PageCollection->Page(pageId).Type); - UNIT_ASSERT_C(type != NTable::EPage::BTreeIndex && type != NTable::EPage::FlatIndex, "Index pages should be preload during a part switch"); + // Note: FlatIndex pages also have been preloaded, but don't stick in private cache (see TLoaderEnv) + UNIT_ASSERT_C(type != NTable::EPage::BTreeIndex, "Index pages should be preload during a part switch"); } });