Restore old compression functions to preserve ABI

Fixes #183
This commit is contained in:
Danila Kutenin 2024-05-21 19:25:25 +00:00
parent 52820ea9c6
commit 465b5b60ca
2 changed files with 43 additions and 5 deletions

View File

@ -1792,6 +1792,10 @@ bool GetUncompressedLength(Source* source, uint32_t* result) {
return decompressor.ReadUncompressedLength(result); return decompressor.ReadUncompressedLength(result);
} }
size_t Compress(Source* reader, Sink* writer) {
return Compress(reader, writer, CompressionOptions{});
}
size_t Compress(Source* reader, Sink* writer, CompressionOptions options) { size_t Compress(Source* reader, Sink* writer, CompressionOptions options) {
assert(options.level == 1 || options.level == 2); assert(options.level == 1 || options.level == 2);
int token = 0; int token = 0;
@ -2298,6 +2302,12 @@ bool IsValidCompressed(Source* compressed) {
return InternalUncompress(compressed, &writer); return InternalUncompress(compressed, &writer);
} }
void RawCompress(const char* input, size_t input_length, char* compressed,
size_t* compressed_length) {
RawCompress(input, input_length, compressed, compressed_length,
CompressionOptions{});
}
void RawCompress(const char* input, size_t input_length, char* compressed, void RawCompress(const char* input, size_t input_length, char* compressed,
size_t* compressed_length, CompressionOptions options) { size_t* compressed_length, CompressionOptions options) {
ByteArraySource reader(input, input_length); ByteArraySource reader(input, input_length);
@ -2308,6 +2318,12 @@ void RawCompress(const char* input, size_t input_length, char* compressed,
*compressed_length = (writer.CurrentDestination() - compressed); *compressed_length = (writer.CurrentDestination() - compressed);
} }
void RawCompressFromIOVec(const struct iovec* iov, size_t uncompressed_length,
char* compressed, size_t* compressed_length) {
RawCompressFromIOVec(iov, uncompressed_length, compressed, compressed_length,
CompressionOptions{});
}
void RawCompressFromIOVec(const struct iovec* iov, size_t uncompressed_length, void RawCompressFromIOVec(const struct iovec* iov, size_t uncompressed_length,
char* compressed, size_t* compressed_length, char* compressed, size_t* compressed_length,
CompressionOptions options) { CompressionOptions options) {
@ -2319,6 +2335,11 @@ void RawCompressFromIOVec(const struct iovec* iov, size_t uncompressed_length,
*compressed_length = writer.CurrentDestination() - compressed; *compressed_length = writer.CurrentDestination() - compressed;
} }
size_t Compress(const char* input, size_t input_length,
std::string* compressed) {
return Compress(input, input_length, compressed, CompressionOptions{});
}
size_t Compress(const char* input, size_t input_length, std::string* compressed, size_t Compress(const char* input, size_t input_length, std::string* compressed,
CompressionOptions options) { CompressionOptions options) {
// Pre-grow the buffer to the max length of the compressed output // Pre-grow the buffer to the max length of the compressed output
@ -2331,6 +2352,11 @@ size_t Compress(const char* input, size_t input_length, std::string* compressed,
return compressed_length; return compressed_length;
} }
size_t CompressFromIOVec(const struct iovec* iov, size_t iov_cnt,
std::string* compressed) {
return CompressFromIOVec(iov, iov_cnt, compressed, CompressionOptions{});
}
size_t CompressFromIOVec(const struct iovec* iov, size_t iov_cnt, size_t CompressFromIOVec(const struct iovec* iov, size_t iov_cnt,
std::string* compressed, CompressionOptions options) { std::string* compressed, CompressionOptions options) {
// Compute the number of bytes to be compressed. // Compute the number of bytes to be compressed.

View File

@ -78,8 +78,10 @@ namespace snappy {
// Compress the bytes read from "*reader" and append to "*writer". Return the // Compress the bytes read from "*reader" and append to "*writer". Return the
// number of bytes written. // number of bytes written.
// First version is to preserve ABI.
size_t Compress(Source* reader, Sink* writer);
size_t Compress(Source* reader, Sink* writer, size_t Compress(Source* reader, Sink* writer,
CompressionOptions options = {}); CompressionOptions options);
// Find the uncompressed length of the given stream, as given by the header. // Find the uncompressed length of the given stream, as given by the header.
// Note that the true length could deviate from this; the stream could e.g. // Note that the true length could deviate from this; the stream could e.g.
@ -98,16 +100,22 @@ namespace snappy {
// Original contents of *compressed are lost. // Original contents of *compressed are lost.
// //
// REQUIRES: "input[]" is not an alias of "*compressed". // REQUIRES: "input[]" is not an alias of "*compressed".
// First version is to preserve ABI.
size_t Compress(const char* input, size_t input_length, size_t Compress(const char* input, size_t input_length,
std::string* compressed, CompressionOptions options = {}); std::string* compressed);
size_t Compress(const char* input, size_t input_length,
std::string* compressed, CompressionOptions options);
// Same as `Compress` above but taking an `iovec` array as input. Note that // Same as `Compress` above but taking an `iovec` array as input. Note that
// this function preprocesses the inputs to compute the sum of // this function preprocesses the inputs to compute the sum of
// `iov[0..iov_cnt-1].iov_len` before reading. To avoid this, use // `iov[0..iov_cnt-1].iov_len` before reading. To avoid this, use
// `RawCompressFromIOVec` below. // `RawCompressFromIOVec` below.
// First version is to preserve ABI.
size_t CompressFromIOVec(const struct iovec* iov, size_t iov_cnt,
std::string* compressed);
size_t CompressFromIOVec(const struct iovec* iov, size_t iov_cnt, size_t CompressFromIOVec(const struct iovec* iov, size_t iov_cnt,
std::string* compressed, std::string* compressed,
CompressionOptions options = {}); CompressionOptions options);
// Decompresses "compressed[0..compressed_length-1]" to "*uncompressed". // Decompresses "compressed[0..compressed_length-1]" to "*uncompressed".
// Original contents of "*uncompressed" are lost. // Original contents of "*uncompressed" are lost.
@ -151,14 +159,18 @@ namespace snappy {
// ... Process(output, output_length) ... // ... Process(output, output_length) ...
// delete [] output; // delete [] output;
void RawCompress(const char* input, size_t input_length, char* compressed, void RawCompress(const char* input, size_t input_length, char* compressed,
size_t* compressed_length, CompressionOptions options = {}); size_t* compressed_length);
void RawCompress(const char* input, size_t input_length, char* compressed,
size_t* compressed_length, CompressionOptions options);
// Same as `RawCompress` above but taking an `iovec` array as input. Note that // Same as `RawCompress` above but taking an `iovec` array as input. Note that
// `uncompressed_length` is the total number of bytes to be read from the // `uncompressed_length` is the total number of bytes to be read from the
// elements of `iov` (_not_ the number of elements in `iov`). // elements of `iov` (_not_ the number of elements in `iov`).
void RawCompressFromIOVec(const struct iovec* iov, size_t uncompressed_length,
char* compressed, size_t* compressed_length);
void RawCompressFromIOVec(const struct iovec* iov, size_t uncompressed_length, void RawCompressFromIOVec(const struct iovec* iov, size_t uncompressed_length,
char* compressed, size_t* compressed_length, char* compressed, size_t* compressed_length,
CompressionOptions options = {}); CompressionOptions options);
// Given data in "compressed[0..compressed_length-1]" generated by // Given data in "compressed[0..compressed_length-1]" generated by
// calling the Snappy::Compress routine, this routine // calling the Snappy::Compress routine, this routine