add 3.6

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

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

@@ -46,6 +46,8 @@ fn test_txn_integration() {
         ],
     );
     let txn4 = storage.new_txn().unwrap();
+    assert_eq!(txn4.get(b"test1").unwrap(), Some(Bytes::from("233")));
+    assert_eq!(txn4.get(b"test2").unwrap(), Some(Bytes::from("233")));
     check_lsm_iter_result_by_key(
         &mut txn4.scan(Bound::Unbounded, Bound::Unbounded).unwrap(),
         vec![
@@ -53,4 +55,21 @@ fn test_txn_integration() {
             (Bytes::from("test2"), Bytes::from("233")),
         ],
     );
+    txn4.put(b"test2", b"2333");
+    assert_eq!(txn4.get(b"test1").unwrap(), Some(Bytes::from("233")));
+    assert_eq!(txn4.get(b"test2").unwrap(), Some(Bytes::from("2333")));
+    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("2333")),
+        ],
+    );
+    txn4.delete(b"test2");
+    assert_eq!(txn4.get(b"test1").unwrap(), Some(Bytes::from("233")));
+    assert_eq!(txn4.get(b"test2").unwrap(), None);
+    check_lsm_iter_result_by_key(
+        &mut txn4.scan(Bound::Unbounded, Bound::Unbounded).unwrap(),
+        vec![(Bytes::from("test1"), Bytes::from("233"))],
+    );
 }

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

@@ -0,0 +1,108 @@
+use std::ops::Bound;
+
+use bytes::Bytes;
+use tempfile::tempdir;
+
+use crate::{
+    compact::CompactionOptions,
+    iterators::StorageIterator,
+    lsm_storage::{LsmStorageOptions, MiniLsm},
+};
+
+#[test]
+fn test_serializable_1() {
+    let dir = tempdir().unwrap();
+    let mut options = LsmStorageOptions::default_for_week2_test(CompactionOptions::NoCompaction);
+    options.serializable = true;
+    let storage = MiniLsm::open(&dir, options.clone()).unwrap();
+    storage.put(b"key1", b"1").unwrap();
+    storage.put(b"key2", b"2").unwrap();
+    let txn1 = storage.new_txn().unwrap();
+    let txn2 = storage.new_txn().unwrap();
+    txn1.put(b"key1", &txn1.get(b"key2").unwrap().unwrap());
+    txn2.put(b"key2", &txn2.get(b"key1").unwrap().unwrap());
+    txn1.commit().unwrap();
+    assert!(txn2.commit().is_err());
+    drop(txn2);
+    assert_eq!(storage.get(b"key1").unwrap(), Some(Bytes::from("2")));
+    assert_eq!(storage.get(b"key2").unwrap(), Some(Bytes::from("2")));
+}
+
+#[test]
+fn test_serializable_2() {
+    let dir = tempdir().unwrap();
+    let mut options = LsmStorageOptions::default_for_week2_test(CompactionOptions::NoCompaction);
+    options.serializable = true;
+    let storage = MiniLsm::open(&dir, options.clone()).unwrap();
+    let txn1 = storage.new_txn().unwrap();
+    let txn2 = storage.new_txn().unwrap();
+    txn1.put(b"key1", b"1");
+    txn2.put(b"key1", b"2");
+    txn1.commit().unwrap();
+    txn2.commit().unwrap();
+    assert_eq!(storage.get(b"key1").unwrap(), Some(Bytes::from("2")));
+}
+
+#[test]
+fn test_serializable_3_ts_range() {
+    let dir = tempdir().unwrap();
+    let mut options = LsmStorageOptions::default_for_week2_test(CompactionOptions::NoCompaction);
+    options.serializable = true;
+    let storage = MiniLsm::open(&dir, options.clone()).unwrap();
+    storage.put(b"key1", b"1").unwrap();
+    storage.put(b"key2", b"2").unwrap();
+    let txn1 = storage.new_txn().unwrap();
+    txn1.put(b"key1", &txn1.get(b"key2").unwrap().unwrap());
+    txn1.commit().unwrap();
+    let txn2 = storage.new_txn().unwrap();
+    txn2.put(b"key2", &txn2.get(b"key1").unwrap().unwrap());
+    txn2.commit().unwrap();
+    drop(txn2);
+    assert_eq!(storage.get(b"key1").unwrap(), Some(Bytes::from("2")));
+    assert_eq!(storage.get(b"key2").unwrap(), Some(Bytes::from("2")));
+}
+
+#[test]
+fn test_serializable_4_scan() {
+    let dir = tempdir().unwrap();
+    let mut options = LsmStorageOptions::default_for_week2_test(CompactionOptions::NoCompaction);
+    options.serializable = true;
+    let storage = MiniLsm::open(&dir, options.clone()).unwrap();
+    storage.put(b"key1", b"1").unwrap();
+    storage.put(b"key2", b"2").unwrap();
+    let txn1 = storage.new_txn().unwrap();
+    let txn2 = storage.new_txn().unwrap();
+    txn1.put(b"key1", &txn1.get(b"key2").unwrap().unwrap());
+    txn1.commit().unwrap();
+    let mut iter = txn2.scan(Bound::Unbounded, Bound::Unbounded).unwrap();
+    while iter.is_valid() {
+        iter.next().unwrap();
+    }
+    txn2.put(b"key2", b"1");
+    assert!(txn2.commit().is_err());
+    drop(txn2);
+    assert_eq!(storage.get(b"key1").unwrap(), Some(Bytes::from("2")));
+    assert_eq!(storage.get(b"key2").unwrap(), Some(Bytes::from("2")));
+}
+
+#[test]
+fn test_serializable_5_read_only() {
+    let dir = tempdir().unwrap();
+    let mut options = LsmStorageOptions::default_for_week2_test(CompactionOptions::NoCompaction);
+    options.serializable = true;
+    let storage = MiniLsm::open(&dir, options.clone()).unwrap();
+    storage.put(b"key1", b"1").unwrap();
+    storage.put(b"key2", b"2").unwrap();
+    let txn1 = storage.new_txn().unwrap();
+    txn1.put(b"key1", &txn1.get(b"key2").unwrap().unwrap());
+    txn1.commit().unwrap();
+    let txn2 = storage.new_txn().unwrap();
+    txn2.get(b"key1").unwrap().unwrap();
+    let mut iter = txn2.scan(Bound::Unbounded, Bound::Unbounded).unwrap();
+    while iter.is_valid() {
+        iter.next().unwrap();
+    }
+    txn2.commit().unwrap();
+    assert_eq!(storage.get(b"key1").unwrap(), Some(Bytes::from("2")));
+    assert_eq!(storage.get(b"key2").unwrap(), Some(Bytes::from("2")));
+}