Mercurial > lbo > hg > leveldb-rs

changeset 196:1833c6050932

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merging_iter: Remove old, obscure, non-functional test.
author Lewin Bormann <lbo@spheniscida.de>
date Mon, 28 Aug 2017 20:48:30 +0200
parents 03d4b25fd8af
children 41ded1d98935
files src/block.rs src/merging_iter.rs
diffstat 2 files changed, 2 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/src/block.rs	Mon Aug 28 20:43:30 2017 +0200
+++ b/src/block.rs	Mon Aug 28 20:48:30 2017 +0200
@@ -3,7 +3,7 @@
 use std::rc::Rc;
 
 use options::Options;
-use types::{current_key_val, LdbIterator};
+use types::LdbIterator;
 
 use integer_encoding::FixedInt;
 use integer_encoding::VarInt;
@@ -408,7 +408,7 @@
     use super::*;
     use options::*;
     use test_util::{test_iterator_properties, LdbIteratorIter};
-    use types::LdbIterator;
+    use types::{current_key_val, LdbIterator};
 
     fn get_data() -> Vec<(&'static [u8], &'static [u8])> {
         vec![("key1".as_bytes(), "value1".as_bytes()),
--- a/src/merging_iter.rs	Mon Aug 28 20:43:30 2017 +0200
+++ b/src/merging_iter.rs	Mon Aug 28 20:48:30 2017 +0200
@@ -309,7 +309,6 @@
             assert_eq!(k, expected[i]);
             i += 1;
         }
-
     }
 
     #[test]
@@ -341,29 +340,4 @@
         assert_eq!(current_key_val(&iter),
                    Some((b("aba").to_vec(), val.to_vec())));
     }
-
-    // #[test]
-    fn test_merging_fwd_bckwd_2() {
-        let val = "def".as_bytes();
-
-        let it1 = TestLdbIter::new(vec![(b("aba"), val), (b("abc"), val), (b("abe"), val)]);
-        let it2 = TestLdbIter::new(vec![(b("abb"), val), (b("abd"), val)]);
-
-        let mut iter = MergingIter::new(Options::default(), vec![Box::new(it1), Box::new(it2)]);
-
-        iter.next();
-        iter.next();
-        loop {
-            let a = iter.next();
-
-            if let None = a {
-                break;
-            }
-            let b = iter.prev();
-            let c = iter.next();
-            iter.next();
-
-            println!("{:?}", (a, b, c));
-        }
-    }
 }