mds: ETableServer more modernization for dencoder

Signed-off-by: Greg Farnum <greg@inktank.com>

diff --git a/src/mds/events/ETableServer.h b/src/mds/events/ETableServer.h
index d66dff71172618ad4ad4bea77cc9e6a39b2aaf55..ee63e47a416248c062c2a197a58d7d1819d2cd9b 100644 (file)
--- a/src/mds/events/ETableServer.h
+++ b/src/mds/events/ETableServer.h
@@ -30,36 +30,16 @@ struct ETableServer : public LogEvent {
   version_t tid;
   version_t version;
 
-  ETableServer() : LogEvent(EVENT_TABLESERVER) { }
+  ETableServer() : LogEvent(EVENT_TABLESERVER), table(0), op(0),
+                  reqid(0), bymds(0), tid(0), version(0) { }
   ETableServer(int t, int o, uint64_t ri, int m, version_t ti, version_t v) :
     LogEvent(EVENT_TABLESERVER),
     table(t), op(o), reqid(ri), bymds(m), tid(ti), version(v) { }
 
-  void encode(bufferlist& bl) const {
-    ENCODE_START(3, 3, bl);
-    ::encode(stamp, bl);
-    ::encode(table, bl);
-    ::encode(op, bl);
-    ::encode(reqid, bl);
-    ::encode(bymds, bl);
-    ::encode(mutation, bl);
-    ::encode(tid, bl);
-    ::encode(version, bl);
-    ENCODE_FINISH(bl);
-  }
-  void decode(bufferlist::iterator &bl) {
-    DECODE_START_LEGACY_COMPAT_LEN(3, 3, 3, bl);
-    if (struct_v >= 2)
-      ::decode(stamp, bl);
-    ::decode(table, bl);
-    ::decode(op, bl);
-    ::decode(reqid, bl);
-    ::decode(bymds, bl);
-    ::decode(mutation, bl);
-    ::decode(tid, bl);
-    ::decode(version, bl);
-    DECODE_FINISH(bl);
-  }
+  void encode(bufferlist& bl) const;
+  void decode(bufferlist::iterator& bl);
+  void dump(Formatter *f) const;
+  static void generate_test_instances(list<ETableServer*>& ls);
 
   void print(ostream& out) {
     out << "ETableServer " << get_mdstable_name(table) 

diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index c3ffd9f4afab3c534fc04f5952cb5ad18a68cd9d..6016edcaaffbb060f4889692e6d49da068925a7d 100644 (file)
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -1484,6 +1484,52 @@ void ESessions::replay(MDS *mds)
 }
 
 
+// -----------------------
+// ETableServer
+
+void ETableServer::encode(bufferlist& bl) const
+{
+  ENCODE_START(3, 3, bl);
+  ::encode(stamp, bl);
+  ::encode(table, bl);
+  ::encode(op, bl);
+  ::encode(reqid, bl);
+  ::encode(bymds, bl);
+  ::encode(mutation, bl);
+  ::encode(tid, bl);
+  ::encode(version, bl);
+  ENCODE_FINISH(bl);
+}
+
+void ETableServer::decode(bufferlist::iterator &bl)
+{
+  DECODE_START_LEGACY_COMPAT_LEN(3, 3, 3, bl);
+  if (struct_v >= 2)
+    ::decode(stamp, bl);
+  ::decode(table, bl);
+  ::decode(op, bl);
+  ::decode(reqid, bl);
+  ::decode(bymds, bl);
+  ::decode(mutation, bl);
+  ::decode(tid, bl);
+  ::decode(version, bl);
+  DECODE_FINISH(bl);
+}
+
+void ETableServer::dump(Formatter *f) const
+{
+  f->dump_int("table id", table);
+  f->dump_int("op", op);
+  f->dump_int("request id", reqid);
+  f->dump_int("by mds", bymds);
+  f->dump_int("tid", tid);
+  f->dump_int("version", version);
+}
+
+void ETableServer::generate_test_instances(list<ETableServer*>& ls)
+{
+  ls.push_back(new ETableServer());
+}
 
 
 void ETableServer::update_segment()

diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index 2f788fdea491e9807159542190a0711574cee0d0..311b89eab1450d4488f5f94adfc7b5edd9222d94 100644 (file)
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -157,6 +157,8 @@ TYPE(ESlaveUpdate)
 TYPE(ESubtreeMap)
 #include "mds/events/ETableClient.h"
 TYPE(ETableClient)
+#include "mds/events/ETableServer.h"
+TYPE(ETableServer)
 
 #ifdef WITH_RADOSGW