refact:添加析构函数来释放ix_scan

Author: Masttf

src/execution/executor_mvcc_index_scan.h

@@ -112,6 +112,15 @@ class MvccIndexScanExecutor : public AbstractExecutor {
         fed_conds_ = conds_;
     }
 
+    /**
+     * @brief 析构函数，确保正确释放扫描器资源
+     */
+    ~MvccIndexScanExecutor() {
+        if (scan_) {
+            scan_->unlatch();  // 无论扫描是否结束，都释放持有的锁
+        }
+    }
+
     /**
      * @brief 初始化索引扫描并定位第一条记录
      * @throw InternalError 当索引访问失败时
@@ -202,15 +211,15 @@ class MvccIndexScanExecutor : public AbstractExecutor {
         // 移动到第一个满足条件的记录
         while (!is_end()) {
             rid_ = scan_->rid();
+            // if(tab_.name == "warehouse") {
+            //     INFO("IndexScanExecutor: rid_ = {},{}", rid_.page_no, rid_.slot_no);
+            // }
             std::unique_ptr<RmRecord> rec = mvcc_get_record(rid_, context_, fh_, txn_mgr_, cols_);
             if (rec != nullptr && eval_conds(cols_, fed_conds_, rec.get())) {
                 return;
             }
             scan_->next();
         }
-        if (scan_->is_end()) {
-            scan_->unlatch();
-        }
     }
 
     /**
@@ -233,9 +242,6 @@ class MvccIndexScanExecutor : public AbstractExecutor {
             }
             scan_->next();
         }
-        if (scan_->is_end()) {
-            scan_->unlatch();
-        }
     }
 
     /**

src/index/ix_scan.cpp

@@ -54,8 +54,7 @@ void IxScan::next_key_position() {
         iid_.page_no = node->get_next_leaf();
         Page* next_page = bpm_->fetch_page({ih_->fd_, iid_.page_no});
         next_page->rlatch();
-        now->runlatch();
-        bpm_->unpin_page(node->get_page_id(), false);
+        unlatch();  // 释放当前页面
         now = next_page;  // 更新当前页面为下一个叶节点
     }
     delete node;  // 释放内存

src/index/ix_scan.h

@@ -54,7 +54,7 @@ class IxScan : public RecScan {
      * @param bpm 缓冲池管理器
      */
     IxScan(const IxIndexHandle *ih, const Iid &lower, const Iid &upper, BufferPoolManager *bpm)
-        : ih_(ih), iid_(lower), end_(upper), bpm_(bpm), rid_index_(0), has_overflow_cache_(false) {
+        : ih_(ih), iid_(lower), end_(upper), bpm_(bpm), now(nullptr), rid_index_(0), has_overflow_cache_(false) {
         if (!is_end()) {
             now = bpm_->fetch_page({ih_->fd_, iid_.page_no});
             now->rlatch();  // 获取读锁，确保扫描期间页面不被修改
@@ -63,6 +63,13 @@ class IxScan : public RecScan {
         }
     }
 
+    /**
+     * @brief 析构函数，确保正确释放页面资源
+     */
+    ~IxScan() {
+        unlatch();
+    }
+
     /**
      * @brief 移动到下一条记录
      * @note
@@ -98,6 +105,10 @@ class IxScan : public RecScan {
             bpm_->unpin_page(now->get_page_id(), false);  // 解除页面固定状态
             now = nullptr;                                // 清空当前页面指针
         }
+        // 重置状态，防止后续误用
+        has_overflow_cache_ = false;
+        current_rids_.clear();
+        rid_index_ = 0;
     }
 
    private:

src/system/sm_manager.cpp

@@ -613,7 +613,7 @@ void SmManager::load_csv_data(const std::string& table_name, const std::string&
     // INFO("Loading CSV data into table: {}, from file: {}", table_name, file_path);
     // std::cerr << "system path: " << get_current_dir_name() << std::endl;
     // 1. 检查表是否存在
-    std::cerr << "system path: " << get_current_dir_name() << std::endl;
+    // std::cerr << "system path: " << get_current_dir_name() << std::endl;
     if (!db_.is_table(table_name)) {
         throw TableNotFoundError(table_name);
     }