Skip to content

Commit

Permalink
Improve blueprint definition cache
Browse files Browse the repository at this point in the history
  • Loading branch information
@iamyulong
iamyulong committed Oct 13, 2023
1 parent ffe110a commit 51c4c67
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 47 deletions.
77 changes: 44 additions & 33 deletions radix-engine/src/system/system.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,21 +309,19 @@ where
Ok((validation_target.blueprint_info, node_substates))
}

pub fn get_blueprint_default_interface(
pub fn get_blueprint_default_definition(
&mut self,
blueprint_id: BlueprintId,
) -> Result<BlueprintInterface, RuntimeError> {
) -> Result<Rc<BlueprintDefinition>, RuntimeError> {
let bp_version_key = BlueprintVersionKey::new_default(blueprint_id.blueprint_name);
Ok(self
.load_blueprint_definition(blueprint_id.package_address, &bp_version_key)?
.interface)
Ok(self.load_blueprint_definition(blueprint_id.package_address, &bp_version_key)?)
}

pub fn load_blueprint_definition(
&mut self,
package_address: PackageAddress,
bp_version_key: &BlueprintVersionKey,
) -> Result<BlueprintDefinition, RuntimeError> {
) -> Result<Rc<BlueprintDefinition>, RuntimeError> {
let canonical_bp_id = CanonicalBlueprintId {
address: package_address,
blueprint: bp_version_key.blueprint.to_string(),
Expand Down Expand Up @@ -359,14 +357,14 @@ where
self.api.kernel_read_substate(handle)?.as_typed().unwrap();
self.api.kernel_close_substate(handle)?;

let definition = match substate.into_value() {
let definition = Rc::new(match substate.into_value() {
Some(definition) => definition.into_latest(),
None => {
return Err(RuntimeError::SystemError(
SystemError::BlueprintDoesNotExist(canonical_bp_id),
))
}
};
});

self.api
.kernel_get_system_state()
Expand Down Expand Up @@ -439,14 +437,14 @@ where
fields: IndexMap<u8, FieldValue>,
kv_entries: IndexMap<u8, IndexMap<Vec<u8>, KVEntry>>,
) -> Result<NodeId, RuntimeError> {
let blueprint_interface = self.get_blueprint_default_interface(blueprint_id.clone())?;
let blueprint_type = blueprint_interface.blueprint_type.clone();
let blueprint_definition = self.get_blueprint_default_definition(blueprint_id.clone())?;
let blueprint_type = blueprint_definition.interface.blueprint_type.clone();

let object_features: IndexSet<String> =
features.into_iter().map(|s| s.to_string()).collect();
// Validate features
for feature in &object_features {
if !blueprint_interface.feature_set.contains(feature) {
if !blueprint_definition.interface.feature_set.contains(feature) {
return Err(RuntimeError::SystemError(SystemError::InvalidFeature(
feature.to_string(),
)));
Expand Down Expand Up @@ -489,7 +487,7 @@ where

let (blueprint_info, mut node_substates) = self.validate_new_object(
blueprint_id,
&blueprint_interface,
&blueprint_definition.interface,
outer_obj_info,
object_features,
&outer_object_features,
Expand All @@ -516,17 +514,17 @@ where

self.api.kernel_create_node(node_id, node_substates)?;

if blueprint_interface.is_transient {
if blueprint_definition.interface.is_transient {
self.api.kernel_pin_node(node_id)?;
}

if let Some((partition_offset, fields)) = blueprint_interface.state.fields {
if let Some((partition_offset, fields)) = &blueprint_definition.interface.state.fields {
for (index, field) in fields.iter().enumerate() {
if let FieldTransience::TransientStatic { .. } = field.transience {
let partition_number = match partition_offset {
PartitionDescription::Physical(partition_number) => partition_number,
PartitionDescription::Physical(partition_number) => *partition_number,
PartitionDescription::Logical(offset) => {
MAIN_BASE_PARTITION.at_offset(offset).unwrap()
MAIN_BASE_PARTITION.at_offset(*offset).unwrap()
}
};
self.api.kernel_mark_substate_as_transient(
Expand Down Expand Up @@ -736,11 +734,12 @@ where
) -> Result<(NodeId, BlueprintInfo, PartitionNumber), RuntimeError> {
let (node_id, module_id) = self.get_actor_object_id(actor_object_type)?;
let blueprint_info = self.get_blueprint_info(&node_id, module_id)?;
let blueprint_interface =
self.get_blueprint_default_interface(blueprint_info.blueprint_id.clone())?;
let blueprint_definition =
self.get_blueprint_default_definition(blueprint_info.blueprint_id.clone())?;

let partition_num = {
let (partition_description, partition_type) = blueprint_interface
let (partition_description, partition_type) = blueprint_definition
.interface
.state
.get_partition(collection_index)
.ok_or_else(|| {
Expand Down Expand Up @@ -786,28 +785,32 @@ where
(
NodeId,
Option<AttachedModuleId>,
BlueprintInterface,
Rc<BlueprintDefinition>,
BlueprintInfo,
),
RuntimeError,
> {
let (node_id, module_id) = self.get_actor_object_id(actor_object_type)?;
let blueprint_info = self.get_blueprint_info(&node_id, module_id)?;
let blueprint_interface =
self.get_blueprint_default_interface(blueprint_info.blueprint_id.clone())?;
let blueprint_definition =
self.get_blueprint_default_definition(blueprint_info.blueprint_id.clone())?;

Ok((node_id, module_id, blueprint_interface, blueprint_info))
Ok((node_id, module_id, blueprint_definition, blueprint_info))
}

fn get_actor_field_info(
&mut self,
actor_object_type: ActorStateRef,
field_index: u8,
) -> Result<(NodeId, BlueprintInfo, PartitionNumber, FieldTransience), RuntimeError> {
let (node_id, module_id, interface, info) = self.get_actor_info(actor_object_type)?;

let (partition_description, field_schema) =
interface.state.field(field_index).ok_or_else(|| {
let (node_id, module_id, blueprint_definition, info) =
self.get_actor_info(actor_object_type)?;

let (partition_description, field_schema) = blueprint_definition
.interface
.state
.field(field_index)
.ok_or_else(|| {
RuntimeError::SystemError(SystemError::FieldDoesNotExist(
info.blueprint_id.clone(),
field_index,
Expand Down Expand Up @@ -960,16 +963,20 @@ where
CannotGlobalizeError::InvalidBlueprintId,
)));
}
let interface = self
.get_blueprint_default_interface(object_info.blueprint_info.blueprint_id.clone())?;
let blueprint_definition = self.get_blueprint_default_definition(
object_info.blueprint_info.blueprint_id.clone(),
)?;

if interface.is_transient {
if blueprint_definition.interface.is_transient {
return Err(RuntimeError::SystemError(
SystemError::GlobalizingTransientBlueprint,
));
}

interface.state.num_logical_partitions()
blueprint_definition
.interface
.state
.num_logical_partitions()
};

let mut partitions = btreemap!(
Expand Down Expand Up @@ -1012,8 +1019,12 @@ where
);

// Move and drop
let interface = self.get_blueprint_default_interface(blueprint_id.clone())?;
let num_logical_partitions = interface.state.num_logical_partitions();
let blueprint_definition =
self.get_blueprint_default_definition(blueprint_id.clone())?;
let num_logical_partitions = blueprint_definition
.interface
.state
.num_logical_partitions();

let module_id: ModuleId = module_id.clone().into();
let module_base_partition = module_id.base_partition_num();
Expand Down
2 changes: 1 addition & 1 deletion radix-engine/src/system/system_callback.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ impl SystemLockData {

pub struct SystemConfig<C: SystemCallbackObject> {
pub callback_obj: C,
pub blueprint_cache: NonIterMap<CanonicalBlueprintId, BlueprintDefinition>,
pub blueprint_cache: NonIterMap<CanonicalBlueprintId, Rc<BlueprintDefinition>>,
pub schema_cache: NonIterMap<SchemaHash, Rc<VersionedScryptoSchema>>,
pub auth_cache: NonIterMap<CanonicalBlueprintId, AuthConfig>,
pub modules: SystemModuleMixer,
Expand Down
25 changes: 12 additions & 13 deletions radix-engine/src/system/system_type_checker.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,11 @@ where
),
RuntimeError,
> {
let blueprint_interface =
self.get_blueprint_default_interface(target.blueprint_info.blueprint_id.clone())?;
let blueprint_definition =
self.get_blueprint_default_definition(target.blueprint_info.blueprint_id.clone())?;

let (payload_def, allow_ownership, allow_non_global_ref) = blueprint_interface
let (payload_def, allow_ownership, allow_non_global_ref) = blueprint_definition
.interface
.get_payload_def(payload_identifier)
.ok_or_else(|| {
RuntimeError::SystemError(SystemError::TypeCheckError(
Expand Down Expand Up @@ -267,10 +268,11 @@ where
collection_index: CollectionIndex,
payloads: &[(&Vec<u8>, &Vec<u8>)],
) -> Result<PartitionDescription, RuntimeError> {
let blueprint_interface =
self.get_blueprint_default_interface(target.blueprint_info.blueprint_id.clone())?;
let blueprint_definition =
self.get_blueprint_default_definition(target.blueprint_info.blueprint_id.clone())?;

let partition_description = blueprint_interface
let partition_description = blueprint_definition
.interface
.state
.collections
.get(collection_index as usize)
Expand Down Expand Up @@ -425,16 +427,13 @@ where
blueprint_name,
type_name,
} = type_id.clone();
let interface = self.get_blueprint_default_interface(BlueprintId {
let blueprint_definition = self.get_blueprint_default_definition(BlueprintId {
package_address,
blueprint_name,
})?;
let scoped_type_id = interface
.types
.get(&type_name)
.ok_or(RuntimeError::SystemError(
SystemError::BlueprintTypeNotFound(type_name.clone()),
))?;
let scoped_type_id = blueprint_definition.interface.types.get(&type_name).ok_or(
RuntimeError::SystemError(SystemError::BlueprintTypeNotFound(type_name.clone())),
)?;
Ok((
self.get_schema(package_address.as_node_id(), &scoped_type_id.0)?,
scoped_type_id.clone(),
Expand Down

0 comments on commit 51c4c67

Please sign in to comment.