RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 17:08:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1131 from ceph/use-unordered-map

Browse Source 
osd: use ceph:: scoped hash_map

Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2014-01-23 09:27:03 -08:00
commit d8bafaebd0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/osd/PGLog.cc
View File

@ -18,6 +18,7 @@
#include "PGLog.h"
#include "PG.h"
#include "SnapMapper.h"
#include "../include/unordered_map.h"
#define dout_subsys ceph_subsys_osd
@ -183,7 +184,7 @@ void PGLog::proc_replica_log(ObjectStore::Transaction& t,
break;
}
hash_map<hobject_t, pg_log_entry_t*>::const_iterator i =
ceph::unordered_map<hobject_t, pg_log_entry_t*>::const_iterator i =
log.objects.find(oe.soid);
if (i != log.objects.end() && i->second->version == oe.version) {
dout(10) << " had " << oe << " new " << *(i->second)
@ -253,7 +254,7 @@ bool PGLog::_merge_old_entry(
<< " : beyond last_backfill" << dendl;
return false;
}
hash_map<hobject_t, pg_log_entry_t*>::const_iterator objiter =
ceph::unordered_map<hobject_t, pg_log_entry_t*>::const_iterator objiter =
log.objects.find(oe.soid);
if (objiter != log.objects.end()) {
pg_log_entry_t &ne = *(objiter->second); // new(er?) entry