compressor: Build without using namespace declarations in headers

This is part of a series of commits to clean up using namespace at top
level in headers.

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

diff --git a/src/compressor/lz4/CompressionPluginLZ4.cc b/src/compressor/lz4/CompressionPluginLZ4.cc
index ef3f2406cdbdd2b7e98a96dce619adf5e88a44eb..0d05500e47be71224de0529cfef832dafef4ca77 100644 (file)
--- a/src/compressor/lz4/CompressionPluginLZ4.cc
+++ b/src/compressor/lz4/CompressionPluginLZ4.cc
@@ -30,7 +30,7 @@ int __ceph_plugin_init(CephContext *cct,
                        const std::string& type,
                        const std::string& name)
 {
-  PluginRegistry *instance = cct->get_plugin_registry();
+  auto instance = cct->get_plugin_registry();
 
   return instance->add(type, name, new CompressionPluginLZ4(cct));
 }

diff --git a/src/compressor/lz4/CompressionPluginLZ4.h b/src/compressor/lz4/CompressionPluginLZ4.h
index 7e8cdf676cf5fe39838198303d9f3b1a79b24649..38e5b9cc5df5e27d3d1af21492e4d2da55208575 100644 (file)
--- a/src/compressor/lz4/CompressionPluginLZ4.h
+++ b/src/compressor/lz4/CompressionPluginLZ4.h
@@ -21,7 +21,7 @@
 #include "LZ4Compressor.h"
 // -----------------------------------------------------------------------------
 
