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

[code cosmetics]

Browse Source 
(*) remove using of some deprecated functions
(*) reduce size of unsafe blocks
master
Andrey Davydov 10 years ago committed by Andrey Davydov
parent 8ce227dec2
commit 6948c2d77b
4 changed files with 62 additions and 70 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. 1
      src/ffi.rs
  2. 8
      src/merge_operator.rs
  3. 119
      src/rocksdb.rs
  4. 4
      src/rocksdb_options.rs

1
src/ffi.rs
Unescape View File

@ -15,7 +15,6 @@
*/
extern crate libc;
use self::libc::{c_char, c_int, c_void, size_t};
use std::ffi::CString;
#[repr(C)]
pub struct RocksDBOptions(pub *const c_void);

8
src/merge_operator.rs
Unescape View File

@ -13,8 +13,6 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
#![allow(unstable)]
extern crate libc;
use self::libc::{c_char, c_int, c_void, size_t};
use std::ffi::CString;
@ -69,8 +67,7 @@ pub extern "C" fn full_merge_callback(
assert!(!buf.is_null());
*new_value_length = result.len() as size_t;
*success = 1 as u8;
ptr::copy_memory(&mut *buf, result.as_ptr()
as *const c_void, result.len());
ptr::copy(&mut *buf, result.as_ptr() as *const c_void, result.len());
buf as *const c_char
}
}
@ -94,8 +91,7 @@ pub extern "C" fn partial_merge_callback(
assert!(!buf.is_null());
*new_value_length = 1 as size_t;
*success = 1 as u8;
ptr::copy_memory(&mut *buf, result.as_ptr()
as *const c_void, result.len());
ptr::copy(&mut *buf, result.as_ptr() as *const c_void, result.len());
buf as *const c_char
}
}

119
src/rocksdb.rs
Unescape View File

