chore(core-node)!: remove deprecated db tables (#3142)

muXxer · web-flow · commit c101a58b8f2a · 2024-10-14T17:25:49.000+02:00
* !chore(core-node): remove deprecated tables in `AuthorityEpochTables`

* !chore(core-node): remove deprecated tables in `IndexStoreTables`

* chore(scripts): add `target` to ignored_dirs
diff --git a/crates/iota-core/src/authority.rs b/crates/iota-core/src/authority.rs
@@ -2132,12 +2132,6 @@ impl AuthorityState {
         indexes
             .index_tx(
                 cert.data().intent_message().value.sender(),
-                cert.data()
-                    .intent_message()
-                    .value
-                    .input_objects()?
-                    .iter()
-                    .map(|o| o.object_id()),
                 effects
                     .all_changed_objects()
                     .into_iter()
diff --git a/crates/iota-core/src/authority/authority_per_epoch_store.rs b/crates/iota-core/src/authority/authority_per_epoch_store.rs
@@ -483,10 +483,6 @@ pub struct AuthorityEpochTables {
     #[default_options_override_fn = "pending_consensus_transactions_table_default_config"]
     pending_consensus_transactions: DBMap<ConsensusTransactionKey, ConsensusTransaction>,
 
-    /// this table is not used
-    #[allow(dead_code)]
-    consensus_message_order: DBMap<ExecutionIndices, TransactionDigest>,
-
     /// The following table is used to store a single value (the corresponding
     /// key is a constant). The value represents the index of the latest
     /// consensus message this authority processed. This field is written by
@@ -502,21 +498,13 @@ pub struct AuthorityEpochTables {
     /// This field is written by a single process (consensus handler).
     last_consensus_stats: DBMap<u64, ExecutionIndicesWithStats>,
 
-    /// this table is not used
-    #[allow(dead_code)]
-    checkpoint_boundary: DBMap<u64, u64>,
-
     /// This table contains current reconfiguration state for validator for
     /// current epoch
     reconfig_state: DBMap<u64, ReconfigState>,
 
     /// Validators that have sent EndOfPublish message in this epoch
     end_of_publish: DBMap<AuthorityName, ()>,
 
-    // TODO: Unused. Remove when removal of DBMap tables is supported.
-    #[allow(dead_code)]
-    final_epoch_checkpoint: DBMap<u64, u64>,
-
     /// This table has information for the checkpoints for which we constructed
     /// all the data from consensus, but not yet constructed actual
     /// checkpoint.
@@ -552,12 +540,9 @@ pub struct AuthorityEpochTables {
     /// checkpoint later.
     user_signatures_for_checkpoints: DBMap<TransactionDigest, Vec<GenericSignature>>,
 
-    /// This table is not used
-    #[allow(dead_code)]
-    builder_checkpoint_summary: DBMap<CheckpointSequenceNumber, CheckpointSummary>,
     /// Maps sequence number to checkpoint summary, used by CheckpointBuilder to
     /// build checkpoint within epoch
-    builder_checkpoint_summary_v2: DBMap<CheckpointSequenceNumber, BuilderCheckpointSummary>,
+    builder_checkpoint_summary: DBMap<CheckpointSequenceNumber, BuilderCheckpointSummary>,
 
     // Maps checkpoint sequence number to an accumulator with accumulated state
     // only for the checkpoint that the key references. Append-only, i.e.,
@@ -583,11 +568,6 @@ pub struct AuthorityEpochTables {
     pub(crate) executed_transactions_to_checkpoint:
         DBMap<TransactionDigest, CheckpointSequenceNumber>,
 
-    /// This table is no longer used (can be removed when DBMap supports
-    /// removing tables)
-    #[allow(dead_code)]
-    oauth_provider_jwk: DBMap<JwkId, JWK>,
-
     /// JWKs that have been voted for by one or more authorities but are not yet
     /// active.
     pending_jwks: DBMap<(AuthorityName, JwkId, JWK), ()>,
@@ -601,51 +581,31 @@ pub struct AuthorityEpochTables {
     /// Transactions that are being deferred until some future time
     deferred_transactions: DBMap<DeferralKey, Vec<VerifiedSequencedConsensusTransaction>>,
 
-    /// This table is no longer used (can be removed when DBMap supports
-    /// removing tables)
-    #[allow(dead_code)]
-    randomness_rounds_written: DBMap<narwhal_types::RandomnessRound, ()>,
-
     /// Tables for recording state for RandomnessManager.
 
     /// Records messages processed from other nodes. Updated when receiving a
     /// new dkg::Message via consensus.
-    pub(crate) dkg_processed_messages_v2: DBMap<PartyId, VersionedProcessedMessage>,
-    /// This table is no longer used (can be removed when DBMap supports
-    /// removing tables)
-    #[allow(dead_code)]
-    #[deprecated]
-    pub(crate) dkg_processed_messages: DBMap<PartyId, Vec<u8>>,
+    pub(crate) dkg_processed_messages: DBMap<PartyId, VersionedProcessedMessage>,
 
     /// Records messages used to generate a DKG confirmation. Updated when
     /// enough DKG messages are received to progress to the next phase.
-    pub(crate) dkg_used_messages_v2: DBMap<u64, VersionedUsedProcessedMessages>,
-    /// This table is no longer used (can be removed when DBMap supports
-    /// removing tables)
-    #[allow(dead_code)]
-    #[deprecated]
-    pub(crate) dkg_used_messages: DBMap<u64, Vec<u8>>,
+    pub(crate) dkg_used_messages: DBMap<u64, VersionedUsedProcessedMessages>,
 
     /// Records confirmations received from other nodes. Updated when receiving
     /// a new dkg::Confirmation via consensus.
-    pub(crate) dkg_confirmations_v2: DBMap<PartyId, VersionedDkgConfirmation>,
-    /// This table is no longer used (can be removed when DBMap supports
-    /// removing tables)
-    #[allow(dead_code)]
-    #[deprecated]
-    pub(crate) dkg_confirmations: DBMap<PartyId, Vec<u8>>,
+    pub(crate) dkg_confirmations: DBMap<PartyId, VersionedDkgConfirmation>,
+
     /// Records the final output of DKG after completion, including the public
     /// VSS key and any local private shares.
     pub(crate) dkg_output: DBMap<u64, dkg::Output<PkG, EncG>>,
-    /// This table is no longer used (can be removed when DBMap supports
-    /// removing tables)
-    #[allow(dead_code)]
-    randomness_rounds_pending: DBMap<RandomnessRound, ()>,
+
     /// Holds the value of the next RandomnessRound to be generated.
     pub(crate) randomness_next_round: DBMap<u64, RandomnessRound>,
+
     /// Holds the value of the highest completed RandomnessRound (as reported to
     /// RandomnessReporter).
     pub(crate) randomness_highest_completed_round: DBMap<u64, RandomnessRound>,
+
     /// Holds the timestamp of the most recently generated round of randomness.
     pub(crate) randomness_last_round_timestamp: DBMap<u64, TimestampMs>,
 }
@@ -3861,7 +3821,7 @@ impl AuthorityPerEpochStore {
                 checkpoint_height: Some(commit_height),
                 position_in_commit,
             };
-            batch.insert_batch(&self.tables()?.builder_checkpoint_summary_v2, [(
+            batch.insert_batch(&self.tables()?.builder_checkpoint_summary, [(
                 &sequence_number,
                 summary,
             )])?;
@@ -3899,7 +3859,7 @@ impl AuthorityPerEpochStore {
             position_in_commit: 0,
         };
         self.tables()?
-            .builder_checkpoint_summary_v2
+            .builder_checkpoint_summary
             .insert(summary.sequence_number(), &builder_summary)?;
         Ok(())
     }
@@ -3909,7 +3869,7 @@ impl AuthorityPerEpochStore {
     ) -> IotaResult<Option<BuilderCheckpointSummary>> {
         Ok(self
             .tables()?
-            .builder_checkpoint_summary_v2
+            .builder_checkpoint_summary
             .unbounded_iter()
             .skip_to_last()
             .next()
@@ -3921,7 +3881,7 @@ impl AuthorityPerEpochStore {
     ) -> IotaResult<Option<(CheckpointSequenceNumber, CheckpointSummary)>> {
         Ok(self
             .tables()?
-            .builder_checkpoint_summary_v2
+            .builder_checkpoint_summary
             .unbounded_iter()
             .skip_to_last()
             .next()
@@ -3934,7 +3894,7 @@ impl AuthorityPerEpochStore {
     ) -> IotaResult<Option<CheckpointSummary>> {
         Ok(self
             .tables()?
-            .builder_checkpoint_summary_v2
+            .builder_checkpoint_summary
             .get(&sequence)?
             .map(|s| s.summary))
     }
@@ -4324,13 +4284,10 @@ impl ConsensusCommitOutput {
             )])?;
         }
 
-        batch.insert_batch(&tables.dkg_confirmations_v2, self.dkg_confirmations)?;
-        batch.insert_batch(
-            &tables.dkg_processed_messages_v2,
-            self.dkg_processed_messages,
-        )?;
+        batch.insert_batch(&tables.dkg_confirmations, self.dkg_confirmations)?;
+        batch.insert_batch(&tables.dkg_processed_messages, self.dkg_processed_messages)?;
         batch.insert_batch(
-            &tables.dkg_used_messages_v2,
+            &tables.dkg_used_messages,
             // using Option as iter
             self.dkg_used_message
                 .into_iter()
diff --git a/crates/iota-core/src/epoch/randomness.rs b/crates/iota-core/src/epoch/randomness.rs
@@ -352,12 +352,12 @@ impl RandomnessManager {
             );
             rm.processed_messages.extend(
                 tables
-                    .dkg_processed_messages_v2
+                    .dkg_processed_messages
                     .safe_iter()
                     .map(|result| result.expect("typed_store should not fail")),
             );
             if let Some(used_messages) = tables
-                .dkg_used_messages_v2
+                .dkg_used_messages
                 .get(&SINGLETON_KEY)
                 .expect("typed_store should not fail")
             {
@@ -367,7 +367,7 @@ impl RandomnessManager {
             }
             rm.confirmations.extend(
                 tables
-                    .dkg_confirmations_v2
+                    .dkg_confirmations
                     .safe_iter()
                     .map(|result| result.expect("typed_store should not fail")),
             );
diff --git a/crates/iota-storage/src/indexes.rs b/crates/iota-storage/src/indexes.rs
@@ -160,33 +160,12 @@ pub struct IndexStoreTables {
     #[default_options_override_fn = "transactions_to_addr_table_default_config"]
     transactions_to_addr: DBMap<(IotaAddress, TxSequenceNumber), TransactionDigest>,
 
-    /// Index from object id to transactions that used that object id as input.
-    #[deprecated]
-    transactions_by_input_object_id: DBMap<(ObjectID, TxSequenceNumber), TransactionDigest>,
-
-    /// Index from object id to transactions that modified/created that object
-    /// id.
-    #[deprecated]
-    transactions_by_mutated_object_id: DBMap<(ObjectID, TxSequenceNumber), TransactionDigest>,
-
     /// Index from package id, module and function identifier to transactions
     /// that used that moce function call as input.
     #[default_options_override_fn = "transactions_by_move_function_table_default_config"]
     transactions_by_move_function:
         DBMap<(ObjectID, String, String, TxSequenceNumber), TransactionDigest>,
 
-    /// This is a map between the transaction digest and its timestamp (UTC
-    /// timestamp in **milliseconds** since epoch 1/1/1970). A transaction
-    /// digest is subjectively time stamped on a node according to the local
-    /// machine time, so it varies across nodes. The timestamping happens
-    /// when the node sees a txn certificate for the first time.
-    ///
-    /// DEPRECATED. DO NOT USE
-    #[allow(dead_code)]
-    #[default_options_override_fn = "timestamps_table_default_config"]
-    #[deprecated]
-    timestamps: DBMap<TransactionDigest, u64>,
-
     /// Ordering of all indexed transactions.
     #[default_options_override_fn = "transactions_order_table_default_config"]
     transaction_order: DBMap<TxSequenceNumber, TransactionDigest>,
@@ -214,20 +193,21 @@ pub struct IndexStoreTables {
     #[default_options_override_fn = "dynamic_field_index_table_default_config"]
     dynamic_field_index: DBMap<DynamicFieldKey, DynamicFieldInfo>,
 
-    /// This is an index of all the versions of loaded child objects
-    #[deprecated]
-    loaded_child_object_versions: DBMap<TransactionDigest, Vec<(ObjectID, SequenceNumber)>>,
-
     #[default_options_override_fn = "index_table_default_config"]
     event_order: DBMap<EventId, EventIndex>,
+
     #[default_options_override_fn = "index_table_default_config"]
     event_by_move_module: DBMap<(ModuleId, EventId), EventIndex>,
+
     #[default_options_override_fn = "index_table_default_config"]
     event_by_move_event: DBMap<(StructTag, EventId), EventIndex>,
+
     #[default_options_override_fn = "index_table_default_config"]
     event_by_event_module: DBMap<(ModuleId, EventId), EventIndex>,
+
     #[default_options_override_fn = "index_table_default_config"]
     event_by_sender: DBMap<(IotaAddress, EventId), EventIndex>,
+
     #[default_options_override_fn = "index_table_default_config"]
     event_by_time: DBMap<(u64, EventId), EventIndex>,
 }
@@ -270,11 +250,6 @@ fn transactions_to_addr_table_default_config() -> DBOptions {
 fn transactions_by_move_function_table_default_config() -> DBOptions {
     default_db_options().disable_write_throttling()
 }
-fn timestamps_table_default_config() -> DBOptions {
-    default_db_options()
-        .optimize_for_point_lookup(64)
-        .disable_write_throttling()
-}
 fn owner_index_table_default_config() -> DBOptions {
     default_db_options().disable_write_throttling()
 }
@@ -483,7 +458,6 @@ impl IndexStore {
     pub async fn index_tx(
         &self,
         sender: IotaAddress,
-        active_inputs: impl Iterator<Item = ObjectID>,
         mutated_objects: impl Iterator<Item = (ObjectRef, Owner)> + Clone,
         move_functions: impl Iterator<Item = (ObjectID, Identifier, Identifier)> + Clone,
         events: &TransactionEvents,
@@ -510,21 +484,6 @@ impl IndexStore {
             std::iter::once(((sender, sequence), *digest)),
         )?;
 
-        #[allow(deprecated)]
-        if !self.remove_deprecated_tables {
-            batch.insert_batch(
-                &self.tables.transactions_by_input_object_id,
-                active_inputs.map(|id| ((id, sequence), *digest)),
-            )?;
-
-            batch.insert_batch(
-                &self.tables.transactions_by_mutated_object_id,
-                mutated_objects
-                    .clone()
-                    .map(|(obj_ref, _)| ((obj_ref.0, sequence), *digest)),
-            )?;
-        }
-
         batch.insert_batch(
             &self.tables.transactions_by_move_function,
             move_functions.map(|(obj_id, module, function)| {
@@ -698,12 +657,6 @@ impl IndexStore {
             }) => Ok(self.get_transactions_by_move_function(
                 package, module, function, cursor, limit, reverse,
             )?),
-            Some(TransactionFilter::InputObject(object_id)) => {
-                Ok(self.get_transactions_by_input_object(object_id, cursor, limit, reverse)?)
-            }
-            Some(TransactionFilter::ChangedObject(object_id)) => {
-                Ok(self.get_transactions_by_mutated_object(object_id, cursor, limit, reverse)?)
-            }
             Some(TransactionFilter::FromAddress(address)) => {
                 Ok(self.get_transactions_from_addr(address, cursor, limit, reverse)?)
             }
@@ -781,46 +734,6 @@ impl IndexStore {
         })
     }
 
-    pub fn get_transactions_by_input_object(
-        &self,
-        input_object: ObjectID,
-        cursor: Option<TxSequenceNumber>,
-        limit: Option<usize>,
-        reverse: bool,
-    ) -> IotaResult<Vec<TransactionDigest>> {
-        if self.remove_deprecated_tables {
-            return Ok(vec![]);
-        }
-        #[allow(deprecated)]
-        Self::get_transactions_from_index(
-            &self.tables.transactions_by_input_object_id,
-            input_object,
-            cursor,
-            limit,
-            reverse,
-        )
-    }
-
-    pub fn get_transactions_by_mutated_object(
-        &self,
-        mutated_object: ObjectID,
-        cursor: Option<TxSequenceNumber>,
-        limit: Option<usize>,
-        reverse: bool,
-    ) -> IotaResult<Vec<TransactionDigest>> {
-        if self.remove_deprecated_tables {
-            return Ok(vec![]);
-        }
-        #[allow(deprecated)]
-        Self::get_transactions_from_index(
-            &self.tables.transactions_by_mutated_object_id,
-            mutated_object,
-            cursor,
-            limit,
-            reverse,
-        )
-    }
-
     pub fn get_transactions_from_addr(
         &self,
         addr: IotaAddress,
@@ -1655,7 +1568,6 @@ mod tests {
                 address,
                 vec![].into_iter(),
                 vec![].into_iter(),
-                vec![].into_iter(),
                 &TransactionEvents { data: vec![] },
                 object_index_changes,
                 &TransactionDigest::random(),
@@ -1699,7 +1611,6 @@ mod tests {
                 address,
                 vec![].into_iter(),
                 vec![].into_iter(),
-                vec![].into_iter(),
                 &TransactionEvents { data: vec![] },
                 object_index_changes,
                 &TransactionDigest::random(),
diff --git a/crates/iota-tool/src/db_tool/index_search.rs b/crates/iota-tool/src/db_tool/index_search.rs
diff --git a/scripts/search_versions/search_versions.py b/scripts/search_versions/search_versions.py
