Covered cache eviction in ConcurrentCacheXRayTest.simpleFlow

Author: veloman-yunkan

src/lrucache.h

@@ -222,9 +222,11 @@ class lru_cache {
       return;
     }
     _current_cost += extra_cost;
+    log_debug("_current_cost after increase: " << _current_cost);
     while (_current_cost > _max_cost && size() > 1) {
       dropLast();
     }
+    log_debug("settled _current_cost: " << _current_cost);
   }
 
   void decreaseCost(size_t costToRemove) {
@@ -236,6 +238,7 @@ class lru_cache {
     } else {
       _current_cost -= costToRemove;
     }
+    log_debug("_current_cost after decrease: " << _current_cost);
   }
 
 private: // functions

test/concurrentcache.cpp

@@ -43,10 +43,11 @@ TEST(ConcurrentCacheTest, handleException) {
 
 TEST(ConcurrentCacheXRayTest, simpleFlow) {
     zim::Logging::logIntoMemory();
-    zim::ConcurrentCache<int, int, zim::UnitCostEstimation> cache(10);
+    zim::ConcurrentCache<int, int, zim::UnitCostEstimation> cache(1);
     EXPECT_EQ(cache.getOrPut(3, LazyValue(2025)), 2025);
     EXPECT_EQ(cache.getOrPut(3, LazyValue(123)),  2025);
     EXPECT_THROW(cache.getOrPut(2, ExceptionSource()), std::runtime_error);
+    EXPECT_EQ(cache.getOrPut(2, LazyValue(123)),  123);
 
     ASSERT_EQ(zim::Logging::getInMemLogContent(),
 R"(thread#0: ConcurrentCache::getOrPut(3) {
@@ -60,6 +61,8 @@ thread#0:  It was a cache miss. Going to obtain the value...
 thread#0:  Value was successfully obtained. Computing its cost...
 thread#0:  cost=1. Committing to cache...
 thread#0:  lru_cache::increaseCost(1) {
+thread#0:   _current_cost after increase: 1
+thread#0:   settled _current_cost: 1
 thread#0:  }
 thread#0:  Done. Cache cost is at 1
 thread#0: } (return value: 2025)
@@ -81,9 +84,32 @@ thread#0:  Evaluation failed. Releasing the cache slot...
 thread#0:  ConcurrentCache::drop(2) {
 thread#0:   lru_cache::drop(2) {
 thread#0:    lru_cache::decreaseCost(0) {
+thread#0:     _current_cost after decrease: 1
 thread#0:    }
 thread#0:   }
 thread#0:  }
 thread#0: }
+thread#0: ConcurrentCache::getOrPut(2) {
+thread#0:  lru_cache::getOrPut(2) {
+thread#0:   not in cache, adding...
+thread#0:   lru_cache::increaseCost(0) {
+thread#0:   }
+thread#0:  }
+thread#0:  Obtained the cache slot
+thread#0:  It was a cache miss. Going to obtain the value...
+thread#0:  Value was successfully obtained. Computing its cost...
+thread#0:  cost=1. Committing to cache...
+thread#0:  lru_cache::increaseCost(1) {
+thread#0:   _current_cost after increase: 2
+thread#0:   lru_cache::dropLast() {
+thread#0:    evicting entry with key: 3
+thread#0:    lru_cache::decreaseCost(1) {
+thread#0:     _current_cost after decrease: 1
+thread#0:    }
+thread#0:   }
+thread#0:   settled _current_cost: 1
+thread#0:  }
+thread#0:  Done. Cache cost is at 1
+thread#0: } (return value: 123)
 )");
 }