Commit e585d23e authored by Tyler Neely's avatar Tyler Neely

2->4 spacing

parent 3fba236e
...@@ -130,7 +130,8 @@ extern { ...@@ -130,7 +130,8 @@ extern {
num_operands: c_int, num_operands: c_int,
success: *mut u8, new_value_length: *mut size_t success: *mut u8, new_value_length: *mut size_t
) -> *const c_char, ) -> *const c_char,
delete_value: extern fn(*mut c_void, value: *const c_char, value_len: *mut size_t) -> (), delete_value: extern fn(*mut c_void, value: *const c_char,
value_len: *mut size_t) -> (),
name_fn: extern fn(*mut c_void) -> *const c_char, name_fn: extern fn(*mut c_void) -> *const c_char,
) -> RocksDBMergeOperator; ) -> RocksDBMergeOperator;
pub fn rocksdb_mergeoperator_destroy(mo: RocksDBMergeOperator); pub fn rocksdb_mergeoperator_destroy(mo: RocksDBMergeOperator);
......
...@@ -46,8 +46,7 @@ fn reads(b: &mut Bencher) { ...@@ -46,8 +46,7 @@ fn reads(b: &mut Bencher) {
let db = RocksDB::open_default("testdb").unwrap(); let db = RocksDB::open_default("testdb").unwrap();
let mut i = 0 as u64; let mut i = 0 as u64;
b.iter(|| { b.iter(|| {
db.get(i.to_string().as_bytes()).on_error( db.get(i.to_string().as_bytes()).on_error( |e| {
|e| {
println!("error: {}", e); println!("error: {}", e);
e e
}); });
......
...@@ -26,21 +26,26 @@ impl RocksDBOptions { ...@@ -26,21 +26,26 @@ impl RocksDBOptions {
pub fn increase_parallelism(&self, parallelism: i32) { pub fn increase_parallelism(&self, parallelism: i32) {
unsafe { unsafe {
rocksdb_ffi::rocksdb_options_increase_parallelism(self.inner, parallelism); rocksdb_ffi::rocksdb_options_increase_parallelism(
self.inner, parallelism);
} }
} }
pub fn optimize_level_style_compaction(&self, memtable_memory_budget: i32) { pub fn optimize_level_style_compaction(&self,
memtable_memory_budget: i32) {
unsafe { unsafe {
rocksdb_ffi::rocksdb_options_optimize_level_style_compaction(self.inner, memtable_memory_budget); rocksdb_ffi::rocksdb_options_optimize_level_style_compaction(
self.inner, memtable_memory_budget);
} }
} }
pub fn create_if_missing(&self, create_if_missing: bool) { pub fn create_if_missing(&self, create_if_missing: bool) {
unsafe { unsafe {
match create_if_missing { match create_if_missing {
true => rocksdb_ffi::rocksdb_options_set_create_if_missing(self.inner, 1), true => rocksdb_ffi::rocksdb_options_set_create_if_missing(
false => rocksdb_ffi::rocksdb_options_set_create_if_missing(self.inner, 0), self.inner, 1),
false => rocksdb_ffi::rocksdb_options_set_create_if_missing(
self.inner, 0),
} }
} }
} }
...@@ -116,7 +121,8 @@ impl RocksDB { ...@@ -116,7 +121,8 @@ impl RocksDB {
} }
} }
pub fn get<'a>(&self, key: &[u8]) -> RocksDBResult<'a, RocksDBVector, String> { pub fn get<'a>(&self, key: &[u8]) ->
RocksDBResult<'a, RocksDBVector, String> {
unsafe { unsafe {
let readopts = rocksdb_ffi::rocksdb_readoptions_create(); let readopts = rocksdb_ffi::rocksdb_readoptions_create();
let rocksdb_ffi::RocksDBReadOptions(read_opts_ptr) = readopts; let rocksdb_ffi::RocksDBReadOptions(read_opts_ptr) = readopts;
...@@ -130,8 +136,8 @@ impl RocksDB { ...@@ -130,8 +136,8 @@ impl RocksDB {
let val_len: size_t = 0; let val_len: size_t = 0;
let val_len_ptr = &val_len as *const size_t; let val_len_ptr = &val_len as *const size_t;
let err = 0 as *mut i8; let err = 0 as *mut i8;
let val = rocksdb_ffi::rocksdb_get(self.inner, readopts, key.as_ptr(), let val = rocksdb_ffi::rocksdb_get(self.inner, readopts,
key.len() as size_t, val_len_ptr, err) as *mut u8; key.as_ptr(), key.len() as size_t, val_len_ptr, err) as *mut u8;
if err.is_not_null() { if err.is_not_null() {
let cs = CString::new(err as *const i8, true); let cs = CString::new(err as *const i8, true);
match cs.as_str() { match cs.as_str() {
...@@ -228,8 +234,10 @@ impl <'a,T,E> RocksDBResult<'a,T,E> { ...@@ -228,8 +234,10 @@ impl <'a,T,E> RocksDBResult<'a,T,E> {
pub fn unwrap(self) -> T { pub fn unwrap(self) -> T {
match self { match self {
RocksDBResult::Some(x) => x, RocksDBResult::Some(x) => x,
RocksDBResult::None => panic!("Attempted unwrap on RocksDBResult::None"), RocksDBResult::None =>
RocksDBResult::Error(_) => panic!("Attempted unwrap on RocksDBResult::Error"), panic!("Attempted unwrap on RocksDBResult::None"),
RocksDBResult::Error(_) =>
panic!("Attempted unwrap on RocksDBResult::Error"),
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment