ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(compress): move dictionary begin policy into Rust

Browse Source 
Move the compressBegin_usingDict family parameter selection and default-level
normalization into Rust, covering the public ZSTD_compressBegin entry point as
well. C retains private ZSTD_CCtx_params initialization and
ZSTD_compressBegin_internal through callbacks, with the unknown pledged-size
contract preserved.

Test Plan:
- ulimit -v 41943040; CARGO_BUILD_JOBS=1 cargo test --manifest-path rust/Cargo.toml --release compress_begin_using_dict -- --nocapture
- ulimit -v 41943040; CARGO_BUILD_JOBS=1 cargo test --manifest-path rust/Cargo.toml --release
- ulimit -v 41943040; CARGO_BUILD_JOBS=1 cargo clippy --manifest-path rust/Cargo.toml --release --all-targets -- -D warnings
- ulimit -v 41943040; make -B -C programs -j1 zstd
- ulimit -v 41943040; make -C tests -j1 test-zstream ZSTREAM_TESTTIME=-T1s
This commit is contained in:
ddidderr
2026-07-19 15:51:36 +02:00
parent da3d4ed232
commit 9c0b9bd250
2 changed files with 228 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/compress/zstd_compress.c
+54 -5
View File
@@ -1367,6 +1367,33 @@ typedef char ZSTD_rust_compress_using_cdict_state_layout[
== 3 * sizeof(void*)
&& sizeof(ZSTD_rust_compressUsingCDictState) == 4 * sizeof(void*))
? 1 : -1];
typedef void (*ZSTD_rust_compressBeginUsingDictInitParams_f)(
void* cctxParams, const ZSTD_parameters* params, int compressionLevel);
typedef size_t (*ZSTD_rust_compressBeginUsingDictBegin_f)(
void* context, const void* dict, size_t dictSize,
const void* cctxParams, U64 pledgedSrcSize);
typedef struct {
void* cctx;
void* cctxParams;
const U32* exclusionMask;
ZSTD_rust_compressBeginUsingDictInitParams_f initParams;
ZSTD_rust_compressBeginUsingDictBegin_f begin;
} ZSTD_rust_compressBeginUsingDictState;
size_t ZSTD_rust_compressBeginUsingDict(
const ZSTD_rust_compressBeginUsingDictState* state,
const void* dict, size_t dictSize, int compressionLevel);
typedef char ZSTD_rust_compress_begin_using_dict_state_layout[
(offsetof(ZSTD_rust_compressBeginUsingDictState, cctx) == 0
&& offsetof(ZSTD_rust_compressBeginUsingDictState, cctxParams)
== sizeof(void*)
&& offsetof(ZSTD_rust_compressBeginUsingDictState, exclusionMask)
== 2 * sizeof(void*)
&& offsetof(ZSTD_rust_compressBeginUsingDictState, initParams)
== 3 * sizeof(void*)
&& offsetof(ZSTD_rust_compressBeginUsingDictState, begin)
== 4 * sizeof(void*)
&& sizeof(ZSTD_rust_compressBeginUsingDictState) == 5 * sizeof(void*))
? 1 : -1];
typedef struct {
const ZSTD_compressionParameters* cParams;
const unsigned* dictID;
@@ -4796,6 +4823,24 @@ static size_t ZSTD_compressBegin_internal(ZSTD_CCtx* cctx,
return ZSTD_rust_compressBegin(&state);
}
static void ZSTD_rust_compressBeginUsingDict_initParams(
void* cctxParams, const ZSTD_parameters* params, int compressionLevel)
{
ZSTD_CCtxParams_init_internal(
(ZSTD_CCtx_params*)cctxParams, params, compressionLevel);
}
static size_t ZSTD_rust_compressBeginUsingDict_begin(
void* context, const void* dict, size_t dictSize,
const void* cctxParams, U64 pledgedSrcSize)
{
return ZSTD_compressBegin_internal(
(ZSTD_CCtx*)context, dict, dictSize,
ZSTD_dct_auto, ZSTD_dtlm_fast, NULL,
(const ZSTD_CCtx_params*)cctxParams,
pledgedSrcSize, ZSTDb_not_buffered);
}
size_t ZSTD_compressBegin_advanced_internal(ZSTD_CCtx* cctx,
const void* dict, size_t dictSize,
ZSTD_dictContentType_e dictContentType,
@@ -4831,13 +4876,17 @@ size_t ZSTD_compressBegin_advanced(ZSTD_CCtx* cctx,
static size_t
ZSTD_compressBegin_usingDict_deprecated(ZSTD_CCtx* cctx, const void* dict, size_t dictSize, int compressionLevel)
{
ZSTD_rust_compressBeginUsingDictState state;
ZSTD_CCtx_params cctxParams;
{ ZSTD_parameters const params = ZSTD_getParams_internal(compressionLevel, ZSTD_CONTENTSIZE_UNKNOWN, dictSize, ZSTD_cpm_noAttachDict);
ZSTD_CCtxParams_init_internal(&cctxParams, &params, (compressionLevel == 0) ? ZSTD_CLEVEL_DEFAULT : compressionLevel);
}
U32 const exclusionMask = ZSTD_getCParamsExclusionMask();
DEBUGLOG(4, "ZSTD_compressBegin_usingDict (dictSize=%u)", (unsigned)dictSize);
return ZSTD_compressBegin_internal(cctx, dict, dictSize, ZSTD_dct_auto, ZSTD_dtlm_fast, NULL,
&cctxParams, ZSTD_CONTENTSIZE_UNKNOWN, ZSTDb_not_buffered);
state.cctx = cctx;
state.cctxParams = &cctxParams;
state.exclusionMask = &exclusionMask;
state.initParams = ZSTD_rust_compressBeginUsingDict_initParams;
state.begin = ZSTD_rust_compressBeginUsingDict_begin;
return ZSTD_rust_compressBeginUsingDict(
&state, dict, dictSize, compressionLevel);
}
size_t