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

refactor(compress): remove obsolete C block adapters

Browse Source 
Remove the unreachable C target-sized and split-block adapters now that frame chunks use the direct Rust state projections. The C sequence-store wrapper was likewise unused after those adapters disappeared.

Keep the target and split callback slots as nullable Rust test seams and return a generic error if a caller selects a callback fallback without providing one. Production frame-chunk state now leaves both slots null because the direct projections are authoritative.

Test Plan:
- ulimit -v 41943040; CARGO_BUILD_JOBS=1 cargo fmt --manifest-path rust/Cargo.toml --all -- --check
- ulimit -v 41943040; CARGO_BUILD_JOBS=1 cargo test --manifest-path rust/Cargo.toml --lib
- ulimit -v 41943040; CARGO_BUILD_JOBS=1 cargo clippy --manifest-path rust/Cargo.toml --all-targets -- -D warnings
- ulimit -v 41943040; make -j1
- ulimit -v 41943040; make -j1 -C tests test-zstream ZSTREAM_TESTTIME=-T2s
- ulimit -v 41943040; make -j1 -C tests test-fuzzer FUZZERTEST=-T3s FUZZER_FLAGS=--no-big-tests
This commit is contained in:
ddidderr
2026-07-20 02:13:29 +02:00
parent 93eaef18b8
commit 919d138f02
2 changed files with 22 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rust/src/zstd_compress.rs
+20 -14
View File
@@ -640,8 +640,8 @@ pub struct ZSTD_rust_frameChunkState {
checksum_flag: c_int,
ending_stage: c_int,
prepare_state: *const ZSTD_rust_frameChunkPrepareState,
compress_target: FrameChunkCompressFn,
compress_split: FrameChunkCompressFn,
compress_target: Option<FrameChunkCompressFn>,
compress_split: Option<FrameChunkCompressFn>,
compress_internal: Option<FrameChunkCompressFn>,
compress_internal_state: *const ZSTD_rust_compressContinueBlockState,
compress_target_state: *const ZSTD_rust_targetCBlockSizeState,
@@ -828,8 +828,11 @@ unsafe fn compress_frame_chunk_body_with(
)
}
} else {
let Some(compress_target) = state.compress_target else {
return ERROR(ZstdErrorCode::Generic);
};
unsafe {
(state.compress_target)(
compress_target(
state.callback_context,
op.cast(),
remaining_capacity,
@@ -935,8 +938,11 @@ unsafe fn compress_frame_chunk_body_with(
)
}
} else {
let Some(compress_split) = state.compress_split else {
return ERROR(ZstdErrorCode::Generic);
};
unsafe {
(state.compress_split)(
compress_split(
state.callback_context,
op.cast(),
remaining_capacity,
@@ -10612,8 +10618,8 @@ mod tests {
checksum_flag: 0,
ending_stage: ZSTD_COMPRESSION_STAGE_ENDING,
prepare_state: frame_chunk_prepare_state,
compress_target: compress_end_test_frame_target,
compress_split: compress_end_test_frame_target,
compress_target: Some(compress_end_test_frame_target),
compress_split: Some(compress_end_test_frame_target),
compress_internal: Some(compress_end_test_frame_target),
compress_internal_state: ptr::null(),
compress_target_state: ptr::null(),
@@ -11491,8 +11497,8 @@ mod tests {
checksum_flag,
ending_stage: 77,
prepare_state,
compress_target: frame_chunk_test_target,
compress_split: frame_chunk_test_split,
compress_target: Some(frame_chunk_test_target),
compress_split: Some(frame_chunk_test_split),
compress_internal: Some(frame_chunk_test_internal),
compress_internal_state: ptr::null(),
compress_target_state: ptr::null(),
@@ -11834,8 +11840,8 @@ mod tests {
checksum_flag: 0,
ending_stage: ZSTD_COMPRESSION_STAGE_ENDING,
prepare_state: frame_chunk_prepare_state,
compress_target: compress_continue_test_frame,
compress_split: compress_continue_test_frame,
compress_target: Some(compress_continue_test_frame),
compress_split: Some(compress_continue_test_frame),
compress_internal: Some(compress_continue_test_frame),
compress_internal_state: ptr::null(),
compress_target_state: ptr::null(),
@@ -12323,8 +12329,8 @@ mod tests {
checksum_flag: 0,
ending_stage: ZSTD_COMPRESSION_STAGE_ENDING,
prepare_state: frame_chunk_prepare_state,
compress_target: compress_stream_test_block,
compress_split: compress_stream_test_block,
compress_target: Some(compress_stream_test_block),
compress_split: Some(compress_stream_test_block),
compress_internal: Some(compress_stream_test_block),
compress_internal_state: ptr::null(),
compress_target_state: ptr::null(),
@@ -12351,8 +12357,8 @@ mod tests {
checksum_flag: 0,
ending_stage: ZSTD_COMPRESSION_STAGE_ENDING,
prepare_state: frame_chunk_prepare_state,
compress_target: compress_stream_test_end,
compress_split: compress_stream_test_end,
compress_target: Some(compress_stream_test_end),
compress_split: Some(compress_stream_test_end),
compress_internal: Some(compress_stream_test_end),
compress_internal_state: ptr::null(),
compress_target_state: ptr::null(),