fixup! Correctly test that changing the cache size on live archive has effect.

Author: mgautierfr

include/zim/archive.h

@@ -544,7 +544,7 @@ namespace zim
        *
        * @return The number of clusters currently stored in  the cache.
        */
-      size_t get_cluster_cache_current_size() const;
+      size_t getClusterCacheCurrentSize() const;
 
       /** Set the size of the cluster cache.
        *
@@ -565,7 +565,7 @@ namespace zim
        *
        * @return The number of dirents currently stored in  the cache.
        */
-      size_t get_dirent_cache_current_size() const;
+      size_t getDirentCacheCurrentSize() const;
 
       /** Set the size of the dirent cache.
        *

src/archive.cpp

@@ -509,9 +509,9 @@ namespace zim
     return m_impl->getClusterCacheMaxSize();
   }
 
-  size_t Archive::get_cluster_cache_current_size() const
+  size_t Archive::getClusterCacheCurrentSize() const
   {
-    return m_impl->get_cluster_cache_current_size();
+    return m_impl->getClusterCacheCurrentSize();
   }
 
   void Archive::setClusterCacheMaxSize(size_t nbClusters)
@@ -524,9 +524,9 @@ namespace zim
     return m_impl->getDirentCacheMaxSize();
   }
 
-  size_t Archive::get_dirent_cache_current_size() const
+  size_t Archive::getDirentCacheCurrentSize() const
   {
-    return m_impl->get_dirent_cache_current_size();
+    return m_impl->getDirentCacheCurrentSize();
   }
 
   void Archive::setDirentCacheMaxSize(size_t nbDirents)

src/concurrent_cache.h

@@ -90,7 +90,7 @@ class ConcurrentCache
     return impl_.getMaxSize();
   }
 
-  size_t get_current_size() const {
+  size_t getCurrentSize() const {
     std::unique_lock<std::mutex> l(lock_);
     return impl_.size();
   }

src/dirent_accessor.h

@@ -56,7 +56,7 @@ class LIBZIM_PRIVATE_API DirectDirentAccessor
   entry_index_t getDirentCount() const  {  return m_direntCount; }
 
   size_t getMaxCacheSize() const { return m_direntCache.getMaxSize(); }
-  size_t get_current_cache_size() const { return m_direntCache.size(); }
+  size_t getCurrentCacheSize() const { return m_direntCache.size(); }
   void setMaxCacheSize(size_t nbDirents) const { m_direntCache.setMaxSize(nbDirents); }
 
 private: // functions

src/fileimpl.cpp

@@ -794,8 +794,8 @@ bool checkTitleListing(const IndirectDirentAccessor& accessor, entry_index_type
   size_t FileImpl::getClusterCacheMaxSize() const {
     return clusterCache.getMaxSize();
   }
-  size_t FileImpl::get_cluster_cache_current_size() const {
-    return clusterCache.get_current_size();
+  size_t FileImpl::getClusterCacheCurrentSize() const {
+    return clusterCache.getCurrentSize();
   }
   void FileImpl::setClusterCacheMaxSize(size_t nbClusters) {
     clusterCache.setMaxSize(nbClusters);
@@ -804,8 +804,8 @@ bool checkTitleListing(const IndirectDirentAccessor& accessor, entry_index_type
   size_t FileImpl::getDirentCacheMaxSize() const {
     return mp_pathDirentAccessor->getMaxCacheSize();
   }
-  size_t FileImpl::get_dirent_cache_current_size() const {
-    return mp_pathDirentAccessor->get_current_cache_size();
+  size_t FileImpl::getDirentCacheCurrentSize() const {
+    return mp_pathDirentAccessor->getCurrentCacheSize();
   }
   void FileImpl::setDirentCacheMaxSize(size_t nbDirents) {
     mp_pathDirentAccessor->setMaxCacheSize(nbDirents);

src/fileimpl.h

@@ -154,10 +154,10 @@ namespace zim
       bool checkIntegrity(IntegrityCheck checkType);
 
       size_t getClusterCacheMaxSize() const;
-      size_t get_cluster_cache_current_size() const;
+      size_t getClusterCacheCurrentSize() const;
       void setClusterCacheMaxSize(size_t nbClusters);
       size_t getDirentCacheMaxSize() const;
-      size_t get_dirent_cache_current_size() const;
+      size_t getDirentCacheCurrentSize() const;
       void setDirentCacheMaxSize(size_t nbDirents);
       size_t getDirentLookupCacheMaxSize() const;
       void setDirentLookupCacheMaxSize(size_t nbRanges) { m_direntLookupSize = nbRanges; };

test/archive.cpp

@@ -355,46 +355,46 @@ TEST(ZimArchive, cacheChange)
     auto ref_archive = zim::Archive(testfile.path);
     auto archive = zim::Archive(testfile.path);
 
-    archive.set_dirent_cache_max_size(30);
-    archive.set_cluster_cache_max_size(5);
+    archive.setDirentCacheMaxSize(30);
+    archive.setClusterCacheMaxSize(5);
 
     auto range = ref_archive.iterEfficient();
     auto ref_it = range.begin();
     ASSERT_ARCHIVE_EQUIVALENT_IT_LIMIT(ref_it, range.end(), archive, 50)
-    EXPECT_EQ(archive.get_dirent_cache_current_size(), 30);
-    EXPECT_EQ(archive.get_cluster_cache_current_size(), 2); // Only 2 clusters in the file
+    EXPECT_EQ(archive.getDirentCacheCurrentSize(), 30);
+    EXPECT_EQ(archive.getClusterCacheCurrentSize(), 2); // Only 2 clusters in the file
 
     // Reduce cache size
-    archive.set_dirent_cache_max_size(10);
-    archive.set_cluster_cache_max_size(1);
+    archive.setDirentCacheMaxSize(10);
+    archive.setClusterCacheMaxSize(1);
 
-    EXPECT_EQ(archive.get_dirent_cache_current_size(), 10);
-    EXPECT_EQ(archive.get_cluster_cache_current_size(), 1);
+    EXPECT_EQ(archive.getDirentCacheCurrentSize(), 10);
+    EXPECT_EQ(archive.getClusterCacheCurrentSize(), 1);
 
     // We want to test change of cache while we are iterating on the archive.
     // So we don't reset the ref_it to `range.begin()`.
     ASSERT_ARCHIVE_EQUIVALENT_IT_LIMIT(ref_it, range.end(), archive, 50)
 
-    EXPECT_EQ(archive.get_dirent_cache_current_size(), 10);
-    EXPECT_EQ(archive.get_cluster_cache_current_size(), 1);
+    EXPECT_EQ(archive.getDirentCacheCurrentSize(), 10);
+    EXPECT_EQ(archive.getClusterCacheCurrentSize(), 1);
 
     // Clean cache
     // (More than testing the value, this is needed as we want to be sure the cache is actually populated later)
-    archive.set_dirent_cache_max_size(0);
-    archive.set_cluster_cache_max_size(0);
+    archive.setDirentCacheMaxSize(0);
+    archive.setClusterCacheMaxSize(0);
 
-    EXPECT_EQ(archive.get_dirent_cache_current_size(), 0);
-    EXPECT_EQ(archive.get_cluster_cache_current_size(), 0);
+    EXPECT_EQ(archive.getDirentCacheCurrentSize(), 0);
+    EXPECT_EQ(archive.getClusterCacheCurrentSize(), 0);
 
     // Increase the cache
-    archive.set_dirent_cache_max_size(20);
-    archive.set_cluster_cache_max_size(1);
-    EXPECT_EQ(archive.get_dirent_cache_current_size(), 0);
-    EXPECT_EQ(archive.get_cluster_cache_current_size(), 0);
+    archive.setDirentCacheMaxSize(20);
+    archive.setClusterCacheMaxSize(1);
+    EXPECT_EQ(archive.getDirentCacheCurrentSize(), 0);
+    EXPECT_EQ(archive.getClusterCacheCurrentSize(), 0);
 
     ASSERT_ARCHIVE_EQUIVALENT(ref_archive, archive)
-    EXPECT_EQ(archive.get_dirent_cache_current_size(), 20);
-    EXPECT_EQ(archive.get_cluster_cache_current_size(), 1);
+    EXPECT_EQ(archive.getDirentCacheCurrentSize(), 20);
+    EXPECT_EQ(archive.getClusterCacheCurrentSize(), 1);
   }
 }