compressor: optimize header file dependency

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>

diff --git a/src/compressor/AsyncCompressor.h b/src/compressor/AsyncCompressor.h
index 81321fdd511e50b9e6fdc59c621d773b38234b4d..37f70f98eb280c0d21a319fda902624c6dae9fc8 100644 (file)
--- a/src/compressor/AsyncCompressor.h
+++ b/src/compressor/AsyncCompressor.h
@@ -16,13 +16,11 @@
 #define CEPH_ASYNCCOMPRESSOR_H
 
 #include <deque>
-
+#include <vector>
 #include "include/atomic.h"
-#include "include/str_list.h"
 #include "Compressor.h"
 #include "common/WorkQueue.h"
 
-
 class AsyncCompressor {
  private:
   CompressorRef compressor;

diff --git a/src/compressor/CompressionPlugin.h b/src/compressor/CompressionPlugin.h
index d2e253f2dc100869257aa7c010d72cd7b8c2f480..5e0ed777b85ea1633abe2f07885fedf87eac8665 100644 (file)
--- a/src/compressor/CompressionPlugin.h
+++ b/src/compressor/CompressionPlugin.h
@@ -18,8 +18,9 @@
 #ifndef COMPRESSION_PLUGIN_H
 #define COMPRESSION_PLUGIN_H
 
+#include <iosfwd>
 #include <iostream>
-#include "common/Mutex.h"
+
 #include "common/PluginRegistry.h"
 #include "Compressor.h"
 

diff --git a/src/compressor/Compressor.cc b/src/compressor/Compressor.cc
index 6b49b788f838fe79ec3400e15dc5cba2b6c8339d..3279ac660ac0cf7f9b6a42e894b428246436b27e 100644 (file)
--- a/src/compressor/Compressor.cc
+++ b/src/compressor/Compressor.cc
@@ -13,8 +13,12 @@
  */
 
 #include <random>
-#include "Compressor.h"
+#include <sstream>
+
 #include "CompressionPlugin.h"
+#include "Compressor.h"
+#include "common/ceph_context.h"
+#include "common/debug.h"
 #include "common/dout.h"
 
 const char * Compressor::get_comp_alg_name(int a) {

diff --git a/src/compressor/Compressor.h b/src/compressor/Compressor.h
index 8be13043d69db604bb4201d8e09baf368db4299d..3430281bdae478a7cac6c1f675871d256e4648fe 100644 (file)
--- a/src/compressor/Compressor.h
+++ b/src/compressor/Compressor.h
@@ -15,13 +15,17 @@
 #ifndef CEPH_COMPRESSOR_H
 #define CEPH_COMPRESSOR_H
 
-#include <string>
+
 #include <boost/optional.hpp>
-#include "include/memory.h"
+#include <memory>
+#include <string>
+
 #include "include/buffer.h"
+#include "include/int_types.h"
 
 class Compressor;
-typedef shared_ptr<Compressor> CompressorRef;
+typedef std::shared_ptr<Compressor> CompressorRef;
+class CephContext;
 
 class Compressor {
 public:
@@ -55,11 +59,11 @@ public:
   CompressionAlgorithm get_type() const {
     return alg;
   }
-  virtual int compress(const bufferlist &in, bufferlist &out) = 0;
-  virtual int decompress(const bufferlist &in, bufferlist &out) = 0;
+  virtual int compress(const ceph::bufferlist &in, ceph::bufferlist &out) = 0;
+  virtual int decompress(const ceph::bufferlist &in, ceph::bufferlist &out) = 0;
   // this is a bit weird but we need non-const iterator to be in
   // alignment with decode methods
-  virtual int decompress(bufferlist::iterator &p, size_t compressed_len, bufferlist &out) = 0;
+  virtual int decompress(ceph::bufferlist::iterator &p, size_t compressed_len, ceph::bufferlist &out) = 0;
 
   static CompressorRef create(CephContext *cct, const std::string &type);
   static CompressorRef create(CephContext *cct, int alg);

diff --git a/src/compressor/snappy/CompressionPluginSnappy.cc b/src/compressor/snappy/CompressionPluginSnappy.cc
index f4e8c3819d9ea633081c4c82a117b565bb1683c8..6d67c41c746d51cb6089ff9e5b9034d341008b01 100644 (file)
--- a/src/compressor/snappy/CompressionPluginSnappy.cc
+++ b/src/compressor/snappy/CompressionPluginSnappy.cc
@@ -38,4 +38,4 @@ int __ceph_plugin_init(CephContext *cct,
   return instance->add(type, name, new CompressionPluginSnappy(cct));
 }
 
-#endif // !BUILDING_FOR_EMBEDDED
\ No newline at end of file
+#endif // !BUILDING_FOR_EMBEDDED

diff --git a/src/compressor/snappy/SnappyCompressor.h b/src/compressor/snappy/SnappyCompressor.h
index aa377b510ac362721e991145b9b65fb9b076e5a2..44348f72bb9e63b86b7262af49a92761a909574e 100644 (file)
--- a/src/compressor/snappy/SnappyCompressor.h
+++ b/src/compressor/snappy/SnappyCompressor.h
@@ -17,8 +17,8 @@
 
 #include <snappy.h>
 #include <snappy-sinksource.h>
-#include "include/buffer.h"
 #include "compressor/Compressor.h"
+#include "include/buffer.h"
 
 class CEPH_BUFFER_API BufferlistSource : public snappy::Source {
   bufferlist::iterator pb;