fixup! Ensure cluster cache is properly clean in case of exception in constructor.

Author: mgautierfr

src/fileimpl.cpp

@@ -248,7 +248,8 @@ class Grouping
       const_cast<entry_index_t&>(m_endUserEntry) = getCountArticles();
     }
 
-    // Following code will may create cluster and
+    // Following code will may create cluster and we want to remove them from cache
+    // if something goes wrong.
     try {
       auto result = tmpDirentLookup.find('X', "listing/titleOrdered/v1");
       if (result.first) {
@@ -268,17 +269,16 @@ class Grouping
 
       readMimeTypes();
     } catch (...) {
-      dropCachedCluster();
+      dropCachedClusters();
       throw;
     }
   }
 
   FileImpl::~FileImpl() {
-    // We have to clean the global cache for our clusters.
-    dropCachedCluster();
+    dropCachedClusters();
   }
 
-  void FileImpl::dropCachedCluster() const {
+  void FileImpl::dropCachedClusters() const {
     getClusterCache().dropAll([=](const std::tuple<FileImpl*, cluster_index_type>& key) {return std::get<0>(key) == this;});
   }
 

src/fileimpl.h

@@ -166,7 +166,7 @@ namespace zim
       explicit FileImpl(std::shared_ptr<FileCompound> zimFile);
       FileImpl(std::shared_ptr<FileCompound> zimFile, offset_t offset, zsize_t size);
 
-      void dropCachedCluster() const;
+      void dropCachedClusters() const;
 
       std::unique_ptr<IndirectDirentAccessor> getTitleAccessorV1(const entry_index_t idx);
       std::unique_ptr<IndirectDirentAccessor> getTitleAccessor(const offset_t offset, const zsize_t size, const std::string& name);