From 3cf06d4585a15d5a5be442f877186c7fc2b38bd4 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 24 Oct 2019 15:32:21 +1100 Subject: [PATCH] Have cgozstd optionally use zstd 1.4's stable API --- lib/cgozstd/cgozstd.go | 53 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/lib/cgozstd/cgozstd.go b/lib/cgozstd/cgozstd.go index 6cae64b1..e8958846 100644 --- a/lib/cgozstd/cgozstd.go +++ b/lib/cgozstd/cgozstd.go @@ -27,6 +27,8 @@ package cgozstd // -------- #if (ZSTD_VERSION_MAJOR < 1) || (ZSTD_VERSION_MINOR < 3) +// For zstd version 1.2 and below, dictionaries simply aren't supported. + int32_t cgozstd_compress_start(ZSTD_CCtx* z, uint8_t* dict_ptr, uint32_t dict_len, @@ -46,9 +48,15 @@ int32_t cgozstd_decompress_start(ZSTD_DCtx* z, return ZSTD_getErrorCode(ZSTD_initDStream(z)); } -#else +#elif (ZSTD_VERSION_MAJOR < 1) || (ZSTD_VERSION_MINOR < 4) + +// For zstd version 1.3 (but not 1.4 and above), the ZSTD_initFoo_usingDict +// functions are present in the dynamic library, but not part of the stable +// zstd API. We have to explicitly write their function prototypes (or #define +// ZSTD_STATIC_LINKING_ONLY) so that cgo knows about them. +// +// For example, Ubuntu "bionic" 18.04 LTS ships zstd version 1.3.3. -// TODO: don't use the unsupported ZSTD_initFoo_usingDict API. ZSTDLIB_API size_t ZSTD_initCStream_usingDict( ZSTD_CCtx* z, const void* dict_ptr, @@ -74,6 +82,47 @@ int32_t cgozstd_decompress_start(ZSTD_DCtx* z, z, dict_ptr, dict_len)); } +#else + +// For zstd version 1.4 and above, the ZSTD_initFoo_usingDict functions are +// deprecated, and their replacements are part of the stable zstd API. + +int32_t cgozstd_compress_start(ZSTD_CCtx* z, + uint8_t* dict_ptr, + uint32_t dict_len, + int compression_level) { + ZSTD_ErrorCode e; + e = ZSTD_getErrorCode(ZSTD_CCtx_reset(z, ZSTD_reset_session_only)); + if (e) { + return e; + } + e = ZSTD_getErrorCode(ZSTD_CCtx_setParameter( + z, ZSTD_c_compressionLevel, compression_level)); + if (e) { + return e; + } + e = ZSTD_getErrorCode(ZSTD_CCtx_loadDictionary(z, dict_ptr, dict_len)); + if (e) { + return e; + } + return 0; +} + +int32_t cgozstd_decompress_start(ZSTD_DCtx* z, + uint8_t* dict_ptr, + uint32_t dict_len) { + ZSTD_ErrorCode e; + e = ZSTD_getErrorCode(ZSTD_DCtx_reset(z, ZSTD_reset_session_only)); + if (e) { + return e; + } + e = ZSTD_getErrorCode(ZSTD_DCtx_loadDictionary(z, dict_ptr, dict_len)); + if (e) { + return e; + } + return 0; +} + #endif // --------