rgw: Use unordered_map for cache_map

This should get us better look up speeds.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

diff --git a/src/rgw/rgw_cache.cc b/src/rgw/rgw_cache.cc
index 9706a8e33a49192ee005677213a4dd516fd0be7d..3606b85ca4c572f1821f45f6ea13f1c9bceee364 100644 (file)
--- a/src/rgw/rgw_cache.cc
+++ b/src/rgw/rgw_cache.cc
@@ -16,7 +16,7 @@ int ObjectCache::get(string& name, ObjectCacheInfo& info, uint32_t mask, rgw_cac
     return -ENOENT;
   }
 
-  map<string, ObjectCacheEntry>::iterator iter = cache_map.find(name);
+  auto iter = cache_map.find(name);
   if (iter == cache_map.end()) {
     ldout(cct, 10) << "cache get: name=" << name << " : miss" << dendl;
     if(perfcounter) perfcounter->inc(l_rgw_cache_miss);
@@ -190,7 +190,7 @@ void ObjectCache::remove(string& name)
     return;
   }
 
-  map<string, ObjectCacheEntry>::iterator iter = cache_map.find(name);
+  auto iter = cache_map.find(name);
   if (iter == cache_map.end())
     return;
 

diff --git a/src/rgw/rgw_cache.h b/src/rgw/rgw_cache.h
index 608c8b27c287a79ec941927d59ac5c0254a0d73d..8e4e4fc6427cac902989c67c4b7ca39103c87d79 100644 (file)
--- a/src/rgw/rgw_cache.h
+++ b/src/rgw/rgw_cache.h
@@ -7,6 +7,7 @@
 #include "rgw_rados.h"
 #include <string>
 #include <map>
+#include <unordered_map>
 #include "include/types.h"
 #include "include/utime.h"
 #include "include/assert.h"
@@ -135,7 +136,7 @@ struct ObjectCacheEntry {
 };
 
 class ObjectCache {
-  std::map<string, ObjectCacheEntry> cache_map;
+  std::unordered_map<string, ObjectCacheEntry> cache_map;
   std::deque<string> lru;
   unsigned long lru_size;
   unsigned long lru_counter;