NextGraph
/
rust-rocksdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'kaedroho-patch-1'

Browse Source
master
Tyler Neely 8 years ago
parent a53055838c cff724a070
commit 6bfad9eb85
1 changed files with 50 additions and 55 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 77
      src/rocksdb.rs

77
src/rocksdb.rs
Unescape View File

@ -71,9 +71,7 @@ pub struct Error {
impl Error { impl Error {
fn new(message: String) -> Error { fn new(message: String) -> Error {
Error { Error { message: message }
message: message,
}
} }
pub fn to_string(self) -> String { pub fn to_string(self) -> String {
@ -118,15 +116,13 @@ impl Iterator for DBIterator {
let key_ptr = unsafe { let key_ptr = unsafe {
rocksdb_ffi::rocksdb_iter_key(native_iter, key_len_ptr) rocksdb_ffi::rocksdb_iter_key(native_iter, key_len_ptr)
}; };
let key = unsafe { let key =
slice::from_raw_parts(key_ptr, key_len as usize) unsafe { slice::from_raw_parts(key_ptr, key_len as usize) };
};
let val_ptr = unsafe { let val_ptr = unsafe {
rocksdb_ffi::rocksdb_iter_value(native_iter, val_len_ptr) rocksdb_ffi::rocksdb_iter_value(native_iter, val_len_ptr)
}; };
let val = unsafe { let val =
slice::from_raw_parts(val_ptr, val_len as usize) unsafe { slice::from_raw_parts(val_ptr, val_len as usize) };
};
Some((key.to_vec().into_boxed_slice(), Some((key.to_vec().into_boxed_slice(),
val.to_vec().into_boxed_slice())) val.to_vec().into_boxed_slice()))
@ -144,10 +140,7 @@ pub enum IteratorMode<'a> {
impl DBIterator { impl DBIterator {
fn new(db: &DB, fn new(db: &DB, readopts: &ReadOptions, mode: IteratorMode) -> DBIterator {
readopts: &ReadOptions,
mode: IteratorMode)
-> DBIterator {
unsafe { unsafe {
let iterator = rocksdb_ffi::rocksdb_create_iterator(db.inner, let iterator = rocksdb_ffi::rocksdb_create_iterator(db.inner,
readopts.inner); readopts.inner);
@ -224,9 +217,8 @@ impl Drop for DBIterator {
impl<'a> Snapshot<'a> { impl<'a> Snapshot<'a> {
pub fn new(db: &DB) -> Snapshot { pub fn new(db: &DB) -> Snapshot {
let snapshot = unsafe { let snapshot =
rocksdb_ffi::rocksdb_create_snapshot(db.inner) unsafe { rocksdb_ffi::rocksdb_create_snapshot(db.inner) };
};
Snapshot { Snapshot {
db: db, db: db,
inner: snapshot, inner: snapshot,
@ -318,8 +310,8 @@ impl DB {
let cpath = match CString::new(path.as_bytes()) { let cpath = match CString::new(path.as_bytes()) {
Ok(c) => c, Ok(c) => c,
Err(_) => { Err(_) => {
return Err(Error::new("Failed to convert path to CString when opening \ return Err(Error::new("Failed to convert path to CString \
rocksdb" when opening rocksdb"
.to_string())) .to_string()))
} }
}; };
@ -327,7 +319,9 @@ impl DB {
let ospath = Path::new(path); let ospath = Path::new(path);
if let Err(e) = fs::create_dir_all(&ospath) { if let Err(e) = fs::create_dir_all(&ospath) {
return Err(Error::new(format!("Failed to create rocksdb directory: {:?}", e))) return Err(Error::new(format!("Failed to create rocksdb \
directory: {:?}",
e)));
} }
let mut err: *const i8 = 0 as *const i8; let mut err: *const i8 = 0 as *const i8;
@ -351,10 +345,7 @@ impl DB {
// We need to store our CStrings in an intermediate vector // We need to store our CStrings in an intermediate vector
// so that their pointers remain valid. // so that their pointers remain valid.
let c_cfs: Vec<CString> = cfs_v.iter() let c_cfs: Vec<CString> = cfs_v.iter()
.map(|cf| { .map(|cf| CString::new(cf.as_bytes()).unwrap())
CString::new(cf.as_bytes())
.unwrap()
})
.collect(); .collect();
let cfnames: Vec<*const _> = c_cfs.iter() let cfnames: Vec<*const _> = c_cfs.iter()
@ -362,14 +353,12 @@ impl DB {
.collect(); .collect();
// These handles will be populated by DB. // These handles will be populated by DB.
let cfhandles: Vec<rocksdb_ffi::DBCFHandle> = let cfhandles: Vec<rocksdb_ffi::DBCFHandle> = cfs_v.iter()
cfs_v.iter()
.map(|_| 0 as rocksdb_ffi::DBCFHandle) .map(|_| 0 as rocksdb_ffi::DBCFHandle)
.collect(); .collect();
// TODO(tyler) allow options to be passed in. // TODO(tyler) allow options to be passed in.
let cfopts: Vec<rocksdb_ffi::DBOptions> = let cfopts: Vec<rocksdb_ffi::DBOptions> = cfs_v.iter()
cfs_v.iter()
.map(|_| unsafe { rocksdb_ffi::rocksdb_options_create() }) .map(|_| unsafe { rocksdb_ffi::rocksdb_options_create() })
.collect(); .collect();
@ -386,7 +375,8 @@ impl DB {
for handle in &cfhandles { for handle in &cfhandles {
if handle.is_null() { if handle.is_null() {
return Err(Error::new("Received null column family handle from DB." return Err(Error::new("Received null column family \
handle from DB."
.to_string())); .to_string()));
} }
} }
@ -400,7 +390,8 @@ impl DB {
return Err(Error::new(error_message(err))); return Err(Error::new(error_message(err)));
} }
if db.is_null() { if db.is_null() {
return Err(Error::new("Could not initialize database.".to_string())); return Err(Error::new("Could not initialize database."
.to_string()));
} }
Ok(DB { Ok(DB {
@ -470,7 +461,7 @@ impl DB {
self.write_opt(batch, &WriteOptions::default()) self.write_opt(batch, &WriteOptions::default())
} }
pub fn write_withou_wal(&self, batch: WriteBatch) -> Result<(), Error> { pub fn write_without_wal(&self, batch: WriteBatch) -> Result<(), Error> {
let mut wo = WriteOptions::new(); let mut wo = WriteOptions::new();
wo.disable_wal(true); wo.disable_wal(true);
self.write_opt(batch, &wo) self.write_opt(batch, &wo)
@ -481,9 +472,10 @@ impl DB {
readopts: &ReadOptions) readopts: &ReadOptions)
-> Result<Option<DBVector>, Error> { -> Result<Option<DBVector>, Error> {
if readopts.inner.is_null() { if readopts.inner.is_null() {
return Err(Error::new("Unable to create rocksdb read options. This is a \ return Err(Error::new("Unable to create rocksdb read options. \
fairly trivial call, and its failure may be \ This is a fairly trivial call, and its \
indicative of a mis-compiled or mis-loaded rocksdb \ failure may be indicative of a \
mis-compiled or mis-loaded rocksdb \
library." library."
.to_string())); .to_string()));
} }
@ -522,9 +514,10 @@ impl DB {
readopts: &ReadOptions) readopts: &ReadOptions)
-> Result<Option<DBVector>, Error> { -> Result<Option<DBVector>, Error> {
if readopts.inner.is_null() { if readopts.inner.is_null() {
return Err(Error::new("Unable to create rocksdb read options. This is a \ return Err(Error::new("Unable to create rocksdb read options. \
fairly trivial call, and its failure may be \ This is a fairly trivial call, and its \
indicative of a mis-compiled or mis-loaded rocksdb \ failure may be indicative of a \
mis-compiled or mis-loaded rocksdb \
library." library."
.to_string())); .to_string()));
} }
@ -567,8 +560,8 @@ impl DB {
let cname = match CString::new(name.as_bytes()) { let cname = match CString::new(name.as_bytes()) {
Ok(c) => c, Ok(c) => c,
Err(_) => { Err(_) => {
return Err(Error::new("Failed to convert path to CString when opening \ return Err(Error::new("Failed to convert path to CString \
rocksdb" when opening rocksdb"
.to_string())) .to_string()))
} }
}; };
@ -593,7 +586,8 @@ impl DB {
pub fn drop_cf(&mut self, name: &str) -> Result<(), Error> { pub fn drop_cf(&mut self, name: &str) -> Result<(), Error> {
let cf = self.cfs.get(name); let cf = self.cfs.get(name);
if cf.is_none() { if cf.is_none() {
return Err(Error::new(format!("Invalid column family: {}", name).to_string())); return Err(Error::new(format!("Invalid column family: {}", name)
.to_string()));
} }
let mut err: *const i8 = 0 as *const i8; let mut err: *const i8 = 0 as *const i8;
@ -1016,8 +1010,9 @@ fn errors_do_stuff() {
match DB::destroy(&opts, path) { match DB::destroy(&opts, path) {
Err(s) => { Err(s) => {
assert!(s == assert!(s ==
Error::new("IO error: lock _rust_rocksdb_error/LOCK: No locks \ Error::new("IO error: lock _rust_rocksdb_error/LOCK: No \
available".to_string())) locks available"
.to_string()))
} }
Ok(_) => panic!("should fail"), Ok(_) => panic!("should fail"),
} }

Write Preview
Loading…
Cancel
Save