@ -46,14 +46,16 @@ pub struct Snapshot<'a> {
} }
pub struct DBIterator { pub struct DBIterator {
//TODO: should have a reference to DB to enforce scope, but it's trickier than I thought to add
// TODO: should have a reference to DB to enforce scope, but it's trickier than I
// thought to add
inner : rocksdb_ffi ::RocksDBIterator , inner : rocksdb_ffi ::RocksDBIterator ,
direction : Direction , direction : Direction ,
just_seeked : bool just_seeked : bool ,
} }
pub enum Direction { pub enum Direction {
forward , reverse forward ,
reverse ,
} }
pub struct SubDBIterator < ' a > { pub struct SubDBIterator < ' a > {
@ -92,7 +94,7 @@ impl <'a> Iterator for SubDBIterator<'a> {
} }
impl DBIterator { impl DBIterator {
//TODO alias db & opts to different lifetimes, and DBIterator to the db's lifetime
//TODO alias db & opts to different lifetimes, and DBIterator to the db's lifetime
fn new ( db : & RocksDB , readopts : & ReadOptions ) -> DBIterator { fn new ( db : & RocksDB , readopts : & ReadOptions ) -> DBIterator {
unsafe { unsafe {
let iterator = rocksdb_ffi ::rocksdb_create_iterator ( db . inner , readopts . inner ) ; let iterator = rocksdb_ffi ::rocksdb_create_iterator ( db . inner , readopts . inner ) ;
@ -106,7 +108,7 @@ impl DBIterator {
unsafe { unsafe {
rocksdb_ffi ::rocksdb_iter_seek_to_first ( self . inner ) ; rocksdb_ffi ::rocksdb_iter_seek_to_first ( self . inner ) ;
} ; } ;
SubDBIterator { iter : self , direction : Direction ::forward , } SubDBIterator { iter : self , direction : Direction ::forward }
} }
pub fn from_end ( & mut self ) -> SubDBIterator { pub fn from_end ( & mut self ) -> SubDBIterator {
@ -114,7 +116,7 @@ impl DBIterator {
unsafe { unsafe {
rocksdb_ffi ::rocksdb_iter_seek_to_last ( self . inner ) ; rocksdb_ffi ::rocksdb_iter_seek_to_last ( self . inner ) ;
} ; } ;
SubDBIterator { iter : self , direction : Direction ::reverse , } SubDBIterator { iter : self , direction : Direction ::reverse }
} }
pub fn from ( & mut self , key : & [ u8 ] , dir : Direction ) -> SubDBIterator { pub fn from ( & mut self , key : & [ u8 ] , dir : Direction ) -> SubDBIterator {
@ -122,7 +124,7 @@ impl DBIterator {
unsafe { unsafe {
rocksdb_ffi ::rocksdb_iter_seek ( self . inner , key . as_ptr ( ) , key . len ( ) as size_t ) ; rocksdb_ffi ::rocksdb_iter_seek ( self . inner , key . as_ptr ( ) , key . len ( ) as size_t ) ;
} }
SubDBIterator { iter : self , direction : dir , } SubDBIterator { iter : self , direction : dir }
} }
} }
@ -137,7 +139,7 @@ impl Drop for DBIterator {
impl < ' a > Snapshot < ' a > { impl < ' a > Snapshot < ' a > {
pub fn new ( db : & RocksDB ) -> Snapshot { pub fn new ( db : & RocksDB ) -> Snapshot {
let snapshot = unsafe { rocksdb_ffi ::rocksdb_create_snapshot ( db . inner ) } ; let snapshot = unsafe { rocksdb_ffi ::rocksdb_create_snapshot ( db . inner ) } ;
Snapshot { db : db , inner : snapshot } Snapshot { db : db , inner : snapshot }
} }
pub fn iterator ( & self ) -> DBIterator { pub fn iterator ( & self ) -> DBIterator {
@ -180,8 +182,9 @@ impl RocksDB {
pub fn open ( opts : & Options , path : & str ) -> Result < RocksDB , String > { pub fn open ( opts : & Options , path : & str ) -> Result < RocksDB , String > {
let cpath = match CString ::new ( path . as_bytes ( ) ) { let cpath = match CString ::new ( path . as_bytes ( ) ) {
Ok ( c ) = > c , Ok ( c ) = > c ,
Err ( _ ) = > return Err ( "Failed to convert path to CString when opening rocksdb" . to_string ( ) ) , Err ( _ ) = >
return Err ( "Failed to convert path to CString when opening rocksdb" . to_string ( ) ) ,
} ; } ;
let cpath_ptr = cpath . as_ptr ( ) ; let cpath_ptr = cpath . as_ptr ( ) ;
@ -208,7 +211,7 @@ impl RocksDB {
if db_ptr . is_null ( ) { if db_ptr . is_null ( ) {
return Err ( "Could not initialize database." . to_string ( ) ) ; return Err ( "Could not initialize database." . to_string ( ) ) ;
} }
Ok ( RocksDB { inner : db } ) Ok ( RocksDB { inner : db } )
} }
pub fn destroy ( opts : & Options , path : & str ) -> Result < ( ) , String > { pub fn destroy ( opts : & Options , path : & str ) -> Result < ( ) , String > {
@ -358,7 +361,7 @@ impl WriteBatch {
WriteBatch { WriteBatch {
inner : unsafe { inner : unsafe {
rocksdb_ffi ::rocksdb_writebatch_create ( ) rocksdb_ffi ::rocksdb_writebatch_create ( )
} } ,
} }
} }
} }
@ -419,8 +422,9 @@ impl ReadOptions {
ReadOptions { inner : rocksdb_ffi ::rocksdb_readoptions_create ( ) } ReadOptions { inner : rocksdb_ffi ::rocksdb_readoptions_create ( ) }
} }
} }
//TODO add snapshot setting here
// TODO add snapshot setting here
//TODO add snapshot wrapper structs with proper destructors; that struct needs an "iterator" impl too.
// TODO add snapshot wrapper structs with proper destructors;
// that struct needs an "iterator" impl too.
fn fill_cache ( & mut self , v : bool ) { fn fill_cache ( & mut self , v : bool ) {
unsafe { unsafe {
rocksdb_ffi ::rocksdb_readoptions_set_fill_cache ( self . inner , v ) ; rocksdb_ffi ::rocksdb_readoptions_set_fill_cache ( self . inner , v ) ;
@ -505,7 +509,7 @@ impl <T, E> RocksDBResult<T, E> {
} }
} }
pub fn on_absent < F : FnOnce ( ) ->( ) > ( self , f : F ) -> RocksDBResult < T , E > { pub fn on_absent < F : FnOnce ( ) ( ) > ( self , f : F ) -> RocksDBResult < T , E > {
match self { match self {
RocksDBResult ::Some ( x ) = > RocksDBResult ::Some ( x ) , RocksDBResult ::Some ( x ) = > RocksDBResult ::Some ( x ) ,
RocksDBResult ::None = > { RocksDBResult ::None = > {
David Greenberg
10 years ago