Skip to content

Commit 3974b89

Browse files
committed
refactor: 移除 zstd 压缩
1 parent 663b608 commit 3974b89

4 files changed

Lines changed: 18 additions & 14 deletions

File tree

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ phf = { version = "0.13", features = ["macros"] }
2828
serde = { version = "1", features = ["derive"] }
2929
serde_json = "1"
3030
thiserror = "2"
31-
zstd = "0.13"
3231

3332
clap = { version = "4.5", features = ["derive"], optional = true }
3433
wasm-bindgen = { version = "0.2", optional = true }

ferrous-opencc-compiler/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@ license = "Apache-2.0"
99
anyhow = "1"
1010
bincode = "2"
1111
fst = "0"
12-
zstd = "0.13"

ferrous-opencc-compiler/src/lib.rs

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
use std::{
22
collections::BTreeMap,
33
fs::File,
4-
io::{BufRead, BufReader, Write},
4+
io::{
5+
BufRead,
6+
BufReader,
7+
Write,
8+
},
59
path::Path,
610
sync::Arc,
711
};
812

9-
use anyhow::{Context, Result};
10-
use bincode::{Decode, Encode, config};
13+
use anyhow::{
14+
Context,
15+
Result,
16+
};
17+
use bincode::{
18+
Decode,
19+
Encode,
20+
config,
21+
};
1122
use fst::MapBuilder;
1223

1324
#[derive(Encode, Decode, Debug)]
@@ -25,7 +36,7 @@ pub enum Delta {
2536

2637
#[derive(Encode, Decode, Debug)]
2738
pub struct SerializableFstDict {
28-
pub compressed_values: Vec<u8>,
39+
pub values_bytes: Vec<u8>,
2940
pub max_key_length: usize,
3041
}
3142

@@ -95,11 +106,8 @@ pub fn compile_dictionary(input_path: &Path) -> Result<Vec<u8>> {
95106
let values_bytes = bincode::encode_to_vec(&values_vec, config::standard())
96107
.with_context(|| "Bincode values serialization failed")?;
97108

98-
let compressed_values =
99-
zstd::encode_all(&values_bytes[..], 0).with_context(|| "Zstd compression failed")?;
100-
101109
let metadata = SerializableFstDict {
102-
compressed_values,
110+
values_bytes,
103111
max_key_length,
104112
};
105113

src/dictionary/fst_dict.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,9 @@ impl FstDict {
7575

7676
pub fn serialize_to_file(&self, path: &Path) -> Result<()> {
7777
let values_bytes = bincode::encode_to_vec(&self.values, config::standard())?;
78-
let compressed_values = zstd::encode_all(&values_bytes[..], 0)?;
7978

8079
let metadata = SerializableFstDict {
81-
compressed_values,
80+
values_bytes,
8281
max_key_length: self.max_key_length,
8382
};
8483
let metadata_bytes = bincode::encode_to_vec(&metadata, config::standard())?;
@@ -114,9 +113,8 @@ impl FstDict {
114113
let (metadata, _): (SerializableFstDict, usize) =
115114
bincode::decode_from_slice(&metadata_bytes, config::standard())?;
116115

117-
let values_bytes = zstd::decode_all(&metadata.compressed_values[..])?;
118116
let (values, _): (Vec<Vec<Delta>>, usize) =
119-
bincode::decode_from_slice(&values_bytes, config::standard())?;
117+
bincode::decode_from_slice(&metadata.values_bytes, config::standard())?;
120118

121119
let mut fst_bytes = Vec::new();
122120
reader.read_to_end(&mut fst_bytes)?;

0 commit comments

Comments
 (0)