Fix linter issues (#9)

brianshih1 · Dec 30, 2023 · d0f4950 · d0f4950
1 parent a2fa454
commit d0f4950
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/concurrency/concurrency_manager.rs b/src/concurrency/concurrency_manager.rs
@@ -6,7 +6,7 @@ use crate::db::db::{TxnLink, TxnMap};
 use crate::db::request_queue::TaskQueueRequest;
 use crate::execute::request::{Command, Request};
 use crate::latch_manager::latch_manager::{LatchGuard, LatchManager};
-use crate::lock_table::lock_table::{LockTable, LockTableGuardLink, UpdateLock};
+use crate::lock_table::lock_table::{LockTable, LockTableGuardLink, UpdateLock, WaitForGuardError};
 use crate::storage::mvcc::KVStore;
 use crate::storage::Key;
 
@@ -53,8 +53,8 @@ impl ConcurrencyManager {
                 let wait_res = self.lock_table.wait_for(lock_guard).await;
                 if let Err(err) = wait_res {
                     match err {
-                        TxnAborted => return Err(SequenceReqError::TxnAborted),
-                        TxnCommitted => return Err(SequenceReqError::TxnCommitted),
+                        WaitForGuardError::TxnAborted => return Err(SequenceReqError::TxnAborted),
+                        WaitForGuardError::TxnCommitted => return Err(SequenceReqError::TxnCommitted),
                     }
                 };
 

diff --git a/src/execute/executor.rs b/src/execute/executor.rs
@@ -4,7 +4,7 @@ use tokio::sync::mpsc::Sender;
 use uuid::Uuid;
 
 use crate::{
-    concurrency::concurrency_manager::{ConcurrencyManager, Guard},
+    concurrency::concurrency_manager::{ConcurrencyManager, Guard, SequenceReqError},
     db::{
         db::{TxnLink, TxnMap},
         request_queue::TaskQueueRequest,
@@ -71,8 +71,8 @@ impl Executor {
 
             if let Err(err) = &guard {
                 match err {
-                    TxnAborted => return ExecuteResult::Err(ExecuteError::TxnAborted),
-                    TxnCommitted => return ExecuteResult::Err(ExecuteError::TxnCommitted),
+                    &SequenceReqError::TxnAborted => return ExecuteResult::Err(ExecuteError::TxnAborted),
+                    &SequenceReqError::TxnCommitted => return ExecuteResult::Err(ExecuteError::TxnCommitted),
                 }
             }