Skip to content

Commit bf99cc1

Browse files
author
rmqtt
committed
Optimize the codes
1 parent 16ffea9 commit bf99cc1

File tree

4 files changed

+191
-292
lines changed

4 files changed

+191
-292
lines changed

src/lib.rs

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ mod tests {
104104

105105
fn get_cfg(name: &str) -> Config {
106106
let cfg = Config {
107-
storage_type: StorageType::Sled,
107+
storage_type: StorageType::Redis,
108108
sled: SledConfig {
109109
path: format!("./.catch/{}", name),
110110
gc_at_hour: 13,
@@ -123,7 +123,7 @@ mod tests {
123123
#[test]
124124
async fn test_stress() {
125125
let cfg = get_cfg("stress");
126-
let mut db = init_db(&cfg).await.unwrap();
126+
let db = init_db(&cfg).await.unwrap();
127127
let now = std::time::Instant::now();
128128
for i in 0..10_000usize {
129129
db.insert(i.to_be_bytes(), &i).await.unwrap();
@@ -132,7 +132,7 @@ mod tests {
132132
println!("9999: {:?}, cost time: {:?}", k_9999_val, now.elapsed());
133133
assert_eq!(k_9999_val, Some(9999));
134134

135-
let mut s_m_1 = db.map("s_m_1");
135+
let s_m_1 = db.map("s_m_1");
136136
let now = std::time::Instant::now();
137137
for i in 0..10_000usize {
138138
s_m_1.insert(i.to_be_bytes(), &i).await.unwrap();
@@ -169,7 +169,7 @@ mod tests {
169169

170170
let now = std::time::Instant::now();
171171
for i in 0..10_000usize {
172-
let mut s_m = db.map(format!("s_m_{}", i));
172+
let s_m = db.map(format!("s_m_{}", i));
173173
s_m.insert(i.to_be_bytes(), &i).await.unwrap();
174174
}
175175
println!("s_m, cost time: {:?}", now.elapsed());
@@ -187,7 +187,7 @@ mod tests {
187187
async fn test_expiration_cleaning() {
188188
//Clear Expired Cleanup
189189
let cfg = get_cfg("expiration_cleaning");
190-
let mut db = init_db(&cfg).await.unwrap();
190+
let db = init_db(&cfg).await.unwrap();
191191
for i in 0..3usize {
192192
let key = format!("k_{}", i);
193193
db.insert(key.as_bytes(), &format!("v_{}", (i * 10)))
@@ -197,7 +197,7 @@ mod tests {
197197
println!("expire res: {:?}", res);
198198
}
199199

200-
let mut m_1 = db.map("m_1");
200+
let m_1 = db.map("m_1");
201201
m_1.insert("m_k_1", &1).await.unwrap();
202202
m_1.insert("m_k_2", &2).await.unwrap();
203203
let res = db.expire("m_1", 1500).await.unwrap();
@@ -232,7 +232,7 @@ mod tests {
232232
async fn test_db_insert() {
233233
let cfg = get_cfg("db_insert");
234234

235-
let mut db = init_db(&cfg).await.unwrap();
235+
let db = init_db(&cfg).await.unwrap();
236236
let db_key_1 = b"key_1";
237237
let db_key_2 = b"key_2";
238238
let db_val_1 = String::from("val_001");
@@ -263,11 +263,11 @@ mod tests {
263263

264264
assert!(db.contains_key(db_key_1).await.unwrap());
265265

266-
let mut map_1 = db.map("map_1");
266+
let map_1 = db.map("map_1");
267267
map_1.insert("m_k_1", &100).await.unwrap();
268268
assert!(db.contains_key("map_1").await.unwrap());
269269

270-
let mut map_2 = db.map("map_2");
270+
let map_2 = db.map("map_2");
271271
map_2.clear().await.unwrap();
272272
println!(
273273
"test_db_insert contains_key(map_2) {:?}",
@@ -291,7 +291,7 @@ mod tests {
291291
async fn test_db_remove() {
292292
let cfg = get_cfg("db_remove");
293293

294-
let mut db = init_db(&cfg).await.unwrap();
294+
let db = init_db(&cfg).await.unwrap();
295295
let db_key_1 = b"key_11";
296296
let db_key_2 = b"key_22";
297297
let db_val_1 = String::from("val_001");
@@ -306,7 +306,7 @@ mod tests {
306306
assert_eq!(db.get::<_, String>(db_key_1).await.unwrap(), None);
307307
assert_eq!(db.contains_key(db_key_1).await.unwrap(), false);
308308

309-
let mut m2 = db.map(db_key_2);
309+
let m2 = db.map(db_key_2);
310310
m2.clear().await.unwrap();
311311
assert_eq!(db.contains_key(db_key_2).await.unwrap(), false);
312312
m2.insert("m_k_1", &100).await.unwrap();
@@ -323,7 +323,7 @@ mod tests {
323323
#[test]
324324
async fn test_db_contains_key() {
325325
let cfg = get_cfg("db_contains_key");
326-
let mut db = init_db(&cfg).await.unwrap();
326+
let db = init_db(&cfg).await.unwrap();
327327
db.remove("test_c_001").await.unwrap();
328328
let c_res = db.contains_key("test_c_001").await.unwrap();
329329
assert!(!c_res);
@@ -332,7 +332,7 @@ mod tests {
332332
let c_res = db.contains_key("test_c_001").await.unwrap();
333333
assert!(c_res);
334334

335-
let mut map_001 = db.map("map_001");
335+
let map_001 = db.map("map_001");
336336
map_001.clear().await.unwrap();
337337
map_001.insert("k1", &1).await.unwrap();
338338
assert_eq!(map_001.is_empty().await.unwrap(), false);
@@ -352,7 +352,7 @@ mod tests {
352352
let c_res = db.contains_key("list_001").await.unwrap();
353353
assert!(c_res);
354354

355-
let mut map_002 = db.map("map_002");
355+
let map_002 = db.map("map_002");
356356
map_002.clear().await.unwrap();
357357
println!("test_db_contains_key len: {}", map_002.len().await.unwrap());
358358
println!(
@@ -374,7 +374,7 @@ mod tests {
374374
#[test]
375375
async fn test_db_expire() {
376376
let cfg = get_cfg("expire");
377-
let mut db = init_db(&cfg).await.unwrap();
377+
let db = init_db(&cfg).await.unwrap();
378378

379379
let res_none = db.ttl("test_k001").await.unwrap();
380380
println!("ttl res_none: {:?}", res_none);
@@ -664,7 +664,7 @@ mod tests {
664664
let cfg = get_cfg("map_insert");
665665
let db = init_db(&cfg).await.unwrap();
666666

667-
let mut map001 = db.map("001");
667+
let map001 = db.map("001");
668668
map001.clear().await.unwrap();
669669
assert_eq!(map001.len().await.unwrap(), 0);
670670

@@ -691,7 +691,7 @@ mod tests {
691691
let cfg = get_cfg("map_contains_key");
692692
let db = init_db(&cfg).await.unwrap();
693693

694-
let mut map001 = db.map("m001");
694+
let map001 = db.map("m001");
695695
map001.clear().await.unwrap();
696696
assert_eq!(map001.len().await.unwrap(), 0);
697697
assert_eq!(map001.contains_key("k001").await.unwrap(), false);
@@ -710,7 +710,7 @@ mod tests {
710710
let cfg = get_cfg("map");
711711
let db = init_db(&cfg).await.unwrap();
712712

713-
let mut kv001 = db.map("tree_kv001");
713+
let kv001 = db.map("tree_kv001");
714714
let kv_key_1 = b"kv_key_1";
715715

716716
kv001.clear().await.unwrap();
@@ -770,7 +770,7 @@ mod tests {
770770
let cfg = get_cfg("map_retain");
771771
let db = init_db(&cfg).await.unwrap();
772772

773-
let mut map1 = db.map("map1");
773+
let map1 = db.map("map1");
774774
map1.clear().await.unwrap();
775775
for i in 0..100usize {
776776
map1.insert(format!("mk_{}", i), &i).await.unwrap();
@@ -809,7 +809,7 @@ mod tests {
809809
let cfg = get_cfg("batch");
810810
let db = init_db(&cfg).await.unwrap();
811811

812-
let mut skv = db.map("batch_kv001");
812+
let skv = db.map("batch_kv001");
813813

814814
let mut kvs = Vec::new();
815815
for i in 0..100 {
@@ -907,7 +907,7 @@ mod tests {
907907
#[test]
908908
async fn test_list() {
909909
let cfg = get_cfg("array");
910-
let mut db = init_db(&cfg).await.unwrap();
910+
let db = init_db(&cfg).await.unwrap();
911911

912912
let array_a = db.list("array_a");
913913
let array_b = db.list("array_b");
@@ -977,7 +977,7 @@ mod tests {
977977
let cfg = get_cfg("map_list");
978978
let db = init_db(&cfg).await.unwrap();
979979

980-
let mut ml001 = db.map("m_l_001");
980+
let ml001 = db.map("m_l_001");
981981
ml001.clear().await.unwrap();
982982
assert_eq!(ml001.len().await.unwrap(), 0);
983983
assert_eq!(ml001.is_empty().await.unwrap(), true);
@@ -1086,9 +1086,9 @@ mod tests {
10861086
let cfg = get_cfg("async_map_iter");
10871087
let mut db = init_db(&cfg).await.unwrap();
10881088

1089-
let mut m1 = db.map("m1");
1090-
let mut m2 = db.map("m2");
1091-
let mut m3 = db.map("m3");
1089+
let m1 = db.map("m1");
1090+
let m2 = db.map("m2");
1091+
let m3 = db.map("m3");
10921092

10931093
m1.insert("k1", &1).await.unwrap();
10941094
m2.insert("k1", &1).await.unwrap();
@@ -1099,7 +1099,7 @@ mod tests {
10991099

11001100
let mut iter = db.map_iter().await.unwrap();
11011101
while let Some(m) = iter.next().await {
1102-
let mut m = m.unwrap();
1102+
let m = m.unwrap();
11031103
let name = String::from_utf8(m.name().to_vec());
11041104
println!("map name: {:?}, len: {:?}", name, m.len().await);
11051105
let len = m.len().await.unwrap();

0 commit comments

Comments
 (0)