Slight refactor.

master
Tyler Neely 10 years ago
parent b3ae5fb67a
commit 2fa5de64ab
  1. 24
      src/main.rs
  2. 5
      src/rocksdb.rs

@ -13,7 +13,6 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
#![feature(collections)]
#![feature(test)] #![feature(test)]
#![feature(vec_push_all)] #![feature(vec_push_all)]
@ -21,9 +20,7 @@ extern crate rocksdb;
extern crate test; extern crate test;
use rocksdb::{RocksDBOptions, RocksDB, MergeOperands, new_bloom_filter}; use rocksdb::{RocksDBOptions, RocksDB, MergeOperands, new_bloom_filter};
use rocksdb::RocksDBCompactionStyle::RocksDBUniversalCompaction; use rocksdb::RocksDBCompactionStyle::RocksDBUniversalCompaction;
use test::Bencher;
#[allow(dead_code)]
fn main() { fn main() {
let path = "/tmp/rust-rocksdb"; let path = "/tmp/rust-rocksdb";
let db = RocksDB::open_default(path).unwrap(); let db = RocksDB::open_default(path).unwrap();
@ -45,7 +42,6 @@ fn main() {
custom_merge(); custom_merge();
} }
#[allow(dead_code)]
fn concat_merge(new_key: &[u8], existing_val: Option<&[u8]>, fn concat_merge(new_key: &[u8], existing_val: Option<&[u8]>,
mut operands: &mut MergeOperands) -> Vec<u8> { mut operands: &mut MergeOperands) -> Vec<u8> {
let mut result: Vec<u8> = Vec::with_capacity(operands.size_hint().0); let mut result: Vec<u8> = Vec::with_capacity(operands.size_hint().0);
@ -59,19 +55,18 @@ fn concat_merge(new_key: &[u8], existing_val: Option<&[u8]>,
result result
} }
#[allow(dead_code)]
fn custom_merge() { fn custom_merge() {
let path = "_rust_rocksdb_mergetest"; let path = "_rust_rocksdb_mergetest";
let opts = RocksDBOptions::new(); let opts = RocksDBOptions::new();
opts.create_if_missing(true); opts.create_if_missing(true);
opts.add_merge_operator("test operator", concat_merge); opts.add_merge_operator("test operator", concat_merge);
let db = RocksDB::open(opts, path).unwrap(); let db = RocksDB::open(opts, path).unwrap();
let p = db.put(b"k1", b"a"); db.put(b"k1", b"a");
db.merge(b"k1", b"b"); db.merge(b"k1", b"b");
db.merge(b"k1", b"c"); db.merge(b"k1", b"c");
db.merge(b"k1", b"d"); db.merge(b"k1", b"d");
db.merge(b"k1", b"efg"); db.merge(b"k1", b"efg");
let m = db.merge(b"k1", b"h"); db.merge(b"k1", b"h");
db.get(b"k1").map( |value| { db.get(b"k1").map( |value| {
match value.to_utf8() { match value.to_utf8() {
Some(v) => Some(v) =>
@ -87,7 +82,15 @@ fn custom_merge() {
RocksDB::destroy(opts, path).is_ok(); RocksDB::destroy(opts, path).is_ok();
} }
#[allow(dead_code)]
#[cfg(test)]
mod tests {
use test::Bencher;
use std::thread::sleep_ms;
use rocksdb::{RocksDBOptions, RocksDB, MergeOperands, new_bloom_filter};
use rocksdb::RocksDBCompactionStyle::RocksDBUniversalCompaction;
fn tuned_for_somebody_elses_disk() -> RocksDB { fn tuned_for_somebody_elses_disk() -> RocksDB {
let path = "_rust_rocksdb_optimizetest"; let path = "_rust_rocksdb_optimizetest";
let opts = RocksDBOptions::new(); let opts = RocksDBOptions::new();
@ -117,9 +120,10 @@ fn tuned_for_somebody_elses_disk() -> RocksDB {
RocksDB::open(opts, path).unwrap() RocksDB::open(opts, path).unwrap()
} }
#[allow(dead_code)]
#[bench] #[bench]
fn writes(b: &mut Bencher) { fn writes(b: &mut Bencher) {
// dirty hack due to parallel tests causing contention.
sleep_ms(1000);
let db = tuned_for_somebody_elses_disk(); let db = tuned_for_somebody_elses_disk();
let mut i = 0 as u64; let mut i = 0 as u64;
b.iter(|| { b.iter(|| {
@ -129,7 +133,6 @@ fn writes(b: &mut Bencher) {
db.close(); db.close();
} }
#[allow(dead_code)]
#[bench] #[bench]
fn reads(b: &mut Bencher) { fn reads(b: &mut Bencher) {
let db = tuned_for_somebody_elses_disk(); let db = tuned_for_somebody_elses_disk();
@ -143,3 +146,4 @@ fn reads(b: &mut Bencher) {
}); });
db.close(); db.close();
} }
}

@ -52,7 +52,7 @@ impl RocksDB {
let ospath = Path::new(path); let ospath = Path::new(path);
if !ospath.exists() { if !ospath.exists() {
match fs::create_dir_all(&ospath) { match fs::create_dir_all(&ospath) {
Err(_) => return Err(""), Err(e) => return Err("Failed to create rocksdb directory."),
Ok(_) => (), Ok(_) => (),
} }
} }
@ -213,9 +213,8 @@ impl Drop for RocksDBVector {
impl RocksDBVector { impl RocksDBVector {
pub fn from_c(val: *mut u8, val_len: size_t) -> RocksDBVector { pub fn from_c(val: *mut u8, val_len: size_t) -> RocksDBVector {
unsafe { unsafe {
let base = Unique::new(val);
RocksDBVector { RocksDBVector {
base: base, base: Unique::new(val),
len: val_len as usize, len: val_len as usize,
} }
} }

Loading…
Cancel
Save