Fix: db entry replay initialize. (infiniflow#783)

### What problem does this PR solve?

Database replay initialize bug.

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)

Co-authored-by: Jin Hai <haijin.chn@gmail.com>

Author: small-turtle-1

src/storage/meta/catalog.cpp

@@ -357,7 +357,7 @@ UniquePtr<Catalog> Catalog::NewCatalog(SharedPtr<String> dir, bool create_defaul
         Path parent_path = catalog_path.parent_path();
         auto data_dir = MakeShared<String>(parent_path.string());
         UniquePtr<DBMeta> db_meta = MakeUnique<DBMeta>(data_dir, MakeShared<String>("default"));
-        UniquePtr<DBEntry> db_entry = MakeUnique<DBEntry>(db_meta.get(), false, db_meta->data_dir(), db_meta->db_name(), 0, 0);
+        SharedPtr<DBEntry> db_entry = DBEntry::NewDBEntry(db_meta.get(), false, db_meta->data_dir(), db_meta->db_name(), 0, 0);
         // TODO commit ts == 0 is true??
         db_entry->commit_ts_ = 0;
         db_meta->db_entry_list().emplace_front(std::move(db_entry));
@@ -471,9 +471,10 @@ void Catalog::LoadFromEntry(Catalog *catalog, const String &catalog_path, Buffer
             case CatalogDeltaOpType::ADD_DATABASE_ENTRY: {
                 auto add_db_entry_op = static_cast<AddDBEntryOp *>(op.get());
                 auto db_name = add_db_entry_op->db_name();
-
+                const auto &db_entry_dir = add_db_entry_op->db_entry_dir();
                 auto db_meta = catalog->db_meta_map().at(db_name).get();
-                auto db_entry = DBEntry::NewReplayDBEntry(db_meta, db_meta->data_dir_, db_meta->db_name_, txn_id, begin_ts, commit_ts, is_delete);
+                auto db_entry =
+                    DBEntry::NewReplayDBEntry(db_meta, MakeShared<String>(db_entry_dir), db_meta->db_name_, txn_id, begin_ts, commit_ts, is_delete);
                 db_meta->db_entry_list().emplace_front(std::move(db_entry));
                 break;
             }
@@ -846,9 +847,7 @@ UniquePtr<String> Catalog::SaveFullCatalog(const String &catalog_dir, TxnTimeSta
 // called by bg_task
 bool Catalog::SaveDeltaCatalog(const String &delta_catalog_path, TxnTimeStamp max_commit_ts) {
     LOG_INFO("SAVING DELTA CATALOG");
-    LOG_INFO(fmt::format("Save delta catalog commit ts:{}, checkpoint max commit ts:{}.",
-                         global_catalog_delta_entry_->commit_ts(),
-                         max_commit_ts));
+    LOG_INFO(fmt::format("Save delta catalog commit ts:{}, checkpoint max commit ts:{}.", global_catalog_delta_entry_->commit_ts(), max_commit_ts));
 
     // Check the SegmentEntry's for flush the data to disk.
     UniquePtr<CatalogDeltaEntry> flush_delta_entry = global_catalog_delta_entry_->PickFlushEntry(max_commit_ts);

src/storage/meta/entry/db_entry.cpp

@@ -39,14 +39,13 @@ namespace infinity {
 
 DBEntry::DBEntry(DBMeta *db_meta,
                  bool is_delete,
-                 const SharedPtr<String> &data_dir,
+                 const SharedPtr<String> &db_entry_dir,
                  const SharedPtr<String> &db_name,
                  TransactionID txn_id,
                  TxnTimeStamp begin_ts)
     // "data_dir": "/tmp/infinity/data"
     // "db_entry_dir": "/tmp/infinity/data/db1/txn_6"
-    : BaseEntry(EntryType::kDatabase, is_delete), db_meta_(db_meta), db_entry_dir_(is_delete ? nullptr : DetermineDBDir(*data_dir, *db_name)),
-      db_name_(db_name) {
+    : BaseEntry(EntryType::kDatabase, is_delete), db_meta_(db_meta), db_entry_dir_(db_entry_dir), db_name_(db_name) {
     //    atomic_u64 txn_id_{0};
     //    TxnTimeStamp begin_ts_{0};
     //    atomic_u64 commit_ts_{UNCOMMIT_TS};
@@ -61,18 +60,19 @@ SharedPtr<DBEntry> DBEntry::NewDBEntry(DBMeta *db_meta,
                                        const SharedPtr<String> &db_name,
                                        TransactionID txn_id,
                                        TxnTimeStamp begin_ts) {
-    auto db_entry = MakeShared<DBEntry>(db_meta, is_delete, data_dir, db_name, txn_id, begin_ts);
+    SharedPtr<String> db_entry_dir = is_delete ? nullptr : DetermineDBDir(*data_dir, *db_name);
+    auto db_entry = MakeShared<DBEntry>(db_meta, is_delete, db_entry_dir, db_name, txn_id, begin_ts);
     return db_entry;
 }
 
 SharedPtr<DBEntry> DBEntry::NewReplayDBEntry(DBMeta *db_meta,
-                                             const SharedPtr<String> &data_dir,
+                                             const SharedPtr<String> &db_entry_dir,
                                              const SharedPtr<String> &db_name,
                                              TransactionID txn_id,
                                              TxnTimeStamp begin_ts,
                                              TxnTimeStamp commit_ts,
                                              bool is_delete) noexcept {
-    auto db_entry = MakeShared<DBEntry>(db_meta, is_delete, data_dir, db_name, txn_id, begin_ts);
+    auto db_entry = MakeShared<DBEntry>(db_meta, is_delete, db_entry_dir, db_name, txn_id, begin_ts);
     db_entry->commit_ts_ = commit_ts;
     return db_entry;
 }
@@ -203,7 +203,7 @@ UniquePtr<DBEntry> DBEntry::Deserialize(const nlohmann::json &db_entry_json, DBM
     u64 begin_ts = db_entry_json["begin_ts"];
 
     SharedPtr<String> db_entry_dir{};
-    if(!deleted) {
+    if (!deleted) {
         db_entry_dir = MakeShared<String>(db_entry_json["db_entry_dir"]);
     }
     UniquePtr<DBEntry> res = MakeUnique<DBEntry>(db_meta, deleted, db_entry_dir, db_name, txn_id, begin_ts);

src/storage/meta/entry/db_entry.cppm

@@ -46,7 +46,7 @@ public:
 
     explicit DBEntry(DBMeta *db_meta,
                      bool is_delete,
-                     const SharedPtr<String> &data_dir,
+                     const SharedPtr<String> &db_entry_dir,
                      const SharedPtr<String> &db_name,
                      TransactionID txn_id,
                      TxnTimeStamp begin_ts);
@@ -59,7 +59,7 @@ public:
                                          TxnTimeStamp begin_ts);
 
     static SharedPtr<DBEntry> NewReplayDBEntry(DBMeta *db_meta,
-                                               const SharedPtr<String> &data_dir,
+                                               const SharedPtr<String> &db_entry_dir,
                                                const SharedPtr<String> &db_name,
                                                TransactionID txn_id,
                                                TxnTimeStamp begin_ts,

src/storage/wal/catalog_delta_entry.cppm

@@ -220,7 +220,7 @@ public:
 
 public:
     const String &db_name() const { return db_name_; }
-    const String &data_dir() const { return db_entry_dir_; }
+    const String &db_entry_dir() const { return db_entry_dir_; }
 
 public:
     SharedPtr<DBEntry> db_entry_{};