From: Sage Weil <sage@redhat.com>
Date: Fri, 25 May 2018 15:53:52 +0000 (-0500)
Subject: common/LogEntry: no need for LogEntryKey encode/decode
X-Git-Tag: v14.0.1~1259^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=10a2a5604cae545271d5362cd7e7a45312cd1834;p=ceph.git

common/LogEntry: no need for LogEntryKey encode/decode

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/common/LogEntry.cc b/src/common/LogEntry.cc
index f8659b7f1743..7fbb5d33fe94 100644
--- a/src/common/LogEntry.cc
+++ b/src/common/LogEntry.cc
@@ -11,23 +11,6 @@
 // ----
 // LogEntryKey
 
-void LogEntryKey::encode(bufferlist& bl, uint64_t features) const
-{
-  using ceph::encode;
-  encode(who, bl, features);
-  encode(stamp, bl);
-  encode(seq, bl);
-}
-
-void LogEntryKey::decode(bufferlist::const_iterator& bl)
-{
-  using ceph::decode;
-  decode(who, bl);
-  decode(stamp, bl);
-  decode(seq, bl);
-  _calc_hash();
-}
-
 void LogEntryKey::dump(Formatter *f) const
 {
   f->dump_stream("who") << who;
diff --git a/src/common/LogEntry.h b/src/common/LogEntry.h
index 9808b0b18673..ead28cfd48c8 100644
--- a/src/common/LogEntry.h
+++ b/src/common/LogEntry.h
@@ -77,8 +77,6 @@ public:
     return _hash;
   }
 
-  void encode(bufferlist& bl, uint64_t features) const;
-  void decode(bufferlist::const_iterator& bl);
   void dump(Formatter *f) const;
   static void generate_test_instances(list<LogEntryKey*>& o);
 
@@ -86,7 +84,6 @@ public:
     return l.who == r.who && l.stamp == r.stamp && l.seq == r.seq;
   }
 };
-WRITE_CLASS_ENCODER_FEATURES(LogEntryKey)
 
 namespace std {
   template<> struct hash<LogEntryKey> {
diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h
index 5d989d02344a..72b4820468ee 100644
--- a/src/test/encoding/types.h
+++ b/src/test/encoding/types.h
@@ -30,7 +30,6 @@ TYPE(SnapRealmInfo)
 TYPE(DecayCounter)
 
 #include "common/LogEntry.h"
-TYPE_FEATUREFUL(LogEntryKey)
 TYPE_FEATUREFUL(LogEntry)
 TYPE_FEATUREFUL(LogSummary)