From 43e42994cbe6d0d17c6c1c9454f3ba544d92007e Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Mon, 14 Apr 2025 08:50:17 +0200
Subject: [PATCH] refactor(block_cache): phmap is as least as fast as F14 (and
 smaller)

---
 src/reader/internal/block_cache.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/reader/internal/block_cache.cpp b/src/reader/internal/block_cache.cpp
index 560dba6b..ea36c4ce 100644
--- a/src/reader/internal/block_cache.cpp
+++ b/src/reader/internal/block_cache.cpp
@@ -44,10 +44,11 @@
 #include <fmt/format.h>
 
 #include <folly/container/EvictingCacheMap.h>
-#include <folly/container/F14Map.h>
 #include <folly/stats/Histogram.h>
 #include <folly/system/ThreadName.h>
 
+#include <parallel_hashmap/phmap.h>
+
 #include <dwarfs/logger.h>
 #include <dwarfs/mmif.h>
 #include <dwarfs/performance_monitor.h>
@@ -783,18 +784,19 @@ class block_cache_ final : public block_cache::impl {
 
   using lru_type =
       folly::EvictingCacheMap<size_t, std::shared_ptr<cached_block>>;
+  template <typename Key, typename Value>
+  using fast_map_type = phmap::flat_hash_map<Key, Value>;
 
   mutable std::mutex mx_;
   mutable lru_type cache_;
-  mutable folly::F14FastMap<size_t,
-                            std::vector<std::weak_ptr<block_request_set>>>
+  mutable fast_map_type<size_t, std::vector<std::weak_ptr<block_request_set>>>
       active_;
   std::thread tidy_thread_;
   std::condition_variable tidy_cond_;
   bool tidy_running_{false};
 
   mutable std::mutex mx_dec_;
-  mutable folly::F14FastMap<size_t, std::weak_ptr<block_request_set>>
+  mutable fast_map_type<size_t, std::weak_ptr<block_request_set>>
       decompressing_;
 
   mutable std::atomic<size_t> blocks_created_{0};