Fix some bugs

Signed-off-by: noob <yixiao121314@outlook.com>

Author: euvre

src/storage/buffer/file_worker/bmp_index_file_worker.cppm

@@ -35,7 +35,6 @@ public:
                                 std::shared_ptr<std::string> file_name,
                                 std::shared_ptr<IndexBase> index_base,
                                 std::shared_ptr<ColumnDef> column_def,
-                                PersistenceManager *persistence_manager,
                                 size_t index_size = 0);
 
     ~BMPIndexFileWorker() override;

src/storage/buffer/file_worker/bmp_index_file_worker_impl.cpp

@@ -40,15 +40,13 @@ BMPIndexFileWorker::BMPIndexFileWorker(std::shared_ptr<std::string> data_dir,
                                        std::shared_ptr<std::string> file_name,
                                        std::shared_ptr<IndexBase> index_base,
                                        std::shared_ptr<ColumnDef> column_def,
-                                       PersistenceManager *persistence_manager,
                                        size_t index_size)
     : IndexFileWorker(std::move(data_dir),
                       std::move(temp_dir),
                       std::move(file_dir),
                       std::move(file_name),
                       std::move(index_base),
-                      std::move(column_def),
-                      persistence_manager) {
+                      std::move(column_def)) {
     if (index_size == 0) {
         std::string index_path = GetFilePath();
         auto [file_handle, status] = VirtualStore::Open(index_path, FileAccessMode::kRead);
@@ -99,7 +97,7 @@ bool BMPIndexFileWorker::Write(bool &prepare_success, const FileWorkerSaveCtx &c
     // if (to_spill) {
     //     (*bmp_handler)->Save(*file_handle_);
     // } else {
-        (*bmp_handler)->SaveToPtr(*file_handle_);
+    (*bmp_handler)->SaveToPtr(*file_handle_);
     // }
     prepare_success = true;
     return true;
@@ -114,7 +112,7 @@ void BMPIndexFileWorker::Read(size_t file_size, bool from_spill) {
     // if (from_spill) {
     //     (*bmp_handler)->Load(*file_handle_);
     // } else {
-        (*bmp_handler)->LoadFromPtr(*file_handle_, file_size);
+    (*bmp_handler)->LoadFromPtr(*file_handle_, file_size);
     // }
 }
 

src/storage/buffer/file_worker/data_file_worker.cppm

@@ -26,8 +26,7 @@ public:
                             std::shared_ptr<std::string> temp_dir,
                             std::shared_ptr<std::string> file_dir,
                             std::shared_ptr<std::string> file_name,
-                            size_t buffer_size,
-                            PersistenceManager *persistence_manager);
+                            size_t buffer_sizer);
 
     virtual ~DataFileWorker() override;
 

src/storage/buffer/file_worker/data_file_worker_impl.cpp

@@ -37,10 +37,8 @@ DataFileWorker::DataFileWorker(std::shared_ptr<std::string> data_dir,
                                std::shared_ptr<std::string> temp_dir,
                                std::shared_ptr<std::string> file_dir,
                                std::shared_ptr<std::string> file_name,
-                               size_t buffer_size,
-                               PersistenceManager *persistence_manager)
-    : FileWorker(std::move(data_dir), std::move(temp_dir), std::move(file_dir), std::move(file_name), persistence_manager),
-      buffer_size_(buffer_size) {
+                               size_t buffer_size)
+    : FileWorker(std::move(data_dir), std::move(temp_dir), std::move(file_dir), std::move(file_name)), buffer_size_(buffer_size) {
     DataFileWorker::AllocateInMemory();
     // [[maybe_unused]] bool foo = WriteToFile(false, {});
     // ReadFromFile(true);

src/storage/buffer/file_worker/emvb_index_file_worker.cppm

@@ -34,15 +34,13 @@ public:
                                  std::shared_ptr<std::string> file_name,
                                  std::shared_ptr<IndexBase> index_base,
                                  std::shared_ptr<ColumnDef> column_def,
-                                 const u32 start_segment_offset,
-                                 PersistenceManager *persistence_manager)
+                                 const u32 start_segment_offset)
         : IndexFileWorker(std::move(data_dir),
                           std::move(temp_dir),
                           std::move(file_dir),
                           std::move(file_name),
                           std::move(index_base),
-                          std::move(column_def),
-                          persistence_manager),
+                          std::move(column_def)),
           start_segment_offset_(start_segment_offset) {
         AllocateInMemory();
     }

src/storage/buffer/file_worker/file_worker.cppm

@@ -35,8 +35,7 @@ public:
     explicit FileWorker(std::shared_ptr<std::string> data_dir,
                         std::shared_ptr<std::string> temp_dir,
                         std::shared_ptr<std::string> file_dir,
-                        std::shared_ptr<std::string> file_name,
-                        PersistenceManager *persistence_manager);
+                        std::shared_ptr<std::string> file_name);
 
     // No destruct here
     virtual ~FileWorker();
@@ -48,13 +47,9 @@ public:
 
     void Load();
 
-    std::string GetFilename() {
-        return "Dummy";
-    }
-
-    void PickForCleanup() {
+    std::string GetFilename() { return "Dummy"; }
 
-    }
+    void PickForCleanup() {}
 
     void MoveFile();
 
@@ -100,12 +95,11 @@ public:
     const std::shared_ptr<std::string> file_name_;
     PersistenceManager *persistence_manager_{};
     ObjAddr obj_addr_;
-    void *mmap_true_{};
+    void *mmap_true_{nullptr};
     size_t mmap_true_size_{};
 
 protected:
     void *data_{};
     std::unique_ptr<LocalFileHandle> file_handle_{nullptr};
-
 };
 } // namespace infinity

src/storage/buffer/file_worker/file_worker_impl.cpp

@@ -42,11 +42,11 @@ namespace infinity {
 FileWorker::FileWorker(std::shared_ptr<std::string> data_dir,
                        std::shared_ptr<std::string> temp_dir,
                        std::shared_ptr<std::string> file_dir,
-                       std::shared_ptr<std::string> file_name,
-                       PersistenceManager *persistence_manager)
-    : data_dir_(std::move(data_dir)), temp_dir_(std::move(temp_dir)), file_dir_(std::move(file_dir)), file_name_(std::move(file_name)),
-      persistence_manager_(persistence_manager) {
+                       std::shared_ptr<std::string> file_name)
+    : data_dir_(std::move(data_dir)), temp_dir_(std::move(temp_dir)), file_dir_(std::move(file_dir)), file_name_(std::move(file_name)) {
+    mmap_true_ = nullptr;
     if (std::filesystem::path(*file_dir_).is_absolute()) {
+        persistence_manager_ = InfinityContext::instance().storage()->persistence_manager();
         UnrecoverableError(fmt::format("File directory {} is an absolute path.", *file_dir_));
     }
 }

src/storage/buffer/file_worker/hnsw_file_worker.cppm

@@ -36,7 +36,6 @@ public:
                             std::shared_ptr<std::string> file_name,
                             std::shared_ptr<IndexBase> index_base,
                             std::shared_ptr<ColumnDef> column_def,
-                            PersistenceManager *persistence_manager,
                             size_t index_size = 0);
 
     virtual ~HnswFileWorker() override;

src/storage/buffer/file_worker/hnsw_file_worker_impl.cpp

@@ -43,15 +43,13 @@ HnswFileWorker::HnswFileWorker(std::shared_ptr<std::string> data_dir,
                                std::shared_ptr<std::string> file_name,
                                std::shared_ptr<IndexBase> index_base,
                                std::shared_ptr<ColumnDef> column_def,
-                               PersistenceManager *persistence_manager,
                                size_t index_size)
     : IndexFileWorker(std::move(data_dir),
                       std::move(temp_dir),
                       std::move(file_dir),
                       std::move(file_name),
                       std::move(index_base),
-                      std::move(column_def),
-                      persistence_manager) {
+                      std::move(column_def)) {
     if (index_size == 0) {
 
         std::string index_path = GetFilePath();

src/storage/buffer/file_worker/index_file_worker.cppm

@@ -38,9 +38,8 @@ public:
                              std::shared_ptr<std::string> file_dir,
                              std::shared_ptr<std::string> file_name,
                              std::shared_ptr<IndexBase> index_base,
-                             std::shared_ptr<ColumnDef> column_def,
-                             PersistenceManager *persistence_manager)
-        : FileWorker(std::move(data_dir), std::move(temp_dir), std::move(file_dir), std::move(file_name), persistence_manager),
+                             std::shared_ptr<ColumnDef> column_def)
+        : FileWorker(std::move(data_dir), std::move(temp_dir), std::move(file_dir), std::move(file_name)),
           column_def_(std::move(column_def)), index_base_(std::move(index_base)) {}
 
     FileWorkerType Type() const override { return FileWorkerType::kIndexFile; }