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

feat(compress): move usingDict policy into Rust

Browse Source 
Move ZSTD_compress_usingDict parameter selection, dictionary-presence handling,
and default compression-level normalization behind a Rust-owned orchestration
boundary. Keep C responsible for the private ZSTD_CCtx_params initialization
and advanced compression operation through explicit callbacks, including the
build-specific excluded-strategy mask.

Test Plan:
- ulimit -v 41943040; CARGO_BUILD_JOBS=1 cargo test --manifest-path rust/Cargo.toml --release
- 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:42:07 +02:00
parent dd404fccbc
commit 556cdc53bf
2 changed files with 260 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/compress/zstd_compress.c
+40 -7
View File
@@ -399,6 +399,29 @@ typedef char ZSTD_rust_compress_advanced_state_layout[
== 2 * sizeof(void*)
&& sizeof(ZSTD_rust_compressAdvancedState) == 3 * sizeof(void*))
? 1 : -1];
typedef void (*ZSTD_rust_compressUsingDictInitParams_f)(
void* context, const ZSTD_parameters* params, int compressionLevel);
typedef struct {
void* callbackContext;
const U32* exclusionMask;
ZSTD_rust_compressUsingDictInitParams_f initParams;
ZSTD_rust_compressAdvancedInternal_f compressInternal;
} ZSTD_rust_compressUsingDictState;
size_t ZSTD_rust_compressUsingDict(
const ZSTD_rust_compressUsingDictState* state,
void* dst, size_t dstCapacity,
const void* src, size_t srcSize,
const void* dict, size_t dictSize, int compressionLevel);
typedef char ZSTD_rust_compress_using_dict_state_layout[
(offsetof(ZSTD_rust_compressUsingDictState, callbackContext) == 0
&& offsetof(ZSTD_rust_compressUsingDictState, exclusionMask)
== sizeof(void*)
&& offsetof(ZSTD_rust_compressUsingDictState, initParams)
== 2 * sizeof(void*)
&& offsetof(ZSTD_rust_compressUsingDictState, compressInternal)
== 3 * sizeof(void*)
&& sizeof(ZSTD_rust_compressUsingDictState) == 4 * sizeof(void*))
? 1 : -1];
ZSTD_frameProgression ZSTD_rust_frameProgression(U64 consumedSrcSize,
size_t buffered,
U64 producedCSize);
@@ -4949,19 +4972,29 @@ static size_t ZSTD_rust_compressAdvanced_compressInternal(
&cctx->simpleApiParams);
}
static void ZSTD_rust_compressUsingDict_initParams(
void* context, const ZSTD_parameters* params, int compressionLevel)
{
ZSTD_CCtxParams_init_internal(
&((ZSTD_CCtx*)context)->simpleApiParams, params, compressionLevel);
}
size_t ZSTD_compress_usingDict(ZSTD_CCtx* cctx,
void* dst, size_t dstCapacity,
const void* src, size_t srcSize,
const void* dict, size_t dictSize,
const void* dict, size_t dictSize,
int compressionLevel)
{
{
ZSTD_parameters const params = ZSTD_getParams_internal(compressionLevel, srcSize, dict ? dictSize : 0, ZSTD_cpm_noAttachDict);
assert(params.fParams.contentSizeFlag == 1);
ZSTD_CCtxParams_init_internal(&cctx->simpleApiParams, &params, (compressionLevel == 0) ? ZSTD_CLEVEL_DEFAULT: compressionLevel);
}
ZSTD_rust_compressUsingDictState state;
U32 const exclusionMask = ZSTD_getCParamsExclusionMask();
DEBUGLOG(4, "ZSTD_compress_usingDict (srcSize=%u)", (unsigned)srcSize);
return ZSTD_compress_advanced_internal(cctx, dst, dstCapacity, src, srcSize, dict, dictSize, &cctx->simpleApiParams);
state.callbackContext = cctx;
state.exclusionMask = &exclusionMask;
state.initParams = ZSTD_rust_compressUsingDict_initParams;
state.compressInternal = ZSTD_rust_compressAdvanced_compressInternal;
return ZSTD_rust_compressUsingDict(
&state, dst, dstCapacity, src, srcSize,
dict, dictSize, compressionLevel);
}
/* ZSTD_compressCCtx() is implemented by rust/src/zstd_compress.rs. */