diff --git a/CHANGELOG.md b/CHANGELOG.md index 85e2c0a..f063735 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ * Added `Sync` and `Send` implementations to `Snapshot` (pavel-mukhanov) * Added `raw_iterator_cf_opt` to the DB API (rnarubin) * Added `DB::latest_sequence_number` method (vitvakatu) +* Changed column families storing (aleksuss) ## 0.12.2 (2019-05-03) diff --git a/src/db.rs b/src/db.rs index 261f1f0..539282e 100644 --- a/src/db.rs +++ b/src/db.rs @@ -1825,13 +1825,11 @@ impl ReadOptions { /// that this [`ReadOptions`] value does not leave the scope too early (e.g. `DB::iterator_cf_opt`). pub unsafe fn set_iterate_upper_bound>(&mut self, key: K) { let key = key.as_ref(); - unsafe { - ffi::rocksdb_readoptions_set_iterate_upper_bound( - self.inner, - key.as_ptr() as *const c_char, - key.len() as size_t, - ); - } + ffi::rocksdb_readoptions_set_iterate_upper_bound( + self.inner, + key.as_ptr() as *const c_char, + key.len() as size_t, + ); } pub fn set_prefix_same_as_start(&mut self, v: bool) { diff --git a/src/lib.rs b/src/lib.rs index 0cc760c..6daba9a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -330,5 +330,4 @@ mod test { is_sync::(); is_sync::(); } - } diff --git a/tests/test_db.rs b/tests/test_db.rs index a2da749..cc7a85e 100644 --- a/tests/test_db.rs +++ b/tests/test_db.rs @@ -247,7 +247,7 @@ fn test_sequence_number() { { let db = DB::open_default(&path).unwrap(); assert_eq!(db.latest_sequence_number(), 0); - db.put(b"key", b"value"); + let _ = db.put(b"key", b"value"); assert_eq!(db.latest_sequence_number(), 1); } } diff --git a/tests/test_multithreaded.rs b/tests/test_multithreaded.rs index 141007f..15e0ae8 100644 --- a/tests/test_multithreaded.rs +++ b/tests/test_multithreaded.rs @@ -48,19 +48,19 @@ pub fn test_multithreaded() { let db3 = db.clone(); let j3 = thread::spawn(move || { for _ in 1..N { - match db3.get(b"key") { + let result = match db3.get(b"key") { Ok(Some(v)) => { if &v[..] != b"value1" && &v[..] != b"value2" { - assert!(false); + false + } else { + true } } - _ => { - assert!(false); - } - } + _ => false, + }; + assert!(result); } }); - j1.join().unwrap(); j2.join().unwrap(); j3.join().unwrap();