Skip to content

:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.

fix(personhog-identity): lock persons FOR NO KEY UPDATE in merge flip and delete unmap (#128851)

Nick Beste3e6ca2070f4
diff --git a/rust/personhog-identity/src/lifecycle/delete.rs b/rust/personhog-identity/src/lifecycle/delete.rs
index 2d4552ab9678..066330d73ef3 100644
--- a/rust/personhog-identity/src/lifecycle/delete.rs
+++ b/rust/personhog-identity/src/lifecycle/delete.rs
@@ -561,7 +561,7 @@ async fn unmap(
// acquisition on both sides (the writer sorts its flush batches the
// same way) makes a cycle impossible.
let lock_persons_sql = format!(
- "SELECT id FROM {person_table} WHERE team_id = $1 AND id = ANY($2) ORDER BY id FOR UPDATE",
+ "SELECT id FROM {person_table} WHERE team_id = $1 AND id = ANY($2) ORDER BY id FOR NO KEY UPDATE",
person_table = tables.person,
);
sqlx::query(&query_tag!("delete_unmap_lock_persons", lock_persons_sql))
diff --git a/rust/personhog-identity/src/lifecycle/merge.rs b/rust/personhog-identity/src/lifecycle/merge.rs
index e55eae076482..7d12d326c8a8 100644
--- a/rust/personhog-identity/src/lifecycle/merge.rs
+++ b/rust/personhog-identity/src/lifecycle/merge.rs
@@ -1824,7 +1824,7 @@ async fn flip(pools: &IdentityPools, tables: &IdentityTables, op: &OpRow) -> Res
lock_ids.push(target);
lock_ids.sort_unstable();
let lock_persons_sql = format!(
- "SELECT id FROM {person_table} WHERE team_id = $1 AND id = ANY($2) ORDER BY id FOR UPDATE",
+ "SELECT id FROM {person_table} WHERE team_id = $1 AND id = ANY($2) ORDER BY id FOR NO KEY UPDATE",
person_table = tables.person,
);
sqlx::query(&query_tag!("merge_flip_lock_persons", lock_persons_sql))