clean up, test read twice

Author: kungasc

ydb/core/tablet_flat/shared_cache_s3fifo.h

@@ -4,8 +4,6 @@
 #include <ydb/library/yverify_stream/yverify_stream.h>
 #include <library/cpp/monlib/counters/counters.h>
 #include <library/cpp/monlib/dynamic_counters/counters.h>
-#include <util/generic/ptr.h>
-#include <util/generic/intrlist.h>
 
 namespace NKikimr::NCache {
 
@@ -14,7 +12,7 @@ namespace NKikimr::NCache {
 template <typename TPageKey
         , typename TPageKeyHash
         , typename TPageKeyEqual>
-class TTS3FIFOGhostQueue {
+class TTS3FIFOGhostPageQueue {
     struct TGhostPage {
         TPageKey Key;
         ui64 Size; // zero size is tombstone
@@ -38,7 +36,7 @@ class TTS3FIFOGhostQueue {
     };
 
 public:
-    TTS3FIFOGhostQueue(ui64 limit)
+    TTS3FIFOGhostPageQueue(ui64 limit)
         : Limit(limit)
     {}
 
@@ -66,7 +64,7 @@ class TTS3FIFOGhostQueue {
             Y_DEBUG_ABORT_UNLESS(ghost->Size == size);
             Y_ABORT_UNLESS(Size >= ghost->Size);
             Size -= ghost->Size;
-            ghost->Size = 0;// mark as deleted
+            ghost->Size = 0; // mark as deleted
             GhostsSet.erase(it);
             return true;
         }
@@ -356,7 +354,7 @@ class TS3FIFOCache : public ICacheCache<TPage> {
     TLimit Limit;
     TQueue SmallQueue;
     TQueue MainQueue;
-    TTS3FIFOGhostQueue<TPageKey, TPageKeyHash, TPageKeyEqual> GhostQueue;
+    TTS3FIFOGhostPageQueue<TPageKey, TPageKeyHash, TPageKeyEqual> GhostQueue;
 
 };
 

ydb/core/tablet_flat/shared_cache_s3fifo_ut.cpp

@@ -76,7 +76,7 @@ namespace {
 Y_UNIT_TEST_SUITE(TS3FIFOGhostQueue) {
 
     Y_UNIT_TEST(Add) {
-        TTS3FIFOGhostQueue<TPageKey, TPageKeyHash, TPageKeyEqual> queue(100);
+        TTS3FIFOGhostPageQueue<TPageKey, TPageKeyHash, TPageKeyEqual> queue(100);
         UNIT_ASSERT_VALUES_EQUAL(queue.Dump(), "");
 
         queue.Add(1, 10);
@@ -96,7 +96,7 @@ Y_UNIT_TEST_SUITE(TS3FIFOGhostQueue) {
     }
 
     Y_UNIT_TEST(Erase) {
-        TTS3FIFOGhostQueue<TPageKey, TPageKeyHash, TPageKeyEqual> queue(100);
+        TTS3FIFOGhostPageQueue<TPageKey, TPageKeyHash, TPageKeyEqual> queue(100);
         UNIT_ASSERT_VALUES_EQUAL(queue.Dump(), "");
 
         queue.Add(1, 10);
@@ -118,7 +118,7 @@ Y_UNIT_TEST_SUITE(TS3FIFOGhostQueue) {
     }
 
     Y_UNIT_TEST(Erase_Add) {
-        TTS3FIFOGhostQueue<TPageKey, TPageKeyHash, TPageKeyEqual> queue(100);
+        TTS3FIFOGhostPageQueue<TPageKey, TPageKeyHash, TPageKeyEqual> queue(100);
         UNIT_ASSERT_VALUES_EQUAL(queue.Dump(), "");
 
         queue.Add(1, 10);
@@ -137,15 +137,15 @@ Y_UNIT_TEST_SUITE(TS3FIFOGhostQueue) {
     }
 
     Y_UNIT_TEST(Add_Big) {
-        TTS3FIFOGhostQueue<TPageKey, TPageKeyHash, TPageKeyEqual> queue(100);
+        TTS3FIFOGhostPageQueue<TPageKey, TPageKeyHash, TPageKeyEqual> queue(100);
         UNIT_ASSERT_VALUES_EQUAL(queue.Dump(), "");
 
         queue.Add(1, 101);
         UNIT_ASSERT_VALUES_EQUAL(queue.Dump(), "");
     }
 
     Y_UNIT_TEST(UpdateLimit) {
-        TTS3FIFOGhostQueue<TPageKey, TPageKeyHash, TPageKeyEqual> queue(100);
+        TTS3FIFOGhostPageQueue<TPageKey, TPageKeyHash, TPageKeyEqual> queue(100);
         UNIT_ASSERT_VALUES_EQUAL(queue.Dump(), "");
 
         queue.Add(1, 10);

ydb/core/tablet_flat/ut/ut_shared_sausagecache.cpp

@@ -266,6 +266,25 @@ Y_UNIT_TEST(ThreeLeveledLRU) {
     retried = {};
     env.SendSync(new NFake::TEvExecute{ new TTxReadRow(0, retried) }, true);
     UNIT_ASSERT_VALUES_EQUAL(retried, (TVector<ui32>{1, 1, 1}));
+
+    RestartAndClearCache(env);
+
+    retried = {};
+    for (i64 key = 0; key < 100; ++key) {
+        env.SendSync(new NFake::TEvExecute{ new TTxReadRow(key, retried) }, true);
+        env.SendSync(new NFake::TEvExecute{ new TTxReadRow(key, retried) }, true);
+    }
+    LogCounters(counters);
+    UNIT_ASSERT_DOUBLES_EQUAL(counters->ActiveBytes->Val(), static_cast<i64>(8_MB / 3 * 2), static_cast<i64>(1_MB / 3)); // 2 full layers (fresh & staging)
+    UNIT_ASSERT_VALUES_EQUAL(retried, (TVector<ui32>{200, 100, 14, 2}));
+
+    retried = {};
+    for (i64 key = 0; key < 100; ++key) {
+        env.SendSync(new NFake::TEvExecute{ new TTxReadRow(key, retried) }, true);
+    }
+    LogCounters(counters);
+    UNIT_ASSERT_DOUBLES_EQUAL(counters->ActiveBytes->Val(), static_cast<i64>(8_MB / 3 * 2), static_cast<i64>(1_MB / 3)); // 2 full layers (fresh & staging)
+    UNIT_ASSERT_VALUES_EQUAL(retried, (TVector<ui32>{100, 100, 14}));
 }
 
 Y_UNIT_TEST(S3FIFO) {
@@ -346,6 +365,25 @@ Y_UNIT_TEST(S3FIFO) {
     retried = {};
     env.SendSync(new NFake::TEvExecute{ new TTxReadRow(0, retried) }, true);
     UNIT_ASSERT_VALUES_EQUAL(retried, (TVector<ui32>{1}));
+
+    RestartAndClearCache(env);
+
+    retried = {};
+    for (i64 key = 0; key < 100; ++key) {
+        env.SendSync(new NFake::TEvExecute{ new TTxReadRow(key, retried) }, true);
+        env.SendSync(new NFake::TEvExecute{ new TTxReadRow(key, retried) }, true);
+    }
+    LogCounters(counters);
+    UNIT_ASSERT_DOUBLES_EQUAL(counters->ActiveBytes->Val(), static_cast<i64>(8_MB), static_cast<i64>(1_MB / 3));
+    UNIT_ASSERT_VALUES_EQUAL(retried, (TVector<ui32>{200, 100, 14, 2}));
+
+    retried = {};
+    for (i64 key = 0; key < 100; ++key) {
+        env.SendSync(new NFake::TEvExecute{ new TTxReadRow(key, retried) }, true);
+    }
+    LogCounters(counters);
+    UNIT_ASSERT_DOUBLES_EQUAL(counters->ActiveBytes->Val(), static_cast<i64>(8_MB), static_cast<i64>(1_MB / 3));
+    UNIT_ASSERT_VALUES_EQUAL(retried, (TVector<ui32>{100, 28}));
 }
 
 Y_UNIT_TEST(ReplacementPolicySwitch) {