World's first open-source enterprise world model.
Rust agent-memorybitemporalgraphragknowledge-baseknowledge-graphllmontologypgvectorpostgresqlragrustself-hostedsemantic-searchtemporal-knowledge-graphworld-model
Containment matches a name's % and _ literally instead of as wildcards (#1320)
Szabo Bogdanb6099e424588
diff --git a/crates/utopia-store/src/resolution.rs b/crates/utopia-store/src/resolution.rsindex 5cd4502b..d51ea1b1 100644--- a/crates/utopia-store/src/resolution.rs+++ b/crates/utopia-store/src/resolution.rs@@ -721,6 +721,13 @@ const MAX_CONTAIN_REVIEWS: usize = 4;/// 只取 4 行的话可能 4 行全是互斥类型,真正那一对反而被 LIMIT 切掉。const CONTAIN_SCAN_LIMIT: i64 = 16;+/// 名字当 LIKE 的字面子串用:不转义的话名字里的 `_` 会匹配任意一个字(#1293)+fn like_escaped(name: &str) -> String {+ name.replace('\\', "\\\\")+ .replace('%', "\\%")+ .replace('_', "\\_")+}+/// 新建实体之后,找出**名字互相包含**的既有实体,作为审阅候选。////// 中文商业文本在一篇之内就会全称转简称(「星云科技上海研究院」→「上海研究院」),@@ -792,8 +799,8 @@ async fn containment_reviews(AND lower(e.canonical_name) <> $3AND ((char_length(e.canonical_name) >= $4- AND (lower(e.canonical_name) LIKE '%' || $3 || '%'- OR $3 LIKE '%' || lower(e.canonical_name) || '%'))+ AND (lower(e.canonical_name) LIKE '%' || $6 || '%'+ OR $3 LIKE '%' || replace(replace(replace(lower(e.canonical_name), '\\', '\\\\'), '%', '\\%'), '_', '\\_') || '%'))-- **别的名字也要参与召回,否则每合并一次就少一条桥。**---- 合并把名字事实搬到存活者身上:Holmes 并入 Sherlock Holmes 之后,@@ -810,8 +817,8 @@ async fn containment_reviews(AND nr.builtin AND nr.key = 'known_as'AND nf.invalidated_at IS NULLAND char_length(nf.object_value->>'value') >= $4- AND (lower(nf.object_value->>'value') LIKE '%' || $3 || '%'- OR $3 LIKE '%' || lower(nf.object_value->>'value') || '%'))+ AND (lower(nf.object_value->>'value') LIKE '%' || $6 || '%'+ OR $3 LIKE '%' || replace(replace(replace(lower(nf.object_value->>'value'), '\\', '\\\\'), '%', '\\%'), '_', '\\_') || '%')))ORDER BY char_length(e.canonical_name)LIMIT $5",@@ -821,6 +828,7 @@ async fn containment_reviews(.bind(&lower).bind(MIN_CONTAIN_CHARS).bind(CONTAIN_SCAN_LIMIT)+ .bind(like_escaped(&lower)).fetch_all(pool).await?;@@ -2535,6 +2543,11 @@ pub async fn unadopt_types(pool: &PgPool, kb_id: Uuid, batch_id: Uuid) -> AppResmod tests {use super::*;+ #[test]+ fn like_escaped_turns_backslash_percent_and_underscore_into_literals() {+ assert_eq!(like_escaped(r"a\b%c_d"), r"a\\b\%c\_d");+ }+#[test]fn normalize_fullwidth_and_whitespace() {assert_eq!(normalize_name(" ACME Corp "), "ACME Corp");diff --git a/crates/utopia-store/tests/store/a_similar_name_is_proposed_not_merged.rs b/crates/utopia-store/tests/store/a_similar_name_is_proposed_not_merged.rsindex 09b3a74c..f013c07b 100644--- a/crates/utopia-store/tests/store/a_similar_name_is_proposed_not_merged.rs+++ b/crates/utopia-store/tests/store/a_similar_name_is_proposed_not_merged.rs@@ -102,6 +102,14 @@ fn vector_reviews(r: &utopia_store::resolution::Resolution) -> Vec<(Uuid, f32)>.collect()}+fn contained(r: &utopia_store::resolution::Resolution) -> Vec<Uuid> {+ r.reviews+ .iter()+ .filter(|v| v.reason.starts_with("contains|"))+ .map(|v| v.other_id)+ .collect()+}+/// 相近的名字:新建实体,给裁决器排一对,绝不静默归并#[tokio::test]async fn a_near_name_creates_an_entity_and_proposes_a_pair() -> anyhow::Result<()> {@@ -483,13 +491,6 @@ async fn names_that_carry_different_numbers_are_not_proposed() -> anyhow::Result);// 包含关系:`migration 39` 是 `migration 395` 的子串,但不是它的简称- let contained = |r: &utopia_store::resolution::Resolution| {- r.reviews- .iter()- .filter(|v| v.reason.starts_with("contains|"))- .map(|v| v.other_id)- .collect::<Vec<_>>()- };let long = resolve("migration 395", None).await?;let short = resolve("migration 39", None).await?;assert!(short.created);@@ -512,3 +513,46 @@ async fn names_that_carry_different_numbers_are_not_proposed() -> anyhow::Resultteardown(&pool, &f).await?;run}++/// 名字里的 `_` 按字面比,不当通配符(#1293):`src/a_b.ts` 不包含在 `src/axb.ts::adds` 里,+/// 反过来 `a_b.ts` 也不在后者里;真包含的 `src/a_b.ts` 照常配对+#[tokio::test]+async fn an_underscore_in_a_name_is_not_a_wildcard() -> anyhow::Result<()> {+ let Some(url) = utopia_store::test_db::url() else {+ return Ok(());+ };+ let pool = PgPool::connect(&url).await?;+ let f = seed(&pool, "contain-underscore").await?;+ let run = async {+ let resolve = |name: &'static str| {+ utopia_store::resolution::resolve_mention(+ &pool,+ f.kb,+ Some(f.device),+ name,+ None,+ None,+ None,+ &[],+ )+ };+ let file = resolve("src/a_b.ts").await?;+ let other = resolve("src/axb.ts::adds").await?;+ assert!(+ !contained(&other).contains(&file.entity_id),+ "库里名字的 _ 不匹配 x:{:?}",+ other.reviews+ );+ let brief = resolve("a_b.ts").await?;+ assert_eq!(+ contained(&brief),+ vec![file.entity_id],+ "mention 的 _ 不匹配 x,真包含的照常配对:{:?}",+ brief.reviews+ );+ Ok::<_, anyhow::Error>(())+ }+ .await;+ teardown(&pool, &f).await?;+ run+}