andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove use of deprecated LZ4 function

Browse Source 
Summary:
LZ4 1.7.3 emits warnings when calling the deprecated function `LZ4_compress_limitedOutput_continue()`.  Starting in r129, LZ4 introduces `LZ4_compress_fast_continue()` as a replacement, and the two functions calls are [exactly equivalent](https://github.com/lz4/lz4/blob/dev/lib/lz4.c#L1408).
Closes https://github.com/facebook/rocksdb/pull/1532

Differential Revision: D4199240

Pulled By: siying

fbshipit-source-id: 138c2bc
This commit is contained in:
Nick Terrell 2016-11-21 12:17:06 -08:00 committed by Facebook Github Bot
parent 548d7fb261
commit 4444256ab7
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/compression.h
View File

@ -553,9 +553,15 @@ inline bool LZ4_Compress(const CompressionOptions& opts,
LZ4_loadDict(stream, compression_dict.data(), LZ4_loadDict(stream, compression_dict.data(),
static_cast<int>(compression_dict.size())); static_cast<int>(compression_dict.size()));
} }
#if LZ4_VERSION_NUMBER >= 10700 // r129+
outlen = LZ4_compress_fast_continue(
stream, input, &(*output)[output_header_len], static_cast<int>(length),
compress_bound, 1);
#else // up to r128
outlen = LZ4_compress_limitedOutput_continue( outlen = LZ4_compress_limitedOutput_continue(
stream, input, &(*output)[output_header_len], static_cast<int>(length), stream, input, &(*output)[output_header_len], static_cast<int>(length),
compress_bound); compress_bound);
#endif
LZ4_freeStream(stream); LZ4_freeStream(stream);
#else // up to r123 #else // up to r123
outlen = LZ4_compress_limitedOutput(input, &(*output)[output_header_len], outlen = LZ4_compress_limitedOutput(input, &(*output)[output_header_len],