chore: removed AbortReason::DEADLOCK, add ExecutionException (#479)

* Update transaction.h

* new execution error

Signed-off-by: Alex Chi <[email protected]>

Signed-off-by: Alex Chi <[email protected]>
Co-authored-by: Alex Chi <[email protected]>

Author: kush789

src/include/common/exception.h

@@ -47,6 +47,8 @@ enum class ExceptionType {
   OUT_OF_MEMORY = 9,
   /** Method not implemented. */
   NOT_IMPLEMENTED = 11,
+  /** Execution exception. */
+  EXECUTION = 12,
 };
 
 class Exception : public std::runtime_error {
@@ -117,4 +119,10 @@ class NotImplementedException : public Exception {
   explicit NotImplementedException(const std::string &msg) : Exception(ExceptionType::NOT_IMPLEMENTED, msg) {}
 };
 
+class ExecutionException : public Exception {
+ public:
+  ExecutionException() = delete;
+  explicit ExecutionException(const std::string &msg) : Exception(ExceptionType::EXECUTION, msg) {}
+};
+
 }  // namespace bustub

src/include/concurrency/transaction.h

@@ -106,7 +106,6 @@ class IndexWriteRecord {
 enum class AbortReason {
   LOCK_ON_SHRINKING,
   UPGRADE_CONFLICT,
-  DEADLOCK,
   LOCK_SHARED_ON_READ_UNCOMMITTED,
   TABLE_LOCK_NOT_PRESENT,
   ATTEMPTED_INTENTION_LOCK_ON_ROW,
@@ -135,8 +134,6 @@ class TransactionAbortException : public std::exception {
       case AbortReason::UPGRADE_CONFLICT:
         return "Transaction " + std::to_string(txn_id_) +
                " aborted because another transaction is already waiting to upgrade its lock\n";
-      case AbortReason::DEADLOCK:
-        return "Transaction " + std::to_string(txn_id_) + " aborted on deadlock\n";
       case AbortReason::LOCK_SHARED_ON_READ_UNCOMMITTED:
         return "Transaction " + std::to_string(txn_id_) + " aborted on lockshared on READ_UNCOMMITTED\n";
       case AbortReason::TABLE_LOCK_NOT_PRESENT:

src/include/execution/execution_engine.h

@@ -16,6 +16,7 @@
 
 #include "buffer/buffer_pool_manager.h"
 #include "catalog/catalog.h"
+#include "concurrency/transaction.h"
 #include "concurrency/transaction_manager.h"
 #include "execution/executor_context.h"
 #include "execution/executor_factory.h"
@@ -62,7 +63,7 @@ class ExecutionEngine {
     try {
       executor->Init();
       PollExecutor(executor.get(), plan, result_set);
-    } catch (const Exception &ex) {
+    } catch (const ExecutionException &ex) {
 #ifndef NDEBUG
       LOG_ERROR("Error Encountered in Executor Execution: %s", ex.what());
 #endif