Code Review Updates #4

speedb-io · Aug 25, 2022 · a440fea · a440fea
1 parent 8118efb
commit a440fea
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/db/memtable_list_test.cc b/db/memtable_list_test.cc
@@ -543,9 +543,9 @@ TEST_F(MemTableListTest, GetFromHistoryTest) {
 
 namespace {
 
-void ValidateWbmUsedCounters(const WriteBufferManager& wb, size_t expected_used,
+void ValidateWbmUsedCounters(const WriteBufferManager& wb, size_t expected_mutable,
                              size_t expected_immutable, size_t expected_freed) {
-  ASSERT_EQ(wb.mutable_memtable_memory_usage(), expected_used);
+  ASSERT_EQ(wb.mutable_memtable_memory_usage(), expected_mutable);
   ASSERT_EQ(wb.immmutable_memtable_memory_usage(), expected_immutable);
   ASSERT_EQ(wb.memtable_memory_being_freed_usage(), expected_freed);
 }
@@ -590,8 +590,9 @@ TEST_F(MemTableListTest, FlushPendingTest) {
       mem->Ref();
 
       auto new_total_reserved_mem = wb.mutable_memtable_memory_usage();
-      ASSERT_TRUE(!wbm_enabled ||
-                  (new_total_reserved_mem > total_reserved_mem));
+      if (wbm_enabled) {
+          ASSERT_GT(new_total_reserved_mem, total_reserved_mem);
+      }
       tables_reserved_mem.push_back(new_total_reserved_mem -
                                     total_reserved_mem);
       total_reserved_mem = new_total_reserved_mem;
@@ -952,8 +953,10 @@ TEST_F(MemTableListTest, AtomicFlushTest) {
         mem->Ref();
 
         auto new_total_reserved_mem = wb.mutable_memtable_memory_usage();
-        ASSERT_TRUE(!wbm_enabled ||
-                    (new_total_reserved_mem > total_reserved_mem));
+        if (wbm_enabled) {
+          ASSERT_GT(new_total_reserved_mem, total_reserved_mem);
+        }
+
         tables_cf_reserved_mem[cf_id] +=
             new_total_reserved_mem - total_reserved_mem;
         tables_reserved_mem[cf_id][i] =