]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
common/LogEntry: no need for LogEntryKey encode/decode
authorSage Weil <sage@redhat.com>
Fri, 25 May 2018 15:53:52 +0000 (10:53 -0500)
committerSage Weil <sage@redhat.com>
Sun, 27 May 2018 22:26:26 +0000 (17:26 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/common/LogEntry.cc
src/common/LogEntry.h
src/test/encoding/types.h

index f8659b7f1743aa590c5aaecc384a2c2017151b64..7fbb5d33fe9495ce9e8f47e7e4a8e703b802ba8d 100644 (file)
 // ----
 // 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;
index 9808b0b18673b10010575e51ef2bed173a6cd022..ead28cfd48c8da88ea1f81d4fb4a4b103c19a55f 100644 (file)
@@ -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> {
index 5d989d02344a9dab8dd9933b71ee4f46fcbf4d68..72b4820468ee2082afb855e1ea84c542a6cc06b8 100644 (file)
@@ -30,7 +30,6 @@ TYPE(SnapRealmInfo)
 TYPE(DecayCounter)
 
 #include "common/LogEntry.h"
-TYPE_FEATUREFUL(LogEntryKey)
 TYPE_FEATUREFUL(LogEntry)
 TYPE_FEATUREFUL(LogSummary)