changeset 351:b46303bd0520

db_impl: Update tests to account for changed test data.
author Lewin Bormann <lbo@spheniscida.de>
date Thu, 05 Oct 2017 19:45:42 +0200
parents e158f02819cb
children 742cfffd2892
files src/db_impl.rs
diffstat 1 files changed, 14 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/db_impl.rs	Thu Oct 05 19:44:34 2017 +0200
+++ b/src/db_impl.rs	Thu Oct 05 19:45:42 2017 +0200
@@ -952,8 +952,8 @@
         ve.set_log_num(0);
         // 9 files + 1 manifest we write below.
         ve.set_next_file(11);
-        // 26 entries in these tables.
-        ve.set_last_seq(26);
+        // 28 entries in these tables.
+        ve.set_last_seq(28);
 
         for l in 0..NUM_LEVELS {
             for f in &v.files[l] {
@@ -1135,6 +1135,7 @@
             assert_eq!("def".as_bytes(),
                        db.mem
                            .get(&LookupKey::new("abe".as_bytes(), 3))
+                           .0
                            .unwrap()
                            .as_slice());
         }
@@ -1200,20 +1201,27 @@
     }
 
     #[test]
-    fn test_db_impl_get_from_table() {
+    fn test_db_impl_get_from_table_with_snapshot() {
         let mut db = build_db();
 
-        assert_eq!(26, db.vset.borrow().last_seq);
+        assert_eq!(28, db.vset.borrow().last_seq);
 
+        // seq = 29
+        db.put("xyy".as_bytes(), "123".as_bytes()).unwrap();
         let old_ss = db.get_snapshot();
+        // seq = 30
         db.put("xyz".as_bytes(), "123".as_bytes()).unwrap();
+        assert!(db.get_at(&old_ss, "xyy".as_bytes()).unwrap().is_some());
         assert!(db.get_at(&old_ss, "xyz".as_bytes()).unwrap().is_none());
 
         // memtable get
         assert_eq!("123".as_bytes(),
                    db.get("xyz".as_bytes()).unwrap().as_slice());
-        assert!(db.get_internal(26, "xyz".as_bytes()).unwrap().is_none());
-        assert!(db.get_internal(27, "xyz".as_bytes()).unwrap().is_some());
+        assert!(db.get_internal(29, "xyy".as_bytes()).unwrap().is_some());
+        assert!(db.get_internal(30, "xyy".as_bytes()).unwrap().is_some());
+
+        assert!(db.get_internal(29, "xyz".as_bytes()).unwrap().is_none());
+        assert!(db.get_internal(30, "xyz".as_bytes()).unwrap().is_some());
 
         // table get
         assert_eq!("val2".as_bytes(),