@@ -88,46 +88,46 @@ class Lz4BlockCompression : public BlockCompressionCodec {
8888// Used for LZ4 frame format, decompress speed is two times faster than LZ4.
8989class Lz4fBlockCompression : public BlockCompressionCodec {
9090public:
91- static const Lz4fBlockCompression* instance () {
92- static Lz4fBlockCompression s_instance;
93- return &s_instance;
94- }
95-
96- ~Lz4fBlockCompression () override {}
91+ Status init () override {
92+ auto ret1 = LZ4F_createCompressionContext (&ctx_c, LZ4F_VERSION );
93+ if (LZ4F_isError (ret1)) {
94+ return Status::InvalidArgument (strings::Substitute (
95+ " Fail to LZ4F_createCompressionContext, msg=$0" , LZ4F_getErrorName (ret1)));
96+ }
97+ ctx_c_inited = true ;
9798
98- Status compress (const Slice& input, Slice* output) const override {
99- auto compressed_len = LZ4F_compressFrame (output->data , output->size , input.data , input.size ,
100- &_s_preferences);
101- if (LZ4F_isError (compressed_len)) {
99+ auto ret2 = LZ4F_createDecompressionContext (&ctx_d, LZ4F_VERSION );
100+ if (LZ4F_isError (ret2)) {
102101 return Status::InvalidArgument (strings::Substitute (
103- " Fail to do LZ4F compress frame , msg=$0" , LZ4F_getErrorName (compressed_len )));
102+ " Fail to LZ4F_createDecompressionContext , msg=$0" , LZ4F_getErrorName (ret2 )));
104103 }
105- output->size = compressed_len;
104+ ctx_d_inited = true ;
105+
106106 return Status::OK ();
107107 }
108108
109+ ~Lz4fBlockCompression () override {
110+ if (ctx_c_inited) LZ4F_freeCompressionContext (ctx_c);
111+ if (ctx_d_inited) LZ4F_freeDecompressionContext (ctx_d);
112+ }
113+
114+ Status compress (const Slice& input, Slice* output) const override {
115+ std::vector<Slice> inputs {input};
116+ return compress (inputs, output);
117+ }
118+
109119 Status compress (const std::vector<Slice>& inputs, Slice* output) const override {
110- LZ4F_compressionContext_t ctx = nullptr ;
111- auto lres = LZ4F_createCompressionContext (&ctx, LZ4F_VERSION );
112- if (lres != 0 ) {
113- return Status::InvalidArgument (strings::Substitute (" Fail to do LZ4F compress, res=$0" ,
114- LZ4F_getErrorName (lres)));
115- }
116- auto st = _compress (ctx, inputs, output);
117- LZ4F_freeCompressionContext (ctx);
118- return st;
120+ if (!ctx_c_inited)
121+ return Status::InvalidArgument (" LZ4F_createCompressionContext not sucess" );
122+
123+ return _compress (ctx_c, inputs, output);
119124 }
120125
121126 Status decompress (const Slice& input, Slice* output) const override {
122- LZ4F_decompressionContext_t ctx;
123- auto lres = LZ4F_createDecompressionContext (&ctx, LZ4F_VERSION );
124- if (LZ4F_isError (lres)) {
125- return Status::InvalidArgument (strings::Substitute (" Fail to do LZ4F decompress, res=$0" ,
126- LZ4F_getErrorName (lres)));
127- }
128- auto st = _decompress (ctx, input, output);
129- LZ4F_freeDecompressionContext (ctx);
130- return st;
127+ if (!ctx_d_inited)
128+ return Status::InvalidArgument (" LZ4F_createDecompressionContext not sucess" );
129+
130+ return _decompress (ctx_d, input, output);
131131 }
132132
133133 size_t max_compressed_len (size_t len) const override {
@@ -167,6 +167,8 @@ class Lz4fBlockCompression : public BlockCompressionCodec {
167167 }
168168
169169 Status _decompress (LZ4F_decompressionContext_t ctx, const Slice& input, Slice* output) const {
170+ // reset decompression context to avoid ERROR_maxBlockSize_invalid
171+ LZ4F_resetDecompressionContext (ctx);
170172 size_t input_size = input.size ;
171173 auto lres =
172174 LZ4F_decompress (ctx, output->data , &output->size , input.data , &input_size, nullptr );
@@ -187,6 +189,10 @@ class Lz4fBlockCompression : public BlockCompressionCodec {
187189
188190private:
189191 static LZ4F_preferences_t _s_preferences;
192+ LZ4F_compressionContext_t ctx_c;
193+ bool ctx_c_inited = false ;
194+ LZ4F_decompressionContext_t ctx_d;
195+ bool ctx_d_inited = false ;
190196};
191197
192198LZ4F_preferences_t Lz4fBlockCompression::_s_preferences = {
@@ -370,27 +376,38 @@ class ZlibBlockCompression : public BlockCompressionCodec {
370376};
371377
372378Status get_block_compression_codec (segment_v2::CompressionTypePB type,
373- const BlockCompressionCodec** codec) {
379+ std::unique_ptr<BlockCompressionCodec>& codec) {
380+ BlockCompressionCodec* ptr = nullptr ;
374381 switch (type) {
375382 case segment_v2::CompressionTypePB::NO_COMPRESSION :
376- * codec = nullptr ;
377- break ;
383+ codec. reset ( nullptr ) ;
384+ return Status::OK () ;
378385 case segment_v2::CompressionTypePB::SNAPPY :
379- *codec = SnappyBlockCompression::instance ();
386+ ptr = new SnappyBlockCompression ();
380387 break ;
381388 case segment_v2::CompressionTypePB::LZ4 :
382- *codec = Lz4BlockCompression::instance ();
389+ ptr = new Lz4BlockCompression ();
383390 break ;
384391 case segment_v2::CompressionTypePB::LZ4F :
385- *codec = Lz4fBlockCompression::instance ();
392+ ptr = new Lz4fBlockCompression ();
386393 break ;
387394 case segment_v2::CompressionTypePB::ZLIB :
388- *codec = ZlibBlockCompression::instance ();
395+ ptr = new ZlibBlockCompression ();
389396 break ;
390397 default :
391398 return Status::NotFound (strings::Substitute (" unknown compression type($0)" , type));
392399 }
393- return Status::OK ();
400+
401+ if (!ptr) return Status::NotFound (" Failed to create compression codec" );
402+
403+ Status st = ptr->init ();
404+ if (st.ok ()) {
405+ codec.reset (ptr);
406+ } else {
407+ delete ptr;
408+ }
409+
410+ return st;
394411}
395412
396413} // namespace doris
0 commit comments