From: Samuel Just <sam.just@inktank.com>
Date: Mon, 10 Jun 2013 22:04:43 +0000 (-0700)
Subject: osd_types: move code for pg_log_entry_t::get_key_name into eversion_t
X-Git-Tag: v0.66~50^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fb88873cd56ccd6bd8e51acc9a0691d51fdabdfc;p=ceph.git

osd_types: move code for pg_log_entry_t::get_key_name into eversion_t

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

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);