diff options
| author | Samuel Just <sam.just@inktank.com> | 2013-06-10 15:04:43 -0700 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2013-06-17 14:50:52 -0700 |
| commit | fb88873cd56ccd6bd8e51acc9a0691d51fdabdfc (patch) | |
| tree | 7609e4d2fccb021202509e676c88766d3f270a82 | |
| parent | b73aa30e47bd9b108551b89014b73b0a4dad13ce (diff) | |
| download | ceph-fb88873cd56ccd6bd8e51acc9a0691d51fdabdfc.tar.gz | |
osd_types: move code for pg_log_entry_t::get_key_name into eversion_t
Signed-off-by: Samuel Just <sam.just@inktank.com>
| -rw-r--r-- | src/osd/osd_types.cc | 13 | ||||
| -rw-r--r-- | src/osd/osd_types.h | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index 25eeacb4b41..2f05bb9c246 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -478,6 +478,15 @@ std::string pg_state_string(int state) } +// -- eversion_t -- +string eversion_t::get_key_name() const +{ + char key[40]; + snprintf( + key, sizeof(key), "%010u.%020llu", epoch, (long long unsigned)version); + return string(key); +} + // -- pool_snap_info_t -- void pool_snap_info_t::dump(Formatter *f) const @@ -1778,9 +1787,7 @@ void pg_query_t::generate_test_instances(list<pg_query_t*>& o) string pg_log_entry_t::get_key_name() const { - char key[40]; - snprintf(key, sizeof(key), "%010u.%020llu", version.epoch, (long long unsigned)version.version); - return string(key); + return version.get_key_name(); } void pg_log_entry_t::encode_with_checksum(bufferlist& bl) const diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index aafaa67b2bc..a266fff24ee 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -467,6 +467,8 @@ public: version++; } + string get_key_name() const; + void encode(bufferlist &bl) const { ::encode(version, bl); ::encode(epoch, bl); |