SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.
Saved model: read text records up to 16 MiB, so a long warning keeps fast opening (#8541) (#8607)
semmelrinde800b6b44864a
diff --git a/crates/doc/src/model_cache.rs b/crates/doc/src/model_cache.rsindex 2908b55eef..71b1f4b63b 100644--- a/crates/doc/src/model_cache.rs+++ b/crates/doc/src/model_cache.rs@@ -24,6 +24,10 @@ pub struct SavedModel {const MAX_ITEMS: usize = 1_000_000;/// Bodies, sketches and sheet bodies all the states hold together, at most (a state is a list of clones).const MAX_HELD: usize = 50_000_000;+/// Longest text a record holds (bytes). A feature's warning can quote every generated name of+/// the edges it picked: 122,701 characters in one design, whose saved model was refused, so it+/// evaluated again on every open (#8541).+const MAX_TEXT: usize = 1 << 24;/// A feature's boolean retries as saved. The kernel leaves `rejected` out when it is empty, and/// the field has no default when read, so a saved model whose booleans retried was refused and@@ -263,7 +267,7 @@ impl SavedModel {v.and_then(Json::as_u64).and_then(|i| usize::try_from(i).ok()).filter(|i| *i < len).ok_or_else(|| bad("saved model: index"))};let text =- |v: Option<&Json>| v.and_then(Json::as_str).filter(|s| s.len() <= 1 << 16).map(str::to_owned).ok_or_else(|| bad("saved model: text"));+ |v: Option<&Json>| v.and_then(Json::as_str).filter(|s| s.len() <= MAX_TEXT).map(str::to_owned).ok_or_else(|| bad("saved model: text"));let parse = |v: Option<&Json>| v.cloned().ok_or_else(|| bad("saved model: missing"));let mut names = Vec::new();for n in list("names")? {@@ -569,7 +573,7 @@ impl Model {v.and_then(Json::as_u64).and_then(|i| usize::try_from(i).ok()).filter(|i| *i < len).ok_or_else(|| bad("saved model: index"))};let text =- |v: Option<&Json>| v.and_then(Json::as_str).filter(|s| s.len() <= 1 << 16).map(str::to_owned).ok_or_else(|| bad("saved model: text"));+ |v: Option<&Json>| v.and_then(Json::as_str).filter(|s| s.len() <= MAX_TEXT).map(str::to_owned).ok_or_else(|| bad("saved model: text"));let features = records.get("features").and_then(Json::as_array).ok_or_else(|| bad("saved model: features"))?;if features.len() != doc.features.len() {return Err(bad("saved model: features"));diff --git a/crates/doc/src/tests.rs b/crates/doc/src/tests.rsindex 556179d96d..0122031b0a 100644--- a/crates/doc/src/tests.rs+++ b/crates/doc/src/tests.rs@@ -159,6 +159,22 @@ fn results_kept_ahead_outlive_the_cache() {assert!(rel(measure(&m.state().bodies[0].body).unwrap().volume, 30000.0) < 1e-9);}+/// A saved model whose feature warning is longer than 65,536 characters is still taken on open+/// (#8541): Save writes it, so Open reads it.+#[test]+fn a_saved_model_with_a_long_warning_is_adopted() {+ let (doc, _) = plate_doc();+ let mut m = Model::new();+ m.evaluate(&doc);+ let mut saved = m.saved(&doc).unwrap();+ let last = doc.features.last().unwrap().id;+ let warning = "w".repeat(122_701);+ let features = saved.records["features"].as_array_mut().unwrap();+ features.last_mut().unwrap()["warning"] = warning.clone().into();+ let reopened = Model::adopt(&doc, &saved).unwrap();+ assert_eq!(reopened.result(last).and_then(|r| r.warning.as_deref()), Some(warning.as_str()));+}+/// Rolling the marker back must not discard unchanged results just because the bounded cache/// evicted them. Opening an earlier feature and returning to the end otherwise rebuilds it all.#[test]