Fix unstable cpp ut (milvus-io#28083)

Signed-off-by: bigsheeper <[email protected]>
jiaoew1991 · Nov 1, 2023 · 873b29e · 873b29e
1 parent 854c0e8
commit 873b29e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/internal/core/src/storage/ChunkCache.cpp b/internal/core/src/storage/ChunkCache.cpp
@@ -40,7 +40,6 @@ ChunkCache::Read(const std::string& filepath) {
                            strerror(errno)));
 
     columns_.emplace(path, column);
-    mmap_file_locks_.erase(path);
     return column;
 }
 
@@ -71,13 +70,7 @@ ChunkCache::Prefetch(const std::string& filepath) {
 std::shared_ptr<ColumnBase>
 ChunkCache::Mmap(const std::filesystem::path& path,
                  const FieldDataPtr& field_data) {
-    MmapFileLocks::accessor acc;
-    if (!mmap_file_locks_.find(acc, path)) {
-        mmap_file_locks_.insert(
-            acc, std::make_pair(path, std::make_unique<std::mutex>()));
-    }
-    std::unique_lock lck(*acc->second.get());
-    acc.release();
+    std::unique_lock lck(mutex_);
 
     auto dir = path.parent_path();
     std::filesystem::create_directories(dir);

diff --git a/internal/core/src/storage/ChunkCache.h b/internal/core/src/storage/ChunkCache.h
@@ -61,12 +61,8 @@ class ChunkCache {
         oneapi::tbb::concurrent_hash_map<std::string,
                                          std::shared_ptr<ColumnBase>>;
 
-    using MmapFileLocks =
-        oneapi::tbb::concurrent_hash_map<std::string,
-                                         std::unique_ptr<std::mutex>>;
-
  private:
-    MmapFileLocks mmap_file_locks_;
+    mutable std::mutex mutex_;
     int read_ahead_policy_;
     std::string path_prefix_;
     ChunkManagerPtr cm_;