Skip to content

World's first open-source enterprise world model.

perf(ontology): optimize entity_type_views and relation_type_views queries with LEFT JOIN aggregations and concurrent fetch (#1088)

plpycoin306e33373cf2
diff --git a/crates/utopia-server/src/api/ontology_routes.rs b/crates/utopia-server/src/api/ontology_routes.rs
index 6e99e382..bb85fa8b 100644
--- a/crates/utopia-server/src/api/ontology_routes.rs
+++ b/crates/utopia-server/src/api/ontology_routes.rs
@@ -30,13 +30,12 @@ pub async fn get(
Path(kb_id): Path<Uuid>,
) -> ApiResult<Json<serde_json::Value>> {
require_kb(&state, &user, kb_id, Role::Viewer).await?;
- let entity_types = utopia_store::ontology::entity_type_views(&state.pool, kb_id).await?;
- let relation_types = utopia_store::ontology::relation_type_views(&state.pool, kb_id).await?;
- let misses = utopia_store::ontology::list_misses(&state.pool, kb_id).await?;
- // 已忽略的单列一路:抑制照旧(提案与自动扩本体只看上面那份),
- // 但让人看得见抑制掉了什么、现在涨到多少
- let dismissed_misses =
- utopia_store::ontology::list_dismissed_misses(&state.pool, kb_id).await?;
+ let (entity_types, relation_types, misses, dismissed_misses) = tokio::try_join!(
+ utopia_store::ontology::entity_type_views(&state.pool, kb_id),
+ utopia_store::ontology::relation_type_views(&state.pool, kb_id),
+ utopia_store::ontology::list_misses(&state.pool, kb_id),
+ utopia_store::ontology::list_dismissed_misses(&state.pool, kb_id),
+ )?;
Ok(Json(json!({
"entity_types": entity_types,
"relation_types": relation_types,
diff --git a/crates/utopia-store/src/ontology.rs b/crates/utopia-store/src/ontology.rs
index c54d49fd..a4ebb76e 100644
--- a/crates/utopia-store/src/ontology.rs
+++ b/crates/utopia-store/src/ontology.rs
@@ -19,9 +19,15 @@ pub async fn entity_type_views(pool: &PgPool, kb_id: Uuid) -> AppResult<Vec<Enti
WHERE p.child_id = t.id AND p.is_primary) AS primary_parent,
ARRAY(SELECT d.b_id FROM entity_type_disjoint d
WHERE d.kb_id = t.kb_id AND d.a_id = t.id) AS disjoint,
- (SELECT count(*) FROM entities e
- WHERE e.type_id = t.id AND e.merged_into IS NULL) AS usage
- FROM entity_types t WHERE t.kb_id = $1 ORDER BY lower(t.label)",
+ COALESCE(u.usage, 0) AS usage
+ FROM entity_types t
+ LEFT JOIN (
+ SELECT type_id, count(*)::bigint AS usage
+ FROM entities
+ WHERE kb_id = $1 AND merged_into IS NULL AND type_id IS NOT NULL
+ GROUP BY type_id
+ ) u ON u.type_id = t.id
+ WHERE t.kb_id = $1 ORDER BY lower(t.label)",
)
.bind(kb_id)
.fetch_all(pool)
@@ -86,9 +92,15 @@ pub async fn relation_type_views(pool: &PgPool, kb_id: Uuid) -> AppResult<Vec<Re
WHERE g.relation_type_id = r.id) AS ranges,
ARRAY(SELECT q.qualifier_type_id FROM relation_type_qualifiers q
WHERE q.relation_type_id = r.id) AS qualifiers,
- (SELECT count(*) FROM facts f
- WHERE f.predicate_id = r.id AND f.invalidated_at IS NULL) AS usage
- FROM relation_types r WHERE r.kb_id = $1 ORDER BY lower(r.label)",
+ COALESCE(u.usage, 0) AS usage
+ FROM relation_types r
+ LEFT JOIN (
+ SELECT predicate_id, count(*)::bigint AS usage
+ FROM facts
+ WHERE kb_id = $1 AND invalidated_at IS NULL AND predicate_id IS NOT NULL
+ GROUP BY predicate_id
+ ) u ON u.predicate_id = r.id
+ WHERE r.kb_id = $1 ORDER BY lower(r.label)",
)
.bind(kb_id)
.fetch_all(pool)