clean up trace

master
Rick Richardson 7 years ago
parent d31e2bb88e
commit 9fcf924d22
  1. 5
      src/db_options.rs
  2. 10
      src/merge_operator.rs

@ -201,11 +201,6 @@ impl Options {
} }
pub fn set_merge_operator(&mut self, name: &str, full_merge_fn: MergeFn, partial_merge_fn: Option<MergeFn>) { pub fn set_merge_operator(&mut self, name: &str, full_merge_fn: MergeFn, partial_merge_fn: Option<MergeFn>) {
if partial_merge_fn.is_none() {
println!("partial_merge not supplied, defaulting partial merge to full");
} else {
println!("using supplied partial_merge function");
}
let cb = Box::new(MergeOperatorCallback { let cb = Box::new(MergeOperatorCallback {
name: CString::new(name.as_bytes()).unwrap(), name: CString::new(name.as_bytes()).unwrap(),
full_merge_fn: full_merge_fn, full_merge_fn: full_merge_fn,

@ -123,7 +123,6 @@ pub unsafe extern "C" fn partial_merge_callback(
success: *mut u8, success: *mut u8,
new_value_length: *mut size_t, new_value_length: *mut size_t,
) -> *mut c_char { ) -> *mut c_char {
println!("In partial_merge_callback");
let cb = &mut *(raw_cb as *mut MergeOperatorCallback); let cb = &mut *(raw_cb as *mut MergeOperatorCallback);
let operands = &mut MergeOperands::new(operands_list, operands_list_len, num_operands); let operands = &mut MergeOperands::new(operands_list, operands_list_len, num_operands);
let key = slice::from_raw_parts(raw_key as *const u8, key_len as usize); let key = slice::from_raw_parts(raw_key as *const u8, key_len as usize);
@ -221,7 +220,6 @@ mod test {
Some(result) Some(result)
} }
#[ignore]
#[test] #[test]
fn mergetest() { fn mergetest() {
use {DB, Options}; use {DB, Options};
@ -295,7 +293,6 @@ mod test {
) -> Option<Vec<u8>> { ) -> Option<Vec<u8>> {
let nops = operands.size_hint().0; let nops = operands.size_hint().0;
let mut result: Vec<u8> = Vec::with_capacity(nops); let mut result: Vec<u8> = Vec::with_capacity(nops);
println!("Partial merge operands size hint {}", nops);
for op in operands { for op in operands {
for e in op { for e in op {
result.push(*e); result.push(*e);
@ -311,13 +308,10 @@ mod test {
) -> Option<Vec<u8>> { ) -> Option<Vec<u8>> {
let nops = operands.size_hint().0; let nops = operands.size_hint().0;
println!("Full merge operands size hint {}", nops);
let mut counts : ValueCounts = let mut counts : ValueCounts =
if let Some(v) = existing_val { if let Some(v) = existing_val {
println!("Full merge unpacking ValueCounts from {:?}", v);
from_slice::<ValueCounts>(v).unwrap().clone() from_slice::<ValueCounts>(v).unwrap().clone()
} else { } else {
println!("Full merge creating new ValueCounts");
ValueCounts { ValueCounts {
num_a: 0, num_a: 0,
num_b: 0, num_b: 0,
@ -440,7 +434,7 @@ mod test {
None => panic!("Failed to get ValueCounts from db"), None => panic!("Failed to get ValueCounts from db"),
} }
} }
Err(_) => println!("error reading value"), Err(e) => panic!("error reading value {:?}", e),
_ => panic!("value not present"), _ => panic!("value not present"),
} }
match db.get(b"k1") { match db.get(b"k1") {
@ -455,7 +449,7 @@ mod test {
None => panic!("Failed to get ValueCounts from db"), None => panic!("Failed to get ValueCounts from db"),
} }
} }
Err(_) => println!("error reading value"), Err(e) => panic!("error reading value {:?}", e),
_ => panic!("value not present"), _ => panic!("value not present"),
} }
} }

Loading…
Cancel
Save