add 3.5 tests

Signed-off-by: Alex Chi Z <iskyzh@gmail.com>

mini-lsm-mvcc/src/mvcc/watermark.rs

@@ -4,6 +4,12 @@ pub struct Watermark {
     readers: BTreeMap<u64, usize>,
 }
 
+impl Default for Watermark {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl Watermark {
     pub fn new() -> Self {
         Self {

mini-lsm-mvcc/src/tests.rs

@@ -16,3 +16,4 @@ mod week3_day1;
 mod week3_day2;
 mod week3_day3;
 mod week3_day4;
+mod week3_day5;

mini-lsm-mvcc/src/tests/week3_day4.rs

@@ -1,15 +1,10 @@
-use std::ops::Bound;
-
 use bytes::Bytes;
 use tempfile::tempdir;
 
 use crate::{
     compact::CompactionOptions,
-    key::KeySlice,
     lsm_storage::{LsmStorageOptions, MiniLsm, WriteBatchRecord},
     mvcc::watermark::Watermark,
-    table::SsTableBuilder,
-    tests::harness::check_lsm_iter_result_by_key,
 };
 
 use super::harness::{check_iter_result_by_key, construct_merge_iterator_over_storage};

mini-lsm-mvcc/src/tests/week3_day5.rs

@@ -0,0 +1,56 @@
+use std::ops::Bound;
+
+use bytes::Bytes;
+use tempfile::tempdir;
+
+use crate::{
+    compact::CompactionOptions,
+    lsm_storage::{LsmStorageOptions, MiniLsm},
+    tests::harness::check_lsm_iter_result_by_key,
+};
+
+#[test]
+fn test_txn_integration() {
+    let dir = tempdir().unwrap();
+    let options = LsmStorageOptions::default_for_week2_test(CompactionOptions::NoCompaction);
+    let storage = MiniLsm::open(&dir, options.clone()).unwrap();
+    let txn1 = storage.new_txn().unwrap();
+    let txn2 = storage.new_txn().unwrap();
+    txn1.put(b"test1", b"233");
+    txn2.put(b"test2", b"233");
+    check_lsm_iter_result_by_key(
+        &mut txn1.scan(Bound::Unbounded, Bound::Unbounded).unwrap(),
+        vec![(Bytes::from("test1"), Bytes::from("233"))],
+    );
+    check_lsm_iter_result_by_key(
+        &mut txn2.scan(Bound::Unbounded, Bound::Unbounded).unwrap(),
+        vec![(Bytes::from("test2"), Bytes::from("233"))],
+    );
+    let txn3 = storage.new_txn().unwrap();
+    check_lsm_iter_result_by_key(
+        &mut txn3.scan(Bound::Unbounded, Bound::Unbounded).unwrap(),
+        vec![],
+    );
+    txn1.commit().unwrap();
+    txn2.commit().unwrap();
+    check_lsm_iter_result_by_key(
+        &mut txn3.scan(Bound::Unbounded, Bound::Unbounded).unwrap(),
+        vec![],
+    );
+    drop(txn3);
+    check_lsm_iter_result_by_key(
+        &mut storage.scan(Bound::Unbounded, Bound::Unbounded).unwrap(),
+        vec![
+            (Bytes::from("test1"), Bytes::from("233")),
+            (Bytes::from("test2"), Bytes::from("233")),
+        ],
+    );
+    let txn4 = storage.new_txn().unwrap();
+    check_lsm_iter_result_by_key(
+        &mut txn4.scan(Bound::Unbounded, Bound::Unbounded).unwrap(),
+        vec![
+            (Bytes::from("test1"), Bytes::from("233")),
+            (Bytes::from("test2"), Bytes::from("233")),
+        ],
+    );
+}