refactor(email-service): Contact upserting logic#999
Merged
evanhutnik merged 2 commits intomainfrom Jan 14, 2026
Merged
Conversation
Contributor
|
test |
| #[tracing::instrument(skip(pool, contacts))] | ||
| async fn upsert_message_contacts( | ||
| pool: &PgPool, | ||
| contacts: Vec<ContactPhotoless>, |
Member
There was a problem hiding this comment.
not needed now but in the future using the non_empty crate here can help avoid those checks of
if x.is_empty() {
return early
}
whutchinson98
approved these changes
Jan 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Problem
The previous implementation of contact upserting used an
INSERT ... ON CONFLICT DO UPDATEpattern that would acquire row-level locks on theemail_contactstable. During high-concurrency scenarios like backfilling, this led to:Solution
Refactored the contact upsert logic to use a lock-free, optimistic approach:
ON CONFLICT DO NOTHING(no row locks on existing rows)This approach eliminates the need for row-level locks on existing contacts and significantly reduces database contention.
Screenshots, GIFs, and Videos