-class CompressionPluginLZ4 : public CompressionPlugin {
+class CompressionPluginLZ4 : public ceph::CompressionPlugin {
 
 public:
 

diff --git a/src/compressor/lz4/LZ4Compressor.h b/src/compressor/lz4/LZ4Compressor.h
index 6e604d5cc975305debeeb2b2f1a7f056f335796f..d9ab78a30a4683b630a6f26ec5a75edb8f2ffeca 100644 (file)
--- a/src/compressor/lz4/LZ4Compressor.h
+++ b/src/compressor/lz4/LZ4Compressor.h
@@ -35,7 +35,7 @@ class LZ4Compressor : public Compressor {
 #endif
   }
 
-  int compress(const bufferlist &src, bufferlist &dst) override {
+  int compress(const ceph::buffer::list &src, ceph::buffer::list &dst) override {
     // older versions of liblz4 introduce bit errors when compressing
     // fragmented buffers.  this was fixed in lz4 commit
     // af127334670a5e7b710bbd6adb71aa7c3ef0cd72, which first
@@ -43,7 +43,7 @@ class LZ4Compressor : public Compressor {
     //
     // workaround: rebuild if not contiguous.
     if (!src.is_contiguous()) {
-      bufferlist new_src = src;
+      ceph::buffer::list new_src = src;
       new_src.rebuild();
       return compress(new_src, dst);
     }
@@ -52,11 +52,13 @@ class LZ4Compressor : public Compressor {
     if (qat_enabled)
       return qat_accel.compress(src, dst);
 #endif
-    bufferptr outptr = buffer::create_small_page_aligned(
+    ceph::buffer::ptr outptr = ceph::buffer::create_small_page_aligned(
       LZ4_compressBound(src.length()));
     LZ4_stream_t lz4_stream;
     LZ4_resetStream(&lz4_stream);
 
+    using ceph::encode;
+
     auto p = src.begin();
     size_t left = src.length();
     int pos = 0;
@@ -81,7 +83,7 @@ class LZ4Compressor : public Compressor {
     return 0;
   }
 
-  int decompress(const bufferlist &src, bufferlist &dst) override {
+  int decompress(const ceph::buffer::list &src, ceph::buffer::list &dst) override {
 #ifdef HAVE_QATZIP
     if (qat_enabled)
       return qat_accel.decompress(src, dst);
@@ -90,13 +92,14 @@ class LZ4Compressor : public Compressor {
     return decompress(i, src.length(), dst);
   }
 
-  int decompress(bufferlist::const_iterator &p,
+  int decompress(ceph::buffer::list::const_iterator &p,
                 size_t compressed_len,
-                bufferlist &dst) override {
+                ceph::buffer::list &dst) override {
 #ifdef HAVE_QATZIP
     if (qat_enabled)
       return qat_accel.decompress(p, compressed_len, dst);
 #endif
+    using ceph::decode;
     uint32_t count;
     std::vector<std::pair<uint32_t, uint32_t> > compressed_pairs;
     decode(count, p);
@@ -109,13 +112,13 @@ class LZ4Compressor : public Compressor {
     }
     compressed_len -= (sizeof(uint32_t) + sizeof(uint32_t) * count * 2);
 
-    bufferptr dstptr(total_origin);
+    ceph::buffer::ptr dstptr(total_origin);
     LZ4_streamDecode_t lz4_stream_decode;
     LZ4_setStreamDecode(&lz4_stream_decode, nullptr, 0);
 
-    bufferptr cur_ptr = p.get_current_ptr();
-    bufferptr *ptr = &cur_ptr;
-    Tub<bufferptr> data_holder;
+    ceph::buffer::ptr cur_ptr = p.get_current_ptr();
+    ceph::buffer::ptr *ptr = &cur_ptr;
+    Tub<ceph::buffer::ptr> data_holder;
     if (compressed_len != cur_ptr.length()) {
       data_holder.construct(compressed_len);
       p.copy_deep(compressed_len, *data_holder);

diff --git a/src/compressor/snappy/CompressionPluginSnappy.cc b/src/compressor/snappy/CompressionPluginSnappy.cc
index 96abf84fdcbba48c7d4cdaa095c77191e8e23ba8..85b6cf94ae29478a35a34babda5df9ecd497ba24 100644 (file)
--- a/src/compressor/snappy/CompressionPluginSnappy.cc
+++ b/src/compressor/snappy/CompressionPluginSnappy.cc
@@ -32,7 +32,7 @@ int __ceph_plugin_init(CephContext *cct,
                        const std::string& type,
                        const std::string& name)
 {
-  PluginRegistry *instance = cct->get_plugin_registry();
+  auto instance = cct->get_plugin_registry();
 
   return instance->add(type, name, new CompressionPluginSnappy(cct));
 }

diff --git a/src/compressor/snappy/CompressionPluginSnappy.h b/src/compressor/snappy/CompressionPluginSnappy.h
index 19b69765c6eda7c1d1659fbe0ea2543579a00f30..a9bc98f73d9531554ff61edbf38d5fb26218a907 100644 (file)
--- a/src/compressor/snappy/CompressionPluginSnappy.h
+++ b/src/compressor/snappy/CompressionPluginSnappy.h
@@ -20,7 +20,7 @@
 #include "SnappyCompressor.h"
 // -----------------------------------------------------------------------------
 
-class CompressionPluginSnappy : public CompressionPlugin {
+class CompressionPluginSnappy : public ceph::CompressionPlugin {
 
 public:
 

diff --git a/src/compressor/snappy/SnappyCompressor.h b/src/compressor/snappy/SnappyCompressor.h
index 0cfb819cd96f5aa2c074b06977ffecd2d1ae04c0..9da7feaa4bc816386f9374da25b0cf5e86cf39a8 100644 (file)
--- a/src/compressor/snappy/SnappyCompressor.h
+++ b/src/compressor/snappy/SnappyCompressor.h
@@ -22,11 +22,11 @@
 #include "include/buffer.h"
 
 class CEPH_BUFFER_API BufferlistSource : public snappy::Source {
-  bufferlist::const_iterator pb;
+  ceph::bufferlist::const_iterator pb;
   size_t remaining;
 
  public:
-  explicit BufferlistSource(bufferlist::const_iterator _pb, size_t _input_len)
+  explicit BufferlistSource(ceph::bufferlist::const_iterator _pb, size_t _input_len)
     : pb(_pb),
       remaining(_input_len) {
     remaining = std::min(remaining, (size_t)pb.get_remaining());
@@ -50,7 +50,7 @@ class CEPH_BUFFER_API BufferlistSource : public snappy::Source {
     remaining -= n;
   }
 
-  bufferlist::const_iterator get_pos() const {
+  ceph::bufferlist::const_iterator get_pos() const {
     return pb;
   }
 };
@@ -66,13 +66,13 @@ class SnappyCompressor : public Compressor {
 #endif
   }
 
-  int compress(const bufferlist &src, bufferlist &dst) override {
+  int compress(const ceph::bufferlist &src, ceph::bufferlist &dst) override {
 #ifdef HAVE_QATZIP
     if (qat_enabled)
       return qat_accel.compress(src, dst);
 #endif
-    BufferlistSource source(const_cast<bufferlist&>(src).begin(), src.length());
-    bufferptr ptr = buffer::create_small_page_aligned(
+    BufferlistSource source(const_cast<ceph::bufferlist&>(src).begin(), src.length());
+    ceph::bufferptr ptr = ceph::buffer::create_small_page_aligned(
       snappy::MaxCompressedLength(src.length()));
     snappy::UncheckedByteArraySink sink(ptr.c_str());
     snappy::Compress(&source, &sink);
@@ -80,7 +80,7 @@ class SnappyCompressor : public Compressor {
     return 0;
   }
 
-  int decompress(const bufferlist &src, bufferlist &dst) override {
+  int decompress(const ceph::bufferlist &src, ceph::bufferlist &dst) override {
 #ifdef HAVE_QATZIP
     if (qat_enabled)
       return qat_accel.decompress(src, dst);
@@ -89,9 +89,9 @@ class SnappyCompressor : public Compressor {
     return decompress(i, src.length(), dst);
   }
 
-  int decompress(bufferlist::const_iterator &p,
+  int decompress(ceph::bufferlist::const_iterator &p,
                 size_t compressed_len,
-                bufferlist &dst) override {
+                ceph::bufferlist &dst) override {
 #ifdef HAVE_QATZIP
     if (qat_enabled)
       return qat_accel.decompress(p, compressed_len, dst);
@@ -102,7 +102,7 @@ class SnappyCompressor : public Compressor {
       return -1;
     }
     BufferlistSource source_2(p, compressed_len);
-    bufferptr ptr(res_len);
+    ceph::bufferptr ptr(res_len);
     if (snappy::RawUncompress(&source_2, ptr.c_str())) {
       p = source_2.get_pos();
       dst.append(ptr);

diff --git a/src/compressor/zlib/CompressionPluginZlib.cc b/src/compressor/zlib/CompressionPluginZlib.cc
index 2215b9a42bd8e9191731c015f419fcda67b6910a..c0a53fa7709aa56f2b2142d0368b5f4968c30d66 100644 (file)
--- a/src/compressor/zlib/CompressionPluginZlib.cc
+++ b/src/compressor/zlib/CompressionPluginZlib.cc
@@ -32,7 +32,7 @@ int __ceph_plugin_init(CephContext *cct,
                        const std::string& type,
                        const std::string& name)
 {
-  PluginRegistry *instance = cct->get_plugin_registry();
+  auto instance = cct->get_plugin_registry();
 
   return instance->add(type, name, new CompressionPluginZlib(cct));
 }

diff --git a/src/compressor/zlib/CompressionPluginZlib.h b/src/compressor/zlib/CompressionPluginZlib.h
index 38320c0c0a154be6452266698fb37d0835dd6b87..fbdb635c6a407e2d4fcdd23839113f13dba2f3c4 100644 (file)
--- a/src/compressor/zlib/CompressionPluginZlib.h
+++ b/src/compressor/zlib/CompressionPluginZlib.h
@@ -19,12 +19,13 @@
 #include "arch/probe.h"
 #include "arch/intel.h"
 #include "arch/arm.h"
+#include "common/ceph_context.h"
 #include "compressor/CompressionPlugin.h"
 #include "ZlibCompressor.h"
 
 // -----------------------------------------------------------------------------
 
-class CompressionPluginZlib : public CompressionPlugin {
+class CompressionPluginZlib : public ceph::CompressionPlugin {
 public:
   bool has_isal = false;
 

diff --git a/src/compressor/zlib/ZlibCompressor.cc b/src/compressor/zlib/ZlibCompressor.cc
index e3064d2a21b42813c04c890ab6f3d5c7c97d668a..c9fe6f6519b7bbb709fea7ff5393c2513feb47b8 100644 (file)
--- a/src/compressor/zlib/ZlibCompressor.cc
+++ b/src/compressor/zlib/ZlibCompressor.cc
@@ -30,6 +30,11 @@
 
 // -----------------------------------------------------------------------------
 
+using std::ostream;
+
+using ceph::bufferlist;
+using ceph::bufferptr;
+
 static ostream&
 _prefix(std::ostream* _dout)
 {
@@ -78,7 +83,7 @@ int ZlibCompressor::zlib_compress(const bufferlist &in, bufferlist &out)
 
     strm.next_in = c_in;
     do {
-      bufferptr ptr = buffer::create_page_aligned(MAX_LEN);
+      bufferptr ptr = ceph::buffer::create_page_aligned(MAX_LEN);
       strm.next_out = (unsigned char*)ptr.c_str() + begin;
       strm.avail_out = MAX_LEN - begin;
       if (begin) {
@@ -134,7 +139,7 @@ int ZlibCompressor::isal_compress(const bufferlist &in, bufferlist &out)
     strm.next_in = c_in;
 
     do {
-      bufferptr ptr = buffer::create_page_aligned(MAX_LEN);
+      bufferptr ptr = ceph::buffer::create_page_aligned(MAX_LEN);
       strm.next_out = (unsigned char*)ptr.c_str() + begin;
       strm.avail_out = MAX_LEN - begin;
       if (begin) {
@@ -216,7 +221,7 @@ int ZlibCompressor::decompress(bufferlist::const_iterator &p, size_t compressed_
 
     do {
       strm.avail_out = MAX_LEN;
-      bufferptr ptr = buffer::create_page_aligned(MAX_LEN);
+      bufferptr ptr = ceph::buffer::create_page_aligned(MAX_LEN);
       strm.next_out = (unsigned char*)ptr.c_str();
       ret = inflate(&strm, Z_NO_FLUSH);
       if (ret != Z_OK && ret != Z_STREAM_END && ret != Z_BUF_ERROR) {

diff --git a/src/compressor/zlib/ZlibCompressor.h b/src/compressor/zlib/ZlibCompressor.h
index d770547a9465110b6519c79e8a29a37037d7a19b..b26d0c2fa983bd4b7aa290d59babd282a7ad389b 100644 (file)
--- a/src/compressor/zlib/ZlibCompressor.h
+++ b/src/compressor/zlib/ZlibCompressor.h
@@ -34,12 +34,12 @@ public:
 #endif
   }
 
-  int compress(const bufferlist &in, bufferlist &out) override;
-  int decompress(const bufferlist &in, bufferlist &out) override;
-  int decompress(bufferlist::const_iterator &p, size_t compressed_len, bufferlist &out) override;
+  int compress(const ceph::buffer::list &in, ceph::buffer::list &out) override;
+  int decompress(const ceph::buffer::list &in, ceph::buffer::list &out) override;
+  int decompress(ceph::buffer::list::const_iterator &p, size_t compressed_len, ceph::buffer::list &out) override;
 private:
-  int zlib_compress(const bufferlist &in, bufferlist &out);
-  int isal_compress(const bufferlist &in, bufferlist &out);
+  int zlib_compress(const ceph::buffer::list &in, ceph::buffer::list &out);
+  int isal_compress(const ceph::buffer::list &in, ceph::buffer::list &out);
  };
 
 

diff --git a/src/compressor/zstd/CompressionPluginZstd.cc b/src/compressor/zstd/CompressionPluginZstd.cc
index 62c2cfbf32cbe3a4b5fb2464176338d30eff5656..92aee7343ca16eedb455f80eab7501a0d56a7de1 100644 (file)
--- a/src/compressor/zstd/CompressionPluginZstd.cc
+++ b/src/compressor/zstd/CompressionPluginZstd.cc
@@ -30,7 +30,7 @@ int __ceph_plugin_init(CephContext *cct,
                        const std::string& type,
                        const std::string& name)
 {
-  PluginRegistry *instance = cct->get_plugin_registry();
+  auto instance = cct->get_plugin_registry();
 
   return instance->add(type, name, new CompressionPluginZstd(cct));
 }

diff --git a/src/compressor/zstd/CompressionPluginZstd.h b/src/compressor/zstd/CompressionPluginZstd.h
index c85951705a40626f882c47595338b537dbb24739..646a55ce90d8e6257a32d51b0c3fb2c7fe92d216 100644 (file)
--- a/src/compressor/zstd/CompressionPluginZstd.h
+++ b/src/compressor/zstd/CompressionPluginZstd.h
@@ -21,7 +21,7 @@
 #include "ZstdCompressor.h"
 // -----------------------------------------------------------------------------
 
-class CompressionPluginZstd : public CompressionPlugin {
+class CompressionPluginZstd : public ceph::CompressionPlugin {
 
 public:
 

diff --git a/src/compressor/zstd/ZstdCompressor.h b/src/compressor/zstd/ZstdCompressor.h
index e51ba3b7cbd326ac55ba3d7dede63c516b2169cb..efbb6a5ea2fd72977dae59817e0579277a78b8b6 100644 (file)
--- a/src/compressor/zstd/ZstdCompressor.h
+++ b/src/compressor/zstd/ZstdCompressor.h
@@ -28,14 +28,14 @@ class ZstdCompressor : public Compressor {
  public:
   ZstdCompressor() : Compressor(COMP_ALG_ZSTD, "zstd") {}
 
-  int compress(const bufferlist &src, bufferlist &dst) override {
+  int compress(const ceph::buffer::list &src, ceph::buffer::list &dst) override {
     ZSTD_CStream *s = ZSTD_createCStream();
     ZSTD_initCStream_srcSize(s, COMPRESSION_LEVEL, src.length());
     auto p = src.begin();
     size_t left = src.length();
 
     size_t const out_max = ZSTD_compressBound(left);
-    bufferptr outptr = buffer::create_small_page_aligned(out_max);
+    ceph::buffer::ptr outptr = ceph::buffer::create_small_page_aligned(out_max);
     ZSTD_outBuffer_s outbuf;
     outbuf.dst = outptr.c_str();
     outbuf.size = outptr.length();
@@ -58,27 +58,27 @@ class ZstdCompressor : public Compressor {
     ZSTD_freeCStream(s);
 
     // prefix with decompressed length
-    encode((uint32_t)src.length(), dst);
+    ceph::encode((uint32_t)src.length(), dst);
     dst.append(outptr, 0, outbuf.pos);
     return 0;
   }
 
-  int decompress(const bufferlist &src, bufferlist &dst) override {
+  int decompress(const ceph::buffer::list &src, ceph::buffer::list &dst) override {
     auto i = std::cbegin(src);
     return decompress(i, src.length(), dst);
   }
 
-  int decompress(bufferlist::const_iterator &p,
+  int decompress(ceph::buffer::list::const_iterator &p,
                 size_t compressed_len,
-                bufferlist &dst) override {
+                ceph::buffer::list &dst) override {
     if (compressed_len < 4) {
       return -1;
     }
     compressed_len -= 4;
     uint32_t dst_len;
-    decode(dst_len, p);
+    ceph::decode(dst_len, p);
 
-    bufferptr dstptr(dst_len);
+    ceph::buffer::ptr dstptr(dst_len);
     ZSTD_outBuffer_s outbuf;
     outbuf.dst = dstptr.c_str();
     outbuf.size = dstptr.length();