From a5becb43080e6fc1417adfc3744937768c504f99 Mon Sep 17 00:00:00 2001 From: Tyler Neely Date: Tue, 25 Oct 2016 14:26:41 +0200 Subject: [PATCH] move merge operator column family test to ignored test for now --- test/test_column_family.rs | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/test/test_column_family.rs b/test/test_column_family.rs index 2e93f1f..66a3f79 100644 --- a/test/test_column_family.rs +++ b/test/test_column_family.rs @@ -59,6 +59,28 @@ pub fn test_column_family() { Err(e) => panic!("failed to open db with column family: {}", e), } } + // TODO should be able to use writebatch ops with a cf + { + } + // TODO should be able to iterate over a cf + { + } + // should b able to drop a cf + { + let mut db = DB::open_cf(&Options::default(), path, &["cf1"]).unwrap(); + match db.drop_cf("cf1") { + Ok(_) => println!("cf1 successfully dropped."), + Err(e) => panic!("failed to drop column family: {}", e), + } + } + + assert!(DB::destroy(&Options::default(), path).is_ok()); +} + +#[test] +#[ignore] +fn test_merge_operator() { + let path = "_rust_rocksdb_cftest_merge"; // TODO should be able to write, read, merge, batch, and iterate over a cf { let mut opts = Options::default(); @@ -99,22 +121,7 @@ pub fn test_column_family() { assert!(db.delete(b"k1").is_ok()); assert!(db.get(b"k1").unwrap().is_none()); } - // TODO should be able to use writebatch ops with a cf - { - } - // TODO should be able to iterate over a cf - { - } - // should b able to drop a cf - { - let mut db = DB::open_cf(&Options::default(), path, &["cf1"]).unwrap(); - match db.drop_cf("cf1") { - Ok(_) => println!("cf1 successfully dropped."), - Err(e) => panic!("failed to drop column family: {}", e), - } - } - assert!(DB::destroy(&Options::default(), path).is_ok()); } fn test_provided_merge(_: &[u8],