hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-23 05:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enhance snapshot patch computation and logging

Browse source 
- Updated the handling of `Rojo_Id` attributes in the patch computation to improve reference resolution for instances.
- Refactored the `compute_property_patches` function to accept a context for specified IDs, enhancing the accuracy of property patching.
- Changed logging level from info to debug for prefetching file statistics to reduce log verbosity.

These changes aim to improve the accuracy of snapshot processing and optimize logging during file prefetching.
This commit is contained in:
Joe 2026-02-19 07:54:32 -06:00
parent eb114ac76e
commit 8471f4b95d
3 changed files with 29 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/serve_session.rs
View file

@ -281,7 +281,7 @@ impl ServeSession {
let prefetch_start = Instant::now();
match prefetch_project_files(&root_project) {
Ok(cache) => {
log::info!(
log::debug!(
"Prefetch total: {} files + {} canonical paths in {:.1?}",
cache.files.len(),
cache.canonical.len(),

29
src/snapshot/patch_compute.rs
View file

@ -44,6 +44,10 @@ pub fn compute_patch_set(snapshot: Option<InstanceSnapshot>, tree: &RojoTree, id
#[derive(Default)]
struct ComputePatchContext {
snapshot_id_to_instance_id: HashMap<Ref, Ref>,
/// Maps `Rojo_Id` attribute values (from snapshots being patched) to the
/// tree Ref of the instance that carries them. Populated top-down so that
/// parent IDs are available when children try to resolve `Rojo_Target_*`.
snapshot_specified_ids: HashMap<String, Ref>,
}
fn rewrite_refs_in_updates(context: &ComputePatchContext, updates: &mut [PatchUpdate]) {
@ -92,15 +96,32 @@ fn compute_patch_set_internal(
.insert(snapshot.snapshot_id, id);
}
if let Some(Variant::Attributes(attrs)) = snapshot.properties.get(&ustr("Attributes")) {
if let Some(id_value) = attrs.get(REF_ID_ATTRIBUTE_NAME) {
if let Some(id_str) = crate::variant_as_str(id_value, REF_ID_ATTRIBUTE_NAME) {
context
.snapshot_specified_ids
.insert(id_str.to_string(), id);
}
}
}
let instance = tree
.get_instance(id)
.expect("Instance did not exist in tree");
compute_property_patches(&mut snapshot, &instance, patch_set, tree);
compute_property_patches(
&context.snapshot_specified_ids,
&mut snapshot,
&instance,
patch_set,
tree,
);
compute_children_patches(context, &mut snapshot, tree, id, patch_set, session);
}
fn compute_property_patches(
snapshot_specified_ids: &HashMap<String, Ref>,
snapshot: &mut InstanceSnapshot,
instance: &InstanceWithMeta,
patch_set: &mut PatchSet,
@ -109,7 +130,8 @@ fn compute_property_patches(
let mut visited_properties = UstrSet::default();
let mut changed_properties = UstrMap::new();
let attribute_ref_properties = compute_ref_properties(snapshot, tree, instance.id());
let attribute_ref_properties =
compute_ref_properties(snapshot, tree, instance.id(), snapshot_specified_ids);
// Strip Rojo ref transport attributes from the snapshot before comparison.
// finalize_patch_application strips these from the tree after resolving refs,
@ -287,6 +309,7 @@ fn compute_ref_properties(
snapshot: &InstanceSnapshot,
tree: &RojoTree,
source_ref: Ref,
snapshot_specified_ids: &HashMap<String, Ref>,
) -> UstrMap<Option<Variant>> {
let mut map = UstrMap::new();
let attributes = match snapshot.properties.get(&ustr("Attributes")) {
@ -312,6 +335,8 @@ fn compute_ref_properties(
let rojo_ref = RojoRef::new(id_str.to_string());
if let Some(target_id) = tree.get_specified_id(&rojo_ref) {
map.insert(key, Some(Variant::Ref(target_id)));
} else if let Some(&target_id) = snapshot_specified_ids.get(id_str) {
map.insert(key, Some(Variant::Ref(target_id)));
} else {
map.insert(key, None);
}