[Storage] Add TransactionInfoDb and TransactionAccumulatorDb as submo…

…dules of LedgerDb.

storage/aptosdb/src/backup/backup_handler.rs

@@ -4,7 +4,6 @@
 
 use crate::{
     ledger_db::LedgerDb,
-    ledger_store::LedgerStore,
     metrics::{
         BACKUP_EPOCH_ENDING_EPOCH, BACKUP_STATE_SNAPSHOT_LEAF_IDX, BACKUP_STATE_SNAPSHOT_VERSION,
         BACKUP_TXN_VERSION,
@@ -28,21 +27,18 @@ use std::{fmt, sync::Arc};
 /// `BackupHandler` provides functionalities for AptosDB data backup.
 #[derive(Clone)]
 pub struct BackupHandler {
-    ledger_store: Arc<LedgerStore>,
     transaction_store: Arc<TransactionStore>,
     state_store: Arc<StateStore>,
     ledger_db: Arc<LedgerDb>,
 }
 
 impl BackupHandler {
     pub(crate) fn new(
-        ledger_store: Arc<LedgerStore>,
         transaction_store: Arc<TransactionStore>,
         state_store: Arc<StateStore>,
         ledger_db: Arc<LedgerDb>,
     ) -> Self {
         Self {
-            ledger_store,
             transaction_store,
             state_store,
             ledger_db,
@@ -62,7 +58,8 @@ impl BackupHandler {
             .transaction_db()
             .get_transaction_iter(start_version, num_transactions)?;
         let mut txn_info_iter = self
-            .ledger_store
+            .ledger_db
+            .transaction_info_db()
             .get_transaction_info_iter(start_version, num_transactions)?;
         let mut event_vec_iter = self
             .ledger_db
@@ -117,11 +114,14 @@ impl BackupHandler {
         let ledger_metadata_db = self.ledger_db.metadata_db();
         let epoch = ledger_metadata_db.get_epoch(last_version)?;
         let ledger_info = ledger_metadata_db.get_latest_ledger_info_in_epoch(epoch)?;
-        let accumulator_proof = self.ledger_store.get_transaction_range_proof(
-            Some(first_version),
-            num_transactions,
-            ledger_info.ledger_info().version(),
-        )?;
+        let accumulator_proof = self
+            .ledger_db
+            .transaction_accumulator_db()
+            .get_transaction_range_proof(
+                Some(first_version),
+                num_transactions,
+                ledger_info.ledger_info().version(),
+            )?;
         Ok((accumulator_proof, ledger_info))
     }
 
@@ -174,8 +174,13 @@ impl BackupHandler {
         let epoch = ledger_metadata_db.get_epoch(version)?;
         let ledger_info = ledger_metadata_db.get_latest_ledger_info_in_epoch(epoch)?;
         let txn_info = self
-            .ledger_store
-            .get_transaction_info_with_proof(version, ledger_info.ledger_info().version())?;
+            .ledger_db
+            .transaction_info_db()
+            .get_transaction_info_with_proof(
+                version,
+                ledger_info.ledger_info().version(),
+                self.ledger_db.transaction_accumulator_db(),
+            )?;
 
         Ok((txn_info, ledger_info))
     }

storage/aptosdb/src/backup/restore_handler.rs

@@ -5,7 +5,6 @@
 use crate::{
     backup::restore_utils,
     ledger_db::LedgerDb,
-    ledger_store::LedgerStore,
     schema::db_metadata::{DbMetadataKey, DbMetadataSchema},
     state_restore::{StateSnapshotRestore, StateSnapshotRestoreMode},
     state_store::StateStore,
@@ -28,7 +27,6 @@ use std::sync::Arc;
 #[derive(Clone)]
 pub struct RestoreHandler {
     pub aptosdb: Arc<AptosDB>,
-    ledger_store: Arc<LedgerStore>,
     transaction_store: Arc<TransactionStore>,
     state_store: Arc<StateStore>,
     ledger_db: Arc<LedgerDb>,
@@ -37,14 +35,12 @@ pub struct RestoreHandler {
 impl RestoreHandler {
     pub(crate) fn new(
         aptosdb: Arc<AptosDB>,
-        ledger_store: Arc<LedgerStore>,
         transaction_store: Arc<TransactionStore>,
         state_store: Arc<StateStore>,
     ) -> Self {
         Self {
             ledger_db: Arc::clone(&aptosdb.ledger_db),
             aptosdb,
-            ledger_store,
             transaction_store,
             state_store,
         }
@@ -80,7 +76,7 @@ impl RestoreHandler {
         frozen_subtrees: &[HashValue],
     ) -> Result<()> {
         restore_utils::confirm_or_save_frozen_subtrees(
-            self.aptosdb.ledger_db.transaction_accumulator_db(),
+            self.aptosdb.ledger_db.transaction_accumulator_db_raw(),
             num_leaves,
             frozen_subtrees,
             None,
@@ -96,7 +92,6 @@ impl RestoreHandler {
         write_sets: Vec<WriteSet>,
     ) -> Result<()> {
         restore_utils::save_transactions(
-            self.ledger_store.clone(),
             self.transaction_store.clone(),
             self.state_store.clone(),
             self.ledger_db.clone(),
@@ -119,7 +114,6 @@ impl RestoreHandler {
         write_sets: Vec<WriteSet>,
     ) -> Result<()> {
         restore_utils::save_transactions(
-            self.ledger_store.clone(),
             self.transaction_store.clone(),
             self.state_store.clone(),
             self.ledger_db.clone(),

storage/aptosdb/src/backup/restore_utils.rs

@@ -5,8 +5,10 @@
 //! database restore operations, as required by restore and
 //! state sync v2.
 use crate::{
-    ledger_db::{ledger_metadata_db::LedgerMetadataDb, LedgerDb, LedgerDbSchemaBatches},
-    ledger_store::LedgerStore,
+    ledger_db::{
+        ledger_metadata_db::LedgerMetadataDb, transaction_info_db::TransactionInfoDb, LedgerDb,
+        LedgerDbSchemaBatches,
+    },
     schema::{
         db_metadata::{DbMetadataKey, DbMetadataSchema, DbMetadataValue},
         transaction_accumulator::TransactionAccumulatorSchema,
@@ -107,7 +109,6 @@ pub fn confirm_or_save_frozen_subtrees(
 /// Saves the given transactions to the db. If a change set is provided, a batch
 /// of db alterations will be added to the change set without writing them to the db.
 pub(crate) fn save_transactions(
-    ledger_store: Arc<LedgerStore>,
     transaction_store: Arc<TransactionStore>,
     state_store: Arc<StateStore>,
     ledger_db: Arc<LedgerDb>,
@@ -125,7 +126,6 @@ pub(crate) fn save_transactions(
 ) -> Result<()> {
     if let Some((ledger_db_batch, state_kv_batches, state_kv_metadata_batch)) = existing_batch {
         save_transactions_impl(
-            Arc::clone(&ledger_store),
             transaction_store,
             state_store,
             ledger_db,
@@ -144,7 +144,6 @@ pub(crate) fn save_transactions(
         let mut sharded_kv_schema_batch = new_sharded_kv_schema_batch();
         let state_kv_metadata_batch = SchemaBatch::new();
         save_transactions_impl(
-            Arc::clone(&ledger_store),
             transaction_store,
             Arc::clone(&state_store),
             Arc::clone(&ledger_db),
@@ -219,7 +218,6 @@ fn save_ledger_infos_impl(
 
 /// A helper function that saves the transactions to the given change set
 pub(crate) fn save_transactions_impl(
-    ledger_store: Arc<LedgerStore>,
     transaction_store: Arc<TransactionStore>,
     state_store: Arc<StateStore>,
     ledger_db: Arc<LedgerDb>,
@@ -242,12 +240,21 @@ pub(crate) fn save_transactions_impl(
         )?;
     }
 
-    ledger_store.put_transaction_infos(
-        first_version,
-        txn_infos,
-        &ledger_db_batch.transaction_info_db_batches,
-        &ledger_db_batch.transaction_accumulator_db_batches,
-    )?;
+    for (idx, txn_info) in txn_infos.iter().enumerate() {
+        TransactionInfoDb::put_transaction_info(
+            first_version + idx as Version,
+            txn_info,
+            &ledger_db_batch.transaction_info_db_batches,
+        )?;
+    }
+
+    ledger_db
+        .transaction_accumulator_db()
+        .put_transaction_accumulator(
+            first_version,
+            txn_infos,
+            &ledger_db_batch.transaction_accumulator_db_batches,
+        )?;
 
     ledger_db.event_db().put_events_multiple_versions(
         first_version,

storage/aptosdb/src/db/aptosdb_test.rs

@@ -4,7 +4,7 @@
 use crate::{
     db::{
         get_first_seq_num_and_limit, test_helper,
-        test_helper::{arb_blocks_to_commit, put_as_state_root, put_transaction_info},
+        test_helper::{arb_blocks_to_commit, put_as_state_root, put_transaction_infos},
         AptosDB,
     },
     pruner::{LedgerPrunerManager, PrunerManager, StateMerklePrunerManager},
@@ -102,13 +102,15 @@ fn test_pruner_config() {
         assert_eq!(state_merkle_pruner.is_pruner_enabled(), enable);
         assert_eq!(state_merkle_pruner.get_prune_window(), 20);
 
-        let ledger_pruner =
-            LedgerPrunerManager::new(Arc::clone(&aptos_db.ledger_db), LedgerPrunerConfig {
+        let ledger_pruner = LedgerPrunerManager::new(
+            Arc::clone(&aptos_db.ledger_db),
+            LedgerPrunerConfig {
                 enable,
                 prune_window: 100,
                 batch_size: 1,
                 user_pruning_window_offset: 0,
-            });
+            },
+        );
         assert_eq!(ledger_pruner.is_pruner_enabled(), enable);
         assert_eq!(ledger_pruner.get_prune_window(), 100);
     }
@@ -162,7 +164,7 @@ fn test_get_latest_executed_trees() {
         0,
         ExecutionStatus::MiscellaneousError(None),
     );
-    put_transaction_info(&db, 0, &txn_info);
+    put_transaction_infos(&db, 0, &[txn_info.clone()]);
 
     let bootstrapped = db.get_latest_executed_trees().unwrap();
     assert!(

storage/aptosdb/src/db/include/aptosdb_internal.rs

@@ -45,7 +45,6 @@ impl AptosDB {
             ledger_db: Arc::clone(&ledger_db),
             state_kv_db: Arc::clone(&state_kv_db),
             event_store: Arc::new(EventStore::new(ledger_db.event_db().db_arc())),
-            ledger_store: Arc::new(LedgerStore::new(Arc::clone(&ledger_db))),
             state_store,
             transaction_store: Arc::new(TransactionStore::new(Arc::clone(&ledger_db))),
             ledger_pruner,