diff --git a/rust-ext/src/compression_dict.rs b/rust-ext/src/compression_dict.rs index 1338f59d..f47dd61c 100644 --- a/rust-ext/src/compression_dict.rs +++ b/rust-ext/src/compression_dict.rs @@ -234,7 +234,7 @@ fn train_dictionary( (d, steps, level) }; - let params = zstd_sys::ZDICT_fastCover_params_t { + let mut params = zstd_sys::ZDICT_fastCover_params_t { k, d, f, @@ -275,7 +275,7 @@ fn train_dictionary( let mut dict_data: Vec = Vec::with_capacity(dict_size); - train_dictionary_fastcover(&mut dict_data, &samples_buffer, &sample_sizes, ¶ms) + train_dictionary_fastcover(&mut dict_data, &samples_buffer, &sample_sizes, &mut params) .map_err(|msg| ZstdError::new_err(format!("cannot train dict: {}", msg)))?; Ok(ZstdCompressionDict { diff --git a/rust-ext/src/zstd_safe.rs b/rust-ext/src/zstd_safe.rs index 2129484c..7bc1d6f4 100644 --- a/rust-ext/src/zstd_safe.rs +++ b/rust-ext/src/zstd_safe.rs @@ -443,11 +443,12 @@ impl<'a> DCtx<'a> { } } +/// zstd writes the parameters it selected (`k`, `d`, ...) back into `params`. pub fn train_dictionary_fastcover( dict_buffer: &mut Vec, samples_buffer: &[u8], samples_sizes: &[usize], - params: &zstd_sys::ZDICT_fastCover_params_t, + params: &mut zstd_sys::ZDICT_fastCover_params_t, ) -> Result<(), &'static str> { let zresult = unsafe { zstd_sys::ZDICT_optimizeTrainFromBuffer_fastCover( @@ -456,7 +457,7 @@ pub fn train_dictionary_fastcover( samples_buffer.as_ptr() as *const _, samples_sizes.as_ptr(), samples_sizes.len() as _, - params as *const _ as *mut _, + params as *mut _, ) }; if unsafe { zstd_sys::ZDICT_isError(zresult) } != 0 { diff --git a/tests/test_train_dictionary.py b/tests/test_train_dictionary.py index 5c715ea0..1434039b 100644 --- a/tests/test_train_dictionary.py +++ b/tests/test_train_dictionary.py @@ -68,6 +68,19 @@ def test_optimize(self): self.assertIn(d.k, (50, 2000)) self.assertEqual(d.d, 6) + def test_optimize_d(self): + samples = generate_samples() + d = zstd.train_dictionary( + get_optimal_dict_size_heuristically(samples), + samples, + threads=-1, + steps=1, + ) + + # d isn't specified, so d = 6 and d = 8 are tried. + self.assertIn(d.k, (50, 2000)) + self.assertIn(d.d, (6, 8)) + class TestCompressionDict(unittest.TestCase): def test_bad_mode(self):