Skip to content

World's first open-source enterprise world model.

fix: preserve distinct statements and typed sources during entity merges (#1314)

Nash Aschenbathc20d494c561c
diff --git a/crates/utopia-store/src/resolution.rs b/crates/utopia-store/src/resolution.rs
index 08d6badf..10471241 100644
--- a/crates/utopia-store/src/resolution.rs
+++ b/crates/utopia-store/src/resolution.rs
@@ -2039,14 +2039,15 @@ pub async fn merge_entities(
.collect();
// 合并后 SPO+valid_from 重复的 live 事实:留最早 recorded_at 的一条,其余作废。
+ // 没有谓词的行不参与:开放陈述的不同短语都带 NULL,不能因此当成同一句话。
//
// **宾语两侧都要分组。** 字面值事实的 object_id 全是 NULL,只按它分组就等于
// 把同主同谓下的**所有值**当成同一条断言:一次合并之后,
// (公司, 成立年份, 2015) 与 (公司, 注册资本, …) 之外,同谓词的多个值只活得下来
// 最早记的那一个,其余无声消失,且没有 supersedes 可查。
let dups: Vec<(Vec<Uuid>,)> = sqlx::query_as(
- "SELECT (array_agg(id ORDER BY recorded_at))[2:] FROM facts
- WHERE kb_id = $1 AND invalidated_at IS NULL
+ "SELECT array_agg(id ORDER BY recorded_at, id) FROM facts
+ WHERE kb_id = $1 AND invalidated_at IS NULL AND predicate_id IS NOT NULL
AND (subject_id = $2 OR object_id = $2)
GROUP BY subject_id, predicate_id, object_id, object_value, valid_from
HAVING count(*) > 1",
@@ -2055,7 +2056,21 @@ pub async fn merge_entities(
.bind(target_id)
.fetch_all(&mut *tx)
.await?;
- let dup_ids: Vec<Uuid> = dups.into_iter().flat_map(|(ids,)| ids).collect();
+ let mut dup_ids = Vec::new();
+ for (ids,) in dups {
+ // 先给存活行接上来源,否则下一次物化可能作废它,再按原文重建,丢掉人的修正。
+ // 旧行的链接暂留:撤回合并还用得上;物化按它原有的规则清理失效链接。
+ sqlx::query(
+ "INSERT INTO typed_fact_sources (fact_id, statement_id)
+ SELECT $1, statement_id FROM typed_fact_sources WHERE fact_id = ANY($2)
+ ON CONFLICT DO NOTHING",
+ )
+ .bind(ids[0])
+ .bind(&ids[1..])
+ .execute(&mut *tx)
+ .await?;
+ dup_ids.extend_from_slice(&ids[1..]);
+ }
if !dup_ids.is_empty() {
sqlx::query("UPDATE facts SET invalidated_at = now() WHERE id = ANY($1)")
.bind(&dup_ids)
diff --git a/crates/utopia-store/tests/store/a_merge_keeps_distinct_statements.rs b/crates/utopia-store/tests/store/a_merge_keeps_distinct_statements.rs
new file mode 100644
index 00000000..1f0774a8
--- /dev/null
+++ b/crates/utopia-store/tests/store/a_merge_keeps_distinct_statements.rs
@@ -0,0 +1,108 @@
+//! A merge keeps distinct open phrases and the sources of deduplicated typed facts.
+
+use sqlx::PgPool;
+use utopia_store::resolution;
+use uuid::Uuid;
+
+#[tokio::test]
+async fn merging_preserves_open_phrases_and_the_surviving_typed_rows_sources() -> anyhow::Result<()>
+{
+ let Some(url) = utopia_store::test_db::url() else {
+ return Ok(());
+ };
+ let pool = PgPool::connect(&url).await?;
+ let [org, ws, kb, class, target, source, place, property, binding, withdrawn, ships, receives, based, kept, dropped] =
+ std::array::from_fn(|_| Uuid::now_v7());
+ let run = async {
+ // Locally generated UUIDs only. The keeper has a corrected end, but its
+ // original source was withdrawn; the duplicate has the only live source.
+ sqlx::raw_sql(&format!(
+ "INSERT INTO organizations(id,name) VALUES ('{org}','merge-statements');
+ INSERT INTO workspaces(id,org_id,name) VALUES ('{ws}','{org}','merge-statements');
+ INSERT INTO knowledge_bases(id,workspace_id,name) VALUES ('{kb}','{ws}','merge-statements');
+ INSERT INTO entity_types(id,kb_id,key,label) VALUES ('{class}','{kb}','thing','Thing');
+ INSERT INTO entities(id,kb_id,type_id,canonical_name) VALUES
+ ('{target}','{kb}','{class}','Harbor Bakery'),
+ ('{source}','{kb}','{class}','Harbor'),
+ ('{place}','{kb}','{class}','Port Ellen');
+ INSERT INTO relation_types (id,kb_id,key,label,temporal)
+ VALUES ('{property}','{kb}','headquartered_in','headquartered in','state');
+ INSERT INTO phrase_bindings
+ (id,kb_id,phrase,subject_type_id,object_type_id,object_is_value,
+ relation_type_id,direction,status)
+ VALUES ('{binding}','{kb}','is based in','{class}','{class}',false,
+ '{property}','forward','bound');
+ INSERT INTO facts (id,kb_id,subject_id,object_id,layer,phrase,confidence) VALUES
+ ('{withdrawn}','{kb}','{target}','{place}','open','is based in',0.9),
+ ('{ships}','{kb}','{target}','{place}','open','ships to',0.9),
+ ('{receives}','{kb}','{target}','{place}','open','receives from',0.9),
+ ('{based}','{kb}','{source}','{place}','open','is based in',0.9);
+ UPDATE facts SET invalidated_at = now() WHERE id = '{withdrawn}';
+ INSERT INTO facts
+ (id,kb_id,subject_id,predicate_id,object_id,confidence,from_statement_id,
+ recorded_at,valid_to,valid_to_precision,corrected_ends) VALUES
+ ('{kept}','{kb}','{target}','{property}','{place}',0.9,'{withdrawn}',
+ '2024-01-01','2025-01-01','year','end'),
+ ('{dropped}','{kb}','{source}','{property}','{place}',0.9,'{based}',
+ '2024-02-01',NULL,NULL,NULL);
+ INSERT INTO typed_fact_sources (fact_id,statement_id) VALUES
+ ('{kept}','{withdrawn}'), ('{dropped}','{based}');"
+ ))
+ .execute(&pool)
+ .await?;
+
+ let merge = resolution::merge_entities(&pool, kb, source, target, None, "test").await?;
+ let live: Vec<Uuid> = sqlx::query_scalar(
+ "SELECT id FROM facts WHERE kb_id = $1 AND subject_id = $2
+ AND layer = 'open' AND invalidated_at IS NULL ORDER BY id",
+ )
+ .bind(kb)
+ .bind(target)
+ .fetch_all(&pool)
+ .await?;
+ let mut expected = vec![ships, receives, based];
+ expected.sort();
+ assert_eq!(live, expected, "different phrases, including those already on the target, survive");
+ let invalidated: Vec<Uuid> = sqlx::query_scalar(
+ "SELECT invalidated_facts FROM entity_merges WHERE id = $1",
+ )
+ .bind(merge)
+ .fetch_one(&pool)
+ .await?;
+ assert_eq!(invalidated, vec![dropped]);
+ let has_source: bool = sqlx::query_scalar(
+ "SELECT EXISTS (SELECT 1 FROM typed_fact_sources WHERE fact_id = $1 AND statement_id = $2)",
+ )
+ .bind(kept)
+ .bind(based)
+ .fetch_one(&pool)
+ .await?;
+ assert!(has_source, "the surviving typed row inherits the duplicate's live source");
+
+ assert_eq!(
+ utopia_store::materialize::materialize(&pool, kb).await?,
+ utopia_store::materialize::Outcome::default(),
+ "materialization must neither retire the keeper nor rederive its uncorrected interval"
+ );
+ let unchanged: bool = sqlx::query_scalar(
+ "SELECT invalidated_at IS NULL AND valid_to = '2025-01-01'::timestamptz
+ AND valid_to_precision = 'year' AND corrected_ends = 'end'
+ FROM facts WHERE id = $1",
+ )
+ .bind(kept)
+ .fetch_one(&pool)
+ .await?;
+ assert!(unchanged);
+ anyhow::Ok(())
+ }
+ .await;
+ sqlx::query("DELETE FROM knowledge_bases WHERE id = $1")
+ .bind(kb)
+ .execute(&pool)
+ .await?;
+ sqlx::query("DELETE FROM organizations WHERE id = $1")
+ .bind(org)
+ .execute(&pool)
+ .await?;
+ run
+}
diff --git a/crates/utopia-store/tests/store/main.rs b/crates/utopia-store/tests/store/main.rs
index 2915505a..45cfd7e1 100644
--- a/crates/utopia-store/tests/store/main.rs
+++ b/crates/utopia-store/tests/store/main.rs
@@ -55,6 +55,7 @@ mod a_judged_entity_waits_its_turn;
mod a_kind_word_binds_to_a_class;
mod a_late_value_takes_its_place_in_history;
mod a_mapping_is_not_a_fact;
+mod a_merge_keeps_distinct_statements;
mod a_merge_rewinds_with_the_second_clock;
mod a_merged_target_stays_out_of_the_export;
mod a_moment_marks_its_state;