@ -16,13 +16,12 @@
extern crate libc;
use self::libc::{c_void, size_t};
use std::ffi::CString;
use std::ffi::{CString, CStr};
use std::fs::{self, PathExt};
use std::ops::Deref;
use std::path::Path;
use std::ptr::Unique;
use std::slice;
use std::str::from_c_str;
use std::str::from_utf8;
use rocksdb_ffi;
@ -33,6 +32,12 @@ pub struct RocksDB {
inner: rocksdb_ffi::RocksDBInstance,
}
fn error_message<'a>(ptr: *const i8) -> &'a str {
unsafe {
return from_utf8(CStr::from_ptr(ptr).to_bytes()).unwrap();
}
}
impl RocksDB {
pub fn open_default(path: &str) -> Result<RocksDB, &str> {
let opts = RocksDBOptions::new();
@ -41,71 +46,69 @@ impl RocksDB {
}
pub fn open(opts: RocksDBOptions, path: &str) -> Result<RocksDB, &str> {
unsafe {
let cpath = CString::from_slice(path.as_bytes());
let cpath_ptr = cpath.as_ptr();
let ospath = Path::new(path);
if !ospath.exists() {
match fs::create_dir_all(&ospath) {
Err(e) => return Err(""),
Ok(_) => (),
}
let cpath = CString::new(path.as_bytes()).unwrap();
let cpath_ptr = cpath.as_ptr();
let ospath = Path::new(path);
if !ospath.exists() {
match fs::create_dir_all(&ospath) {
Err(_) => return Err(""),
Ok(_) => (),
}
}
let err = 0 as *mut i8;
let db = rocksdb_ffi::rocksdb_open(opts.inner, cpath_ptr, err);
if !err.is_null() {
let cs = from_c_str(err as *const i8);
return Err(cs);
}
if db.0.is_null() {
return Err("Could not initialize database.");
}
Ok(RocksDB{inner: db})
let err = 0 as *mut i8;
let db: rocksdb_ffi::RocksDBInstance;
unsafe {
db = rocksdb_ffi::rocksdb_open(opts.inner, cpath_ptr, err);
}
if !err.is_null() {
return Err(error_message(err));
}
if db.0.is_null() {
return Err("Could not initialize database.");
}
Ok(RocksDB{inner: db})
}
pub fn destroy(opts: RocksDBOptions, path: &str) -> Result<(), &str> {
unsafe {
let cpath = CString::from_slice(path.as_bytes());
let cpath_ptr = cpath.as_ptr();
let cpath = CString::new(path.as_bytes()).unwrap();
let cpath_ptr = cpath.as_ptr();
let ospath = Path::new(path);
if !ospath.exists() {
return Err("path does not exist");
}
let ospath = Path::new(path);
if !ospath.exists() {
return Err("path does not exist");
}
let err = 0 as *mut i8;
let result = rocksdb_ffi::rocksdb_destroy_db(
opts.inner, cpath_ptr, err);
if !err.is_null() {
let cs = from_c_str(err as *const i8);
return Err(cs);
}
Ok(())
let err = 0 as *mut i8;
unsafe {
rocksdb_ffi::rocksdb_destroy_db(opts.inner, cpath_ptr, err);
}
if !err.is_null() {
return Err(error_message(err));
}
Ok(())
}
pub fn repair(opts: RocksDBOptions, path: &str) -> Result<(), &str> {
unsafe {
let cpath = CString::from_slice(path.as_bytes());
let cpath_ptr = cpath.as_ptr();
let cpath = CString::new(path.as_bytes()).unwrap();
let cpath_ptr = cpath.as_ptr();
let ospath = Path::new(path);
if !ospath.exists() {
return Err("path does not exist");
}
let ospath = Path::new(path);
if !ospath.exists() {
return Err("path does not exist");
}
let err = 0 as *mut i8;
let result = rocksdb_ffi::rocksdb_repair_db(
opts.inner, cpath_ptr, err);
if !err.is_null() {
let cs = from_c_str(err as *const i8);
return Err(cs);
}
Ok(())
let err = 0 as *mut i8;
unsafe {
rocksdb_ffi::rocksdb_repair_db(opts.inner, cpath_ptr, err);
}
if !err.is_null() {
return Err(error_message(err));
}
Ok(())
}
pub fn create_snapshot(self) -> RocksDBSnapshot {
@ -122,8 +125,7 @@ impl RocksDB {
key.len() as size_t, value.as_ptr(),
value.len() as size_t, err);
if !err.is_null() {
let cs = from_c_str(err as *const i8);
return Err(cs);
return Err(error_message(err));
}
return Ok(())
}
@ -137,8 +139,7 @@ impl RocksDB {
key.len() as size_t, value.as_ptr(),
value.len() as size_t, err);
if !err.is_null() {
let cs = from_c_str(err as *const i8);
return Err(cs);
return Err(error_message(err));
}
return Ok(())
}
@ -160,8 +161,7 @@ impl RocksDB {
let val = rocksdb_ffi::rocksdb_get(self.inner, readopts,
key.as_ptr(), key.len() as size_t, val_len_ptr, err) as *mut u8;
if !err.is_null() {
let cs = from_c_str(err as *const i8);
return RocksDBResult::Error(cs);
return RocksDBResult::Error(error_message(err));
}
match val.is_null() {
true => RocksDBResult::None,
@ -179,8 +179,7 @@ impl RocksDB {
rocksdb_ffi::rocksdb_delete(self.inner, writeopts, key.as_ptr(),
key.len() as size_t, err);
if !err.is_null() {
let cs = from_c_str(err as *const i8);
return Err(cs);
return Err(error_message(err));
}
return Ok(())
}

4
src/rocksdb_options.rs
Unescape View File

@ -13,8 +13,6 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
#![allow(unstable)]
extern crate libc;
use self::libc::{c_int, size_t};
use std::ffi::CString;
@ -73,7 +71,7 @@ impl RocksDBOptions {
pub fn add_merge_operator<'a>( &self, name: &str,
merge_fn: fn (&[u8], Option<&[u8]>, &mut MergeOperands) -> Vec<u8>) {
let cb = Box::new(MergeOperatorCallback {
name: CString::from_slice(name.as_bytes()),
name: CString::new(name.as_bytes()).unwrap(),
merge_fn: merge_fn,
});

Write Preview
Loading…
Cancel
Save