Fix test by generating random path for DB

brianshih1 · Jan 5, 2024 · 56477be · 56477be
1 parent 1bb7401
commit 56477be
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 35 deletions.
diff --git a/src/db/db.rs b/src/db/db.rs
@@ -4,6 +4,7 @@ use std::{
     sync::{Arc, RwLock},
 };
 
+use rand::distributions::{Alphanumeric, DistString};
 use serde::{de::DeserializeOwned, Serialize};
 use std::panic;
 use tokio::sync::mpsc;
@@ -83,6 +84,17 @@ impl DB {
         }
     }
 
+    pub fn new_random_path(initial_time: Timestamp) -> Self {
+        let string = Alphanumeric.sample_string(&mut rand::thread_rng(), 16);
+
+        DB {
+            db: Arc::new(InternalDB::new_cleaned(
+                &format!("./tmp/{}", string),
+                initial_time,
+            )),
+        }
+    }
+
     pub fn new(path: &str, initial_time: Timestamp) -> Self {
         DB {
             db: Arc::new(InternalDB::new(path, initial_time)),

diff --git a/src/db/db_test.rs b/src/db/db_test.rs
@@ -10,7 +10,7 @@ mod test {
 
         #[tokio::test]
         async fn two_writes_with_different_keys() {
-            let db = Arc::new(DB::new_cleaned("./tmp/data", Timestamp::new(10)));
+            let db = Arc::new(DB::new_random_path(Timestamp::new(10)));
 
             let key_a = "A";
             let key_b = "B";
@@ -51,7 +51,7 @@ mod test {
 
                 #[tokio::test]
                 async fn read_waits_for_uncommitted_write() {
-                    let db = Arc::new(DB::new_cleaned("./tmp/data", Timestamp::new(10)));
+                    let db = Arc::new(DB::new_random_path(Timestamp::new(10)));
                     let write_txn = db.begin_txn().await;
                     let key = "foo";
                     db.write(key, 12, write_txn).await;
@@ -82,7 +82,7 @@ mod test {
 
                 #[tokio::test]
                 async fn ignores_intent_with_higher_timestamp() {
-                    let db = Arc::new(DB::new_cleaned("./tmp/data", Timestamp::new(10)));
+                    let db = Arc::new(DB::new_random_path(Timestamp::new(10)));
                     let read_txn = db.begin_txn().await;
                     let key = "foo";
 
@@ -109,7 +109,7 @@ mod test {
 
                 #[tokio::test]
                 async fn write_waits_for_uncommitted_write() {
-                    let db = Arc::new(DB::new_cleaned("./tmp/data", Timestamp::new(10)));
+                    let db = Arc::new(DB::new_random_path(Timestamp::new(10)));
                     let txn_1 = db.begin_txn().await;
                     let txn_2 = db.begin_txn().await;
                     let key = "baz";
@@ -156,7 +156,7 @@ mod test {
 
                 #[tokio::test]
                 async fn bump_write_timestamp_before_committing() {
-                    let db = Arc::new(DB::new_cleaned("./tmp/data", Timestamp::new(10)));
+                    let db = Arc::new(DB::new_random_path(Timestamp::new(10)));
                     let key = "foo";
 
                     // begin txn1
@@ -208,7 +208,7 @@ mod test {
 
             #[tokio::test]
             async fn bump_write_timestamp_before_committing() {
-                let db = Arc::new(DB::new_cleaned("./tmp/data", Timestamp::new(10)));
+                let db = Arc::new(DB::new_random_path(Timestamp::new(10)));
                 let key = "foo";
 
                 let write_txn = db.begin_txn().await;
@@ -249,7 +249,7 @@ mod test {
 
             #[tokio::test]
             async fn read_refresh_from_write_write_conflict() {
-                let db = Arc::new(DB::new_cleaned("./tmp/data", Timestamp::new(10)));
+                let db = Arc::new(DB::new_random_path(Timestamp::new(10)));
 
                 let read_key = "foo";
                 let write_key = "bar";
@@ -289,7 +289,7 @@ mod test {
 
             #[tokio::test]
             async fn read_refresh_failure() {
-                let db = Arc::new(DB::new_cleaned("./tmp/data", Timestamp::new(10)));
+                let db = Arc::new(DB::new_random_path(Timestamp::new(10)));
 
                 let read_key = "foo";
                 let write_key = "bar";
@@ -332,7 +332,7 @@ mod test {
 
         #[tokio::test]
         async fn read_write_after_abort_transaction() {
-            let db = DB::new_cleaned("./tmp/data", Timestamp::new(10));
+            let db = DB::new_random_path(Timestamp::new(10));
             let key = "foo";
 
             let txn_to_abort = db.begin_txn().await;
@@ -363,7 +363,7 @@ mod test {
 
         #[tokio::test]
         async fn conflicting_writes() {
-            let db = Arc::new(DB::new_cleaned("./tmp/data", Timestamp::new(10)));
+            let db = Arc::new(DB::new_random_path(Timestamp::new(10)));
             let txn1 = db.begin_txn().await;
             let txn2 = db.begin_txn().await;
             println!("Txn1 is: {}", txn1);
@@ -472,7 +472,7 @@ mod test {
 
         #[tokio::test]
         async fn reading_its_txn_own_write() {
-            let db = DB::new_cleaned("./tmp/data", Timestamp::new(10));
+            let db = DB::new_random_path(Timestamp::new(10));
             db.run_txn(|txn_context| async move {
                 let key = "foo";
                 txn_context.write(key, 12).await.unwrap();
@@ -484,7 +484,7 @@ mod test {
 
         #[tokio::test]
         async fn writing_its_own_write() {
-            let db = DB::new_cleaned("./tmp/data", Timestamp::new(10));
+            let db = DB::new_random_path(Timestamp::new(10));
             db.run_txn(|txn_context| async move {
                 let key = "foo";
                 txn_context.write(key, 12).await;
@@ -497,7 +497,7 @@ mod test {
 
         #[tokio::test]
         async fn two_concurrent_writes_to_same_key() {
-            let db = Arc::new(DB::new_cleaned("./tmp/data", Timestamp::new(10)));
+            let db = Arc::new(DB::new_random_path(Timestamp::new(10)));
 
             let db_1 = db.clone();
             let key = "foo";

diff --git a/src/lock_table/lock_table.rs b/src/lock_table/lock_table.rs
@@ -135,7 +135,7 @@ impl LockTable {
             txn_map: Arc::new(RwLock::new(HashMap::new())),
             txn_wait_queue: TxnWaitQueue::new(
                 Arc::new(sender),
-                Arc::new(KVStore::new_cleaned("/tmp/foo")),
+                Arc::new(KVStore::new_random_path()),
             ),
         }
     }

diff --git a/src/storage/mvcc.rs b/src/storage/mvcc.rs
@@ -1,3 +1,4 @@
+use rand::distributions::{Alphanumeric, DistString};
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
@@ -53,6 +54,12 @@ impl KVStore {
         }
     }
 
+    pub fn new_random_path() -> Self {
+        let string = Alphanumeric.sample_string(&mut rand::thread_rng(), 16);
+
+        KVStore::new_cleaned(&format!("./tmp/{}", string))
+    }
+
     pub fn new(path: &str) -> Self {
         KVStore {
             storage: Storage::new(path),

diff --git a/src/storage/mvcc_iterator.rs b/src/storage/mvcc_iterator.rs
@@ -164,7 +164,7 @@ mod tests {
 
     #[test]
     fn test_current_key_and_current_value() {
-        let storage = Storage::new_cleaned("./tmp/testt");
+        let storage = Storage::new_random_path();
         let mvcc_key = MVCCKey::new(
             str_to_key("hello"),
             Timestamp {
@@ -190,7 +190,7 @@ mod tests {
 
     #[test]
     fn test_order_of_iteration_with_intent_timestamp() {
-        let storage = Storage::new_cleaned("./tmp/testt");
+        let storage = Storage::new_random_path();
         let key = "hello";
 
         let mvcc_key_2 = MVCCKey::new(
@@ -264,7 +264,7 @@ mod tests {
 
         #[test]
         fn test_multiple_timestamps_with_same_prefix() {
-            let storage = Storage::new_cleaned("./tmp/testt");
+            let storage = Storage::new_random_path();
             let key = "foo";
             let mvcc_key_1 = MVCCKey::new(
                 str_to_key(key),
@@ -315,7 +315,7 @@ mod tests {
 
         #[test]
         fn empty_db() {
-            let storage = Storage::new_cleaned("./tmp/testt");
+            let storage = Storage::new_random_path();
             let key = "foo";
             let mvcc_key_1 = MVCCKey::new(
                 str_to_key(key),

diff --git a/src/storage/mvcc_scanner_test.rs b/src/storage/mvcc_scanner_test.rs
@@ -19,7 +19,7 @@ mod tests {
 
         #[test]
         fn no_intent_and_no_end_key() {
-            let storage = Storage::new_cleaned("./tmp/test");
+            let storage = Storage::new_random_path();
             let key = "foo";
             let mvcc_key_1 = MVCCKey::new(
                 str_to_key(key),
@@ -63,7 +63,7 @@ mod tests {
 
         #[test]
         fn intent_found() {
-            let kv_store = KVStore::new_cleaned("./tmp/data");
+            let kv_store = KVStore::new_random_path();
             let timestamp = Timestamp::new(12, 0);
             let txn_id = Uuid::new_v4();
             let txn = Txn::new_link(txn_id, timestamp);
@@ -113,7 +113,7 @@ mod tests {
 
         #[test]
         fn advances_to_next_key() {
-            let kv_store = KVStore::new_cleaned("./tmp/data");
+            let kv_store = KVStore::new_random_path();
             let first_key = "apple";
             let first_key_timestamp1 = Timestamp::new(2, 3);
             let first_key_timestamp2 = Timestamp::new(3, 0);
@@ -155,7 +155,7 @@ mod tests {
 
         #[test]
         fn there_is_no_next_key() {
-            let kv_store = KVStore::new_cleaned("./tmp/data");
+            let kv_store = KVStore::new_random_path();
             let iterator = MVCCIterator::new(&kv_store.storage, IterOptions { prefix: true });
             let scanner_timestamp = Timestamp {
                 logical_time: 3,
@@ -191,7 +191,7 @@ mod tests {
 
         #[test]
         fn multiple_timestamps_for_same_keys() {
-            let kv_store = KVStore::new_cleaned("./tmp/data");
+            let kv_store = KVStore::new_random_path();
 
             let scan_timestamp = Timestamp::new(12, 3);
 
@@ -255,7 +255,7 @@ mod tests {
 
         #[test]
         fn multiple_intents() {
-            let kv_store = KVStore::new_cleaned("./tmp/data");
+            let kv_store = KVStore::new_random_path();
             let txn_id = Uuid::new_v4();
             let transaction_timestamp = Timestamp::new(12, 0);
             let txn = Txn::new_link(txn_id, transaction_timestamp);

diff --git a/src/storage/mvcc_test.rs b/src/storage/mvcc_test.rs
@@ -12,7 +12,7 @@ mod tests {
 
     #[test]
     fn create_pending_transaction_record() -> () {
-        let kv_store = KVStore::new_cleaned("./tmp/data");
+        let kv_store = KVStore::new_random_path();
         let transaction_id = Uuid::new_v4();
         let write_timestamp = Timestamp {
             wall_time: 0,
@@ -44,7 +44,7 @@ mod tests {
 
         #[test]
         fn put_with_transaction() {
-            let kv_store = KVStore::new_cleaned("./tmp/data");
+            let kv_store = KVStore::new_random_path();
             let key = "foo";
             let txn1_id = Uuid::new_v4();
 
@@ -66,7 +66,7 @@ mod tests {
 
         #[test]
         fn write_intent_error() {
-            let kv_store = KVStore::new_cleaned("./tmp/data");
+            let kv_store = KVStore::new_random_path();
             let key = "foo";
             let txn1_id = Uuid::new_v4();
 
@@ -113,7 +113,7 @@ mod tests {
 
         #[test]
         fn get_key_with_multiple_timestamps() {
-            let kv_store = KVStore::new_cleaned("./tmp/data");
+            let kv_store = KVStore::new_random_path();
             let read_timestamp = Timestamp::new(10, 10);
 
             let key1 = str_to_key("apple");
@@ -159,7 +159,7 @@ mod tests {
 
         #[test]
         fn get_intent() {
-            let kv_store = KVStore::new_cleaned("./tmp/data");
+            let kv_store = KVStore::new_random_path();
             let key = "foo";
             let txn1_id = Uuid::new_v4();
 
@@ -212,7 +212,7 @@ mod tests {
 
         #[test]
         fn resolve_intent_with_higher_timestamp() {
-            let kv_store = KVStore::new_cleaned("./tmp/dataa");
+            let kv_store = KVStore::new_random_path();
             let uncommitted_timestamp = Timestamp::new(10, 10);
 
             let key = str_to_key("apple");
@@ -259,7 +259,7 @@ mod tests {
 
         #[test]
         fn resolve_intent_owned_by_another_txn() {
-            let kv_store = KVStore::new_cleaned("./tmp/dataa");
+            let kv_store = KVStore::new_random_path();
             let uncommitted_timestamp = Timestamp::new(10, 10);
 
             let key = str_to_key("apple");

diff --git a/src/storage/storage.rs b/src/storage/storage.rs
@@ -1,5 +1,6 @@
 use std::{cmp::Ordering, iter::Peekable, path::Path};
 
+use rand::distributions::{Alphanumeric, DistString};
 use rocksdb::{ColumnFamily, DBIterator, DB};
 use serde::{de::DeserializeOwned, Serialize};
 use uuid::Uuid;
@@ -36,6 +37,11 @@ impl Storage {
         Storage { db }
     }
 
+    pub fn new_random_path() -> Storage {
+        let string = Alphanumeric.sample_string(&mut rand::thread_rng(), 16);
+        Storage::new_cleaned(&format!("./tmp/{}", string))
+    }
+
     // path example: "./tmp/data";
     pub fn new_cleaned(path: &str) -> Storage {
         if Path::new(path).exists() {
@@ -228,7 +234,7 @@ mod Test {
 
     #[test]
     fn put_mvcc() {
-        let storage = Storage::new_cleaned("./tmp/foo");
+        let storage = Storage::new_random_path();
         let mvcc_key = MVCCKey::new(
             str_to_key("hello"),
             Timestamp {
@@ -245,7 +251,6 @@ mod Test {
     }
 
     mod storage_order {
-
 
         use crate::{
             hlc::timestamp::Timestamp,
@@ -256,7 +261,7 @@ mod Test {
 
         #[test]
         fn check_order_no_intent() {
-            let storage = Storage::new_cleaned("./tmp/foo");
+            let storage = Storage::new_random_path();
             let first_mvcc_key = MVCCKey::new(str_to_key("a"), Timestamp::new(1, 0));
             let second_mvcc_key = MVCCKey::new(str_to_key("a"), Timestamp::new(2, 0));
 
@@ -278,7 +283,7 @@ mod Test {
 
         #[test]
         fn check_order_intent() {
-            let storage = Storage::new_cleaned("./tmp/foobars");
+            let storage = Storage::new_random_path();
             let key = "a";
             let intent_key = MVCCKey::create_intent_key_with_str(key);
             let non_intent_key = MVCCKey::new(str_to_key(key), Timestamp::new(2, 0));