extern/atuin
1
0
Fork 0
mirror of https://github.com/atuinsh/atuin.git synced 2025-08-15 17:52:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: use transaction for idx consistency checking (#2840)

Browse Source
This commit is contained in:
Ellie Huxtable
2025-07-24 10:08:20 +02:00
committed by GitHub
parent 576789335a
commit 0f381dd515
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crates/atuin-server-postgres/src/lib.rs
View File

@ -620,9 +620,12 @@ impl Database for Postgres {
const STATUS_SQL: &str = const STATUS_SQL: &str =
"select host, tag, max(idx) from store where user_id = $1 group by host, tag"; "select host, tag, max(idx) from store where user_id = $1 group by host, tag";
// Use a transaction to ensure consistent reads from both tables
let mut tx = self.pool.begin().await.map_err(fix_error)?;
let mut res: Vec<(Uuid, String, i64)> = sqlx::query_as(STATUS_SQL) let mut res: Vec<(Uuid, String, i64)> = sqlx::query_as(STATUS_SQL)
.bind(user.id) .bind(user.id)
.fetch_all(&self.pool) .fetch_all(&mut *tx)
.await .await
.map_err(fix_error)?; .map_err(fix_error)?;
res.sort(); res.sort();
@ -636,11 +639,13 @@ impl Database for Postgres {
let mut cached_res: Vec<(Uuid, String, i64)> = let mut cached_res: Vec<(Uuid, String, i64)> =
sqlx::query_as("select host, tag, idx from store_idx_cache where user_id = $1") sqlx::query_as("select host, tag, idx from store_idx_cache where user_id = $1")
.bind(user.id) .bind(user.id)
.fetch_all(&self.pool) .fetch_all(&mut *tx)
.await .await
.map_err(fix_error)?; .map_err(fix_error)?;
cached_res.sort(); cached_res.sort();
tx.commit().await.map_err(fix_error)?;
let mut status = RecordStatus::new(); let mut status = RecordStatus::new();
let equal = res == cached_res; let equal = res == cached_res;