compressor: modify brotli compression plugin.

* add "common/ceph_context.h" header file to CompressionPluginBrotli.cc
* set the brotli v1.0.7 stable version for compressor plugin use.

Signed-off-by: BI SHUN KE <aionshun@livemail.tw>

diff --git a/src/compressor/brotli/BrotliCompressor.cc b/src/compressor/brotli/BrotliCompressor.cc
index b0785c07e55b22c1f742b5bcc0504b241a6cdcf8..27685da35bdd1d37cc09e361bef6be6717751c20 100644 (file)
--- a/src/compressor/brotli/BrotliCompressor.cc
+++ b/src/compressor/brotli/BrotliCompressor.cc
@@ -90,6 +90,6 @@ int BrotliCompressor::decompress(bufferlist::const_iterator &p,
 
 int BrotliCompressor::decompress(const bufferlist &in, bufferlist &out) 
 {  
-  bufferlist::iterator i = const_cast<bufferlist&>(in).begin();
+  auto i = std::cbegin(in);
   return decompress(i, in.length(), out);
 }

diff --git a/src/compressor/brotli/CMakeLists.txt b/src/compressor/brotli/CMakeLists.txt
index 84648362d286fc9a75950fdf6c131d5bc0195cac..f19924288f3155744c4ad80019511b732d9c961b 100644 (file)
--- a/src/compressor/brotli/CMakeLists.txt
+++ b/src/compressor/brotli/CMakeLists.txt
@@ -8,7 +8,7 @@ include(ExternalProject)
 ExternalProject_Add(brotli_ext
   DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/src/
   GIT_REPOSITORY "https://github.com/google/brotli.git"
-  GIT_TAG "master"
+  GIT_TAG "v1.0.7"
   SOURCE_DIR ${CMAKE_BINARY_DIR}/src/brotli
   CONFIGURE_COMMAND ./configure-cmake --disable-debug 
   INSTALL_COMMAND ""
@@ -23,6 +23,7 @@ ExternalProject_Add_Step(brotli_ext forcebuild
   ALWAYS 1)
 
 set(bortli_libs enc dec common)
+file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/src/brotli/c/include")
 foreach(lib ${bortli_libs})
   add_library(brotli::${lib} STATIC IMPORTED)
   add_dependencies(brotli::${lib} brotli_ext)

diff --git a/src/compressor/brotli/CompressionPluginBrotli.cc b/src/compressor/brotli/CompressionPluginBrotli.cc
index 0d85a44244688f54bb132e86de5893b25340e484..245f49dbbeb293335c04d323c4f97b7faf5ab010 100644 (file)
--- a/src/compressor/brotli/CompressionPluginBrotli.cc
+++ b/src/compressor/brotli/CompressionPluginBrotli.cc
@@ -1,6 +1,8 @@
 #include "acconfig.h"
 #include "ceph_ver.h"
 #include "CompressionPluginBrotli.h"
+#include "common/ceph_context.h"
+
 
 const char *__ceph_plugin_version()
 {