Add missed BoundedDbCodec impls for Entity-listing codecs (for fast delete_all()).

Author: jakrawcz-rdx

core-rust/state-manager/src/store/codecs.rs

@@ -62,6 +62,7 @@
  * permissions under this License.
  */
 
+use std::mem::size_of;
 use std::ops::Range;
 
 use crate::engine_prelude::*;
@@ -316,6 +317,22 @@ impl DbCodec<NodeId> for NodeIdDbCodec {
 #[derive(Default)]
 pub struct TypeAndCreationIndexKeyDbCodec {}
 
+impl TypeAndCreationIndexKeyDbCodec {
+    /// An extracted "how are parts encoded together" knowledge, to be shared with the
+    /// [`BoundedDbCodec`] implementation.
+    fn encode_parts(
+        entity_byte: u8,
+        state_version_bytes: &[u8; StateVersion::BYTE_LEN],
+        index_within_txn_bytes: &[u8; size_of::<u32>()],
+    ) -> Vec<u8> {
+        let mut bytes = Vec::new();
+        bytes.push(entity_byte);
+        bytes.extend_from_slice(state_version_bytes);
+        bytes.extend_from_slice(index_within_txn_bytes);
+        bytes
+    }
+}
+
 impl DbCodec<(EntityType, CreationId)> for TypeAndCreationIndexKeyDbCodec {
     fn encode(&self, value: &(EntityType, CreationId)) -> Vec<u8> {
         let (
@@ -325,11 +342,11 @@ impl DbCodec<(EntityType, CreationId)> for TypeAndCreationIndexKeyDbCodec {
                 index_within_txn,
             },
         ) = value;
-        let mut bytes = Vec::new();
-        bytes.push(*entity_type as u8);
-        bytes.extend_from_slice(&state_version.to_be_bytes());
-        bytes.extend_from_slice(&index_within_txn.to_be_bytes());
-        bytes
+        Self::encode_parts(
+            *entity_type as u8,
+            &state_version.to_be_bytes(),
+            &index_within_txn.to_be_bytes(),
+        )
     }
 
     fn decode(&self, bytes: &[u8]) -> (EntityType, CreationId) {
@@ -350,6 +367,16 @@ impl DbCodec<(EntityType, CreationId)> for TypeAndCreationIndexKeyDbCodec {
     }
 }
 
+impl BoundedDbCodec for TypeAndCreationIndexKeyDbCodec {
+    fn upper_bound_encoding(&self) -> Vec<u8> {
+        Self::encode_parts(
+            u8::MAX,
+            &[u8::MAX; StateVersion::BYTE_LEN],
+            &[u8::MAX; size_of::<u32>()],
+        )
+    }
+}
+
 impl GroupPreservingDbCodec for TypeAndCreationIndexKeyDbCodec {
     type Group = EntityType;
 
@@ -372,6 +399,24 @@ impl IntraGroupOrderPreservingDbCodec<(EntityType, CreationId)> for TypeAndCreat
 #[derive(Default)]
 pub struct BlueprintAndCreationIndexKeyDbCodec {}
 
+impl BlueprintAndCreationIndexKeyDbCodec {
+    /// An extracted "how are parts encoded together" knowledge, to be shared with the
+    /// [`BoundedDbCodec`] implementation.
+    fn encode_parts(
+        package_address_bytes: &[u8; NodeId::LENGTH],
+        blueprint_name_hash_bytes: &[u8; Hash::LENGTH],
+        state_version_bytes: &[u8; StateVersion::BYTE_LEN],
+        index_within_txn_bytes: &[u8; size_of::<u32>()],
+    ) -> Vec<u8> {
+        let mut bytes = Vec::new();
+        bytes.extend_from_slice(package_address_bytes);
+        bytes.extend_from_slice(blueprint_name_hash_bytes);
+        bytes.extend_from_slice(state_version_bytes);
+        bytes.extend_from_slice(index_within_txn_bytes);
+        bytes
+    }
+}
+
 impl DbCodec<(PackageAddress, Hash, CreationId)> for BlueprintAndCreationIndexKeyDbCodec {
     fn encode(&self, value: &(PackageAddress, Hash, CreationId)) -> Vec<u8> {
         let (
@@ -382,12 +427,12 @@ impl DbCodec<(PackageAddress, Hash, CreationId)> for BlueprintAndCreationIndexKe
                 index_within_txn,
             },
         ) = value;
-        let mut bytes = Vec::new();
-        bytes.extend_from_slice(&package_address.as_node_id().0);
-        bytes.extend_from_slice(&blueprint_name_hash.0);
-        bytes.extend_from_slice(&state_version.to_be_bytes());
-        bytes.extend_from_slice(&index_within_txn.to_be_bytes());
-        bytes
+        Self::encode_parts(
+            &package_address.as_node_id().0,
+            &blueprint_name_hash.0,
+            &state_version.to_be_bytes(),
+            &index_within_txn.to_be_bytes(),
+        )
     }
 
     fn decode(&self, bytes: &[u8]) -> (PackageAddress, Hash, CreationId) {
@@ -413,6 +458,17 @@ impl DbCodec<(PackageAddress, Hash, CreationId)> for BlueprintAndCreationIndexKe
     }
 }
 
+impl BoundedDbCodec for BlueprintAndCreationIndexKeyDbCodec {
+    fn upper_bound_encoding(&self) -> Vec<u8> {
+        Self::encode_parts(
+            &[u8::MAX; NodeId::LENGTH],
+            &[u8::MAX; Hash::LENGTH],
+            &[u8::MAX; StateVersion::BYTE_LEN],
+            &[u8::MAX; size_of::<u32>()],
+        )
+    }
+}
+
 impl GroupPreservingDbCodec for BlueprintAndCreationIndexKeyDbCodec {
     type Group = (PackageAddress, Hash);
 

core-rust/state-manager/src/store/rocks_db.rs

@@ -94,7 +94,7 @@ use crate::store::traits::gc::{
     LedgerProofsGcProgress, LedgerProofsGcStore, StateTreeGcStore, VersionedLedgerProofsGcProgress,
 };
 use crate::store::traits::indices::{
-    CreationId, EntityBlueprintId, ObjectBlueprintName, ObjectBlueprintNameV1, EntityListingIndex,
+    CreationId, EntityBlueprintId, EntityListingIndex, ObjectBlueprintName, ObjectBlueprintNameV1,
     VersionedEntityBlueprintId, VersionedObjectBlueprintName,
 };
 use crate::store::traits::measurement::{CategoryDbVolumeStatistic, MeasurableDatabase};
@@ -2079,12 +2079,16 @@ impl<R: WriteableRocks> StateManagerDatabase<R> {
                     // that we care about (package address and blueprint name) are effectively
                     // immutable - we can thus safely ignore all updates to this substate.
                     continue;
-                },
+                }
                 SubstateChangeAction::Delete { .. } => {
-                    panic!("type info substate should not be deleted: {:?}", type_info_change)
-                },
+                    panic!(
+                        "type info substate should not be deleted: {:?}",
+                        type_info_change
+                    )
+                }
             };
