From e0b33fcd851e037b26581d56515aad3d1a7ba309 Mon Sep 17 00:00:00 2001 From: BI SHUN KE Date: Wed, 7 Nov 2018 16:14:22 +0800 Subject: [PATCH] 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 --- src/compressor/brotli/BrotliCompressor.cc | 2 +- src/compressor/brotli/CMakeLists.txt | 3 ++- src/compressor/brotli/CompressionPluginBrotli.cc | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/compressor/brotli/BrotliCompressor.cc b/src/compressor/brotli/BrotliCompressor.cc index b0785c07e55..27685da35bd 100644 --- 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(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 84648362d28..f19924288f3 100644 --- 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 0d85a442446..245f49dbbeb 100644 --- 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() { -- 2.39.5