RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-27 14:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #59116 from rzarzynski/wip-constbl-compressor

Browse Source 
compressor: switch out of get_current_ptr() for the sake of const-stricter bufferlist

Reviewed-by: Bill Scales <bill_scales@uk.ibm.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
This commit is contained in:
Yuri Weinstein 2024-12-24 11:08:30 -08:00 committed by GitHub
commit e933897f22
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/compressor/lz4/LZ4Compressor.cc
View File

@ -121,16 +121,12 @@ int LZ4Compressor::decompress(ceph::buffer::list::const_iterator &p,
LZ4_streamDecode_t lz4_stream_decode;
LZ4_setStreamDecode(&lz4_stream_decode, nullptr, 0);
ceph::buffer::ptr cur_ptr = p.get_current_ptr();
ceph::buffer::ptr *ptr = &cur_ptr;
std::optional<ceph::buffer::ptr> data_holder;
if (compressed_len != cur_ptr.length()) {
data_holder.emplace(compressed_len);
p.copy_deep(compressed_len, *data_holder);
ptr = &*data_holder;
}
char *c_in = ptr->c_str();
ceph::buffer::list indata;
// this does a shallow copy
p.copy(compressed_len, indata);
// if the input isn't fragmented, c_str() costs almost nothing.
// otherwise rectifying copy will be taken
const char* c_in = indata.c_str();
char *c_out = dstptr.c_str();
for (unsigned i = 0; i < count; ++i) {
int r = LZ4_decompress_safe_continue(