use assert_eq! in test and return vec from unsafe

master
Marat Safin 7 years ago
parent f967d3c50f
commit 56e5829b89
  1. 5
      src/db.rs
  2. 2
      tests/test_column_family.rs

@ -671,19 +671,18 @@ impl DB {
}; };
let mut length = 0; let mut length = 0;
let vec;
unsafe { unsafe {
let ptr = ffi_try!(ffi::rocksdb_list_column_families(opts.inner, let ptr = ffi_try!(ffi::rocksdb_list_column_families(opts.inner,
cpath.as_ptr() as *const _, cpath.as_ptr() as *const _,
&mut length)); &mut length));
vec = Vec::from_raw_parts(ptr, length, length).iter().map(|&ptr| { let vec = Vec::from_raw_parts(ptr, length, length).iter().map(|&ptr| {
CString::from_raw(ptr).into_string().unwrap() CString::from_raw(ptr).into_string().unwrap()
}).collect(); }).collect();
}
Ok(vec) Ok(vec)
} }
}
pub fn destroy<P: AsRef<Path>>(opts: &Options, path: P) -> Result<(), Error> { pub fn destroy<P: AsRef<Path>>(opts: &Options, path: P) -> Result<(), Error> {

@ -68,7 +68,7 @@ pub fn test_column_family() {
let opts = Options::default(); let opts = Options::default();
let vec = DB::list_cf(&opts, path); let vec = DB::list_cf(&opts, path);
match vec { match vec {
Ok(vec) => println!("list cf: {:?}", vec), Ok(vec) => assert_eq!(vec, vec!["default", "cf1"]),
Err(e) => panic!("failed to drop column family: {}", e), Err(e) => panic!("failed to drop column family: {}", e),
} }
} }

Loading…
Cancel
Save