osd: Update HitSet to work without using namespace

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

diff --git a/src/osd/HitSet.cc b/src/osd/HitSet.cc
index 653c4448d38a36a901159e414c824889e995422a..03475d36fba8b15e041b58363f680e37aee5ee99 100644 (file)
--- a/src/osd/HitSet.cc
+++ b/src/osd/HitSet.cc
@@ -15,6 +15,10 @@
 #include "HitSet.h"
 #include "common/Formatter.h"
 
+using std::ostream;
+using std::list;
+using ceph::Formatter;
+
 // -- HitSet --
 
 HitSet::HitSet(const HitSet::Params& params)
@@ -42,7 +46,7 @@ HitSet::HitSet(const HitSet::Params& params)
   }
 }
 
-void HitSet::encode(bufferlist &bl) const
+void HitSet::encode(ceph::buffer::list &bl) const
 {
   ENCODE_START(1, 1, bl);
   encode(sealed, bl);
@@ -55,7 +59,7 @@ void HitSet::encode(bufferlist &bl) const
   ENCODE_FINISH(bl);
 }
 
-void HitSet::decode(bufferlist::const_iterator& bl)
+void HitSet::decode(ceph::buffer::list::const_iterator& bl)
 {
   DECODE_START(1, bl);
   decode(sealed, bl);
@@ -75,7 +79,7 @@ void HitSet::decode(bufferlist::const_iterator& bl)
     impl.reset(NULL);
     break;
   default:
-    throw buffer::malformed_input("unrecognized HitMap type");
+    throw ceph::buffer::malformed_input("unrecognized HitMap type");
   }
   if (impl)
     impl->decode(bl);
@@ -113,7 +117,7 @@ HitSet::Params::Params(const Params& o) noexcept
     create_impl(o.get_type());
     // it's annoying to write virtual operator= methods; use encode/decode
     // instead.
-    bufferlist bl;
+    ceph::buffer::list bl;
     o.impl->encode(bl);
     auto p = bl.cbegin();
     impl->decode(p);
@@ -126,7 +130,7 @@ const HitSet::Params& HitSet::Params::operator=(const Params& o)
   if (o.impl) {
     // it's annoying to write virtual operator= methods; use encode/decode
     // instead.
-    bufferlist bl;
+    ceph::buffer::list bl;
     o.impl->encode(bl);
     auto p = bl.cbegin();
     impl->decode(p);
@@ -134,7 +138,7 @@ const HitSet::Params& HitSet::Params::operator=(const Params& o)
   return *this;
 }
 
-void HitSet::Params::encode(bufferlist &bl) const
+void HitSet::Params::encode(ceph::buffer::list &bl) const
 {
   ENCODE_START(1, 1, bl);
   if (impl) {
@@ -167,13 +171,13 @@ bool HitSet::Params::create_impl(impl_type_t type)
   return true;
 }
 
-void HitSet::Params::decode(bufferlist::const_iterator& bl)
+void HitSet::Params::decode(ceph::buffer::list::const_iterator& bl)
 {
   DECODE_START(1, bl);
   __u8 type;
   decode(type, bl);
   if (!create_impl((impl_type_t)type))
-    throw buffer::malformed_input("unrecognized HitMap type");
+    throw ceph::buffer::malformed_input("unrecognized HitMap type");
   if (impl)
     impl->decode(bl);
   DECODE_FINISH(bl);

diff --git a/src/osd/HitSet.h b/src/osd/HitSet.h
index 7e50fd930adfa3286231a0e206f8245f787a3cfe..dedc45ed471dd2dd398f34b74f649c4d55c5919d 100644 (file)
--- a/src/osd/HitSet.h
+++ b/src/osd/HitSet.h
@@ -65,9 +65,9 @@ public:
     virtual bool contains(const hobject_t& o) const = 0;
     virtual unsigned insert_count() const = 0;
     virtual unsigned approx_unique_insert_count() const = 0;
-    virtual void encode(bufferlist &bl) const = 0;
-    virtual void decode(bufferlist::const_iterator& p) = 0;
-    virtual void dump(Formatter *f) const = 0;
+    virtual void encode(ceph::buffer::list &bl) const = 0;
+    virtual void decode(ceph::buffer::list::const_iterator& p) = 0;
+    virtual void dump(ceph::Formatter *f) const = 0;
     virtual Impl* clone() const = 0;
     virtual void seal() {}
     virtual ~Impl() {}
@@ -85,10 +85,10 @@ public:
     public:
       virtual impl_type_t get_type() const = 0;
       virtual HitSet::Impl *get_new_impl() const = 0;
-      virtual void encode(bufferlist &bl) const {}
-      virtual void decode(bufferlist::const_iterator& p) {}
-      virtual void dump(Formatter *f) const {}
-      virtual void dump_stream(ostream& o) const {}
+      virtual void encode(ceph::buffer::list &bl) const {}
+      virtual void decode(ceph::buffer::list::const_iterator& p) {}
+      virtual void dump(ceph::Formatter *f) const {}
+      virtual void dump_stream(std::ostream& o) const {}
       virtual ~Impl() {}
     };
 
@@ -107,12 +107,12 @@ public:
     Params(const Params& o) noexcept;
     const Params& operator=(const Params& o);
 
-    void encode(bufferlist &bl) const;
-    void decode(bufferlist::const_iterator& bl);
-    void dump(Formatter *f) const;
-    static void generate_test_instances(list<HitSet::Params*>& o);
+    void encode(ceph::buffer::list &bl) const;
+    void decode(ceph::buffer::list::const_iterator& bl);
+    void dump(ceph::Formatter *f) const;
+    static void generate_test_instances(std::list<HitSet::Params*>& o);
 
-    friend ostream& operator<<(ostream& out, const HitSet::Params& p);
+    friend std::ostream& operator<<(std::ostream& out, const HitSet::Params& p);
   };
 
   HitSet() : impl(NULL), sealed(false) {}
@@ -160,10 +160,10 @@ public:
     impl->seal();
   }
 
-  void encode(bufferlist &bl) const;
-  void decode(bufferlist::const_iterator& bl);
-  void dump(Formatter *f) const;
-  static void generate_test_instances(list<HitSet*>& o);
+  void encode(ceph::buffer::list &bl) const;
+  void decode(ceph::buffer::list::const_iterator& bl);
+  void dump(ceph::Formatter *f) const;
+  static void generate_test_instances(std::list<HitSet*>& o);
 
 private:
   void reset_to_type(impl_type_t type);
@@ -173,7 +173,7 @@ WRITE_CLASS_ENCODER(HitSet::Params)
 
 typedef boost::shared_ptr<HitSet> HitSetRef;
 
