From: Ning Yao <zay11022@gmail.com>
Date: Tue, 15 Dec 2015 15:38:53 +0000 (+0800)
Subject: osd: combine map.count() and map.find() into one searching operation
X-Git-Tag: v10.0.3~199^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=79c7ccb903343b52640c6346050d444ba14fb923;p=ceph.git

osd: combine map.count() and map.find() into one searching operation

Signed-off-by: Ning Yao <zay11022@gmail.com>
---

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index e929b72ce174..e8e39af08d01 100644
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -751,14 +751,16 @@ public:
     return p->second.get_size();
   }
   int get_pg_type(pg_t pg) const {
-    assert(pools.count(pg.pool()));
-    return pools.find(pg.pool())->second.get_type();
+    map<int64_t,pg_pool_t>::const_iterator p = pools.find(pg.pool());
+    assert(p != pools.end());
+    return p->second.get_type();
   }
 
 
   pg_t raw_pg_to_pg(pg_t pg) const {
-    assert(pools.count(pg.pool()));
-    return pools.find(pg.pool())->second.raw_pg_to_pg(pg);
+    map<int64_t,pg_pool_t>::const_iterator p = pools.find(pg.pool());
+    assert(p != pools.end());
+    return p->second.raw_pg_to_pg(pg);
   }
 
   // pg -> acting primary osd