-            let type_info = scrypto_decode::<TypeInfoSubstate>(created_type_info_value).expect("decode type info");
+            let type_info = scrypto_decode::<TypeInfoSubstate>(created_type_info_value)
+                .expect("decode type info");
 
             let entity_type = node_id.entity_type().expect("type of upserted Entity");
             let creation_id = CreationId::new(state_version, index_within_txn);
@@ -2132,8 +2136,11 @@ impl<R: WriteableRocks> StateManagerDatabase<R> {
             info!("Entity listing indices are disabled.");
             // We remove the indices' data and metadata in a single, cheap write batch:
             db_context.cf(TypeAndCreationIndexedEntitiesCf).delete_all();
-            db_context.cf(BlueprintAndCreationIndexedObjectsCf).delete_all();
-            db_context.cf(ExtensionsDataCf)
+            db_context
+                .cf(BlueprintAndCreationIndexedObjectsCf)
+                .delete_all();
+            db_context
+                .cf(ExtensionsDataCf)
                 .delete(&ExtensionsDataKey::EntityListingIndicesLastProcessedStateVersion);
             info!("Deleted entity listing indices.");
             return;
@@ -2161,7 +2168,7 @@ impl<R: WriteableRocks> StateManagerDatabase<R> {
             );
             if state_version.number() % TXN_FLUSH_INTERVAL == 0 || receipts_iter.peek().is_none() {
                 if state_version.number() % PROGRESS_LOG_INTERVAL == 0 {
-                    info!("Entity listing indices updated to {}",state_version);
+                    info!("Entity listing indices updated to {}", state_version);
                 }
                 db_context.cf(ExtensionsDataCf).put(
                     &ExtensionsDataKey::EntityListingIndicesLastProcessedStateVersion,