-ostream& operator<<(ostream& out, const HitSet::Params& p);
+std::ostream& operator<<(std::ostream& out, const HitSet::Params& p);
 
 /**
  * explicitly enumerate hash hits in the set
@@ -190,7 +190,7 @@ public:
     HitSet::Impl *get_new_impl() const override {
       return new ExplicitHashHitSet;
     }
-    static void generate_test_instances(list<Params*>& o) {
+    static void generate_test_instances(std::list<Params*>& o) {
       o.push_back(new Params);
     }
   };
@@ -223,20 +223,20 @@ public:
   unsigned approx_unique_insert_count() const override {
     return hits.size();
   }
-  void encode(bufferlist &bl) const override {
+  void encode(ceph::buffer::list &bl) const override {
     ENCODE_START(1, 1, bl);
     encode(count, bl);
     encode(hits, bl);
     ENCODE_FINISH(bl);
   }
-  void decode(bufferlist::const_iterator &bl) override {
+  void decode(ceph::buffer::list::const_iterator &bl) override {
     DECODE_START(1, bl);
     decode(count, bl);
     decode(hits, bl);
     DECODE_FINISH(bl);
   }
-  void dump(Formatter *f) const override;
-  static void generate_test_instances(list<ExplicitHashHitSet*>& o) {
+  void dump(ceph::Formatter *f) const override;
+  static void generate_test_instances(std::list<ExplicitHashHitSet*>& o) {
     o.push_back(new ExplicitHashHitSet);
     o.push_back(new ExplicitHashHitSet);
     o.back()->insert(hobject_t());
@@ -261,7 +261,7 @@ public:
     HitSet::Impl *get_new_impl() const override {
       return new ExplicitObjectHitSet;
     }
-    static void generate_test_instances(list<Params*>& o) {
+    static void generate_test_instances(std::list<Params*>& o) {
       o.push_back(new Params);
     }
   };
@@ -294,20 +294,20 @@ public:
   unsigned approx_unique_insert_count() const override {
     return hits.size();
   }
-  void encode(bufferlist &bl) const override {
+  void encode(ceph::buffer::list &bl) const override {
     ENCODE_START(1, 1, bl);
     encode(count, bl);
     encode(hits, bl);
     ENCODE_FINISH(bl);
   }
-  void decode(bufferlist::const_iterator& bl) override {
+  void decode(ceph::buffer::list::const_iterator& bl) override {
     DECODE_START(1, bl);
     decode(count, bl);
     decode(hits, bl);
     DECODE_FINISH(bl);
   }
-  void dump(Formatter *f) const override;
-  static void generate_test_instances(list<ExplicitObjectHitSet*>& o) {
+  void dump(ceph::Formatter *f) const override;
+  static void generate_test_instances(std::list<ExplicitObjectHitSet*>& o) {
     o.push_back(new ExplicitObjectHitSet);
     o.push_back(new ExplicitObjectHitSet);
     o.back()->insert(hobject_t());
@@ -358,27 +358,27 @@ public:
       fpp_micro = (unsigned)(llrintl(f * 1000000.0));
     }
 
-    void encode(bufferlist& bl) const override {
+    void encode(ceph::buffer::list& bl) const override {
       ENCODE_START(1, 1, bl);
       encode(fpp_micro, bl);
       encode(target_size, bl);
       encode(seed, bl);
       ENCODE_FINISH(bl);
     }
-    void decode(bufferlist::const_iterator& bl) override {
+    void decode(ceph::buffer::list::const_iterator& bl) override {
       DECODE_START(1, bl);
       decode(fpp_micro, bl);
       decode(target_size, bl);
       decode(seed, bl);
       DECODE_FINISH(bl);
     }
-    void dump(Formatter *f) const override;
-    void dump_stream(ostream& o) const override {
+    void dump(ceph::Formatter *f) const override;
+    void dump_stream(std::ostream& o) const override {
       o << "false_positive_probability: "
        << get_fpp() << ", target_size: " << target_size
        << ", seed: " << seed;
     }
-    static void generate_test_instances(list<Params*>& o) {
+    static void generate_test_instances(std::list<Params*>& o) {
       o.push_back(new Params);
       o.push_back(new Params);
       (*o.rbegin())->fpp_micro = 123456;
@@ -398,7 +398,7 @@ public:
 
   BloomHitSet(const BloomHitSet &o) {
     // oh god
-    bufferlist bl;
+    ceph::buffer::list bl;
     o.encode(bl);
     auto bli = std::cbegin(bl);
     this->decode(bli);
@@ -431,18 +431,18 @@ public:
       bloom.compress(pc);
   }
 
-  void encode(bufferlist &bl) const override {
+  void encode(ceph::buffer::list &bl) const override {
     ENCODE_START(1, 1, bl);
     encode(bloom, bl);
     ENCODE_FINISH(bl);
   }
-  void decode(bufferlist::const_iterator& bl) override {
+  void decode(ceph::buffer::list::const_iterator& bl) override {
     DECODE_START(1, bl);
     decode(bloom, bl);
     DECODE_FINISH(bl);
   }
-  void dump(Formatter *f) const override;
-  static void generate_test_instances(list<BloomHitSet*>& o) {
+  void dump(ceph::Formatter *f) const override;
+  static void generate_test_instances(std::list<BloomHitSet*>& o) {
     o.push_back(new BloomHitSet);
     o.push_back(new BloomHitSet(10, .1, 1));
     o.back()->insert(hobject_t());