mds: ETableClient more modernization for dencoder

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

diff --git a/src/mds/events/ETableClient.h b/src/mds/events/ETableClient.h
index d7c1c990c97c923f8dfe10e67153139a2df1279b..8486b808cc3c1817494f373317e9f257b5171a50 100644 (file)
--- a/src/mds/events/ETableClient.h
+++ b/src/mds/events/ETableClient.h
@@ -26,28 +26,15 @@ struct ETableClient : public LogEvent {
   __s16 op;
   version_t tid;
 
-  ETableClient() : LogEvent(EVENT_TABLECLIENT) { }
+  ETableClient() : LogEvent(EVENT_TABLECLIENT), table(0), op(0), tid(0) { }
   ETableClient(int t, int o, version_t ti) :
     LogEvent(EVENT_TABLECLIENT),
     table(t), op(o), tid(ti) { }
 
-  void encode(bufferlist& bl) const {
-    ENCODE_START(3, 3, bl);
-    ::encode(stamp, bl);
-    ::encode(table, bl);
-    ::encode(op, bl);
-    ::encode(tid, 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(tid, 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<ETableClient*>& ls);
 
   void print(ostream& out) {
     out << "ETableClient " << get_mdstable_name(table) << " " << get_mdstableserver_opname(op);

diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index 7ac8242e4b1cc3a55a3a53c8fe19350c9b77638f..c3ffd9f4afab3c534fc04f5952cb5ad18a68cd9d 100644 (file)
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -1532,6 +1532,42 @@ void ETableServer::replay(MDS *mds)
 }
 
 
+// ---------------------
+// ETableClient
+
+void ETableClient::encode(bufferlist& bl) const
+{
+  ENCODE_START(3, 3, bl);
+  ::encode(stamp, bl);
+  ::encode(table, bl);
+  ::encode(op, bl);
+  ::encode(tid, bl);
+  ENCODE_FINISH(bl);
+}
+
+void ETableClient::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(tid, bl);
+  DECODE_FINISH(bl);
+}
+
+void ETableClient::dump(Formatter *f) const
+{
+  f->dump_int("table", table);
+  f->dump_int("op", op);
+  f->dump_int("tid", tid);
+}
+
+void ETableClient::generate_test_instances(list<ETableClient*>& ls)
+{
+  ls.push_back(new ETableClient());
+}
+
 void ETableClient::replay(MDS *mds)
 {
   dout(10) << " ETableClient.replay " << get_mdstable_name(table)

diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index eefbbf0e3752d4857808cd56f3eefabb69ffb42a..2f788fdea491e9807159542190a0711574cee0d0 100644 (file)
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -153,9 +153,10 @@ TYPE(rmdir_rollback)
 TYPE(rename_rollback::drec)
 TYPE(rename_rollback)
 TYPE(ESlaveUpdate)
-
 #include "mds/events/ESubtreeMap.h"
 TYPE(ESubtreeMap)
+#include "mds/events/ETableClient.h"
+TYPE(ETableClient)
 
 #ifdef WITH_RADOSGW