Skip to content

Commit 75ad38e

Browse files
committed
refactor(backend): remove advisory lock macro from common utils
- Remove `acquire_lock` macro from `common/src/lib.rs` - Update `dependent/src/lib.rs` to remove import and usage of the macro - Simplify database locking approach in progress update function
1 parent a92c361 commit 75ad38e

File tree

2 files changed

+1
-15
lines changed

2 files changed

+1
-15
lines changed

crates/utils/common/src/lib.rs

-13
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,3 @@ macro_rules! ryot_log {
128128
tracing::trace!(target: "ryot", $($arg)*);
129129
};
130130
}
131-
132-
#[macro_export]
133-
macro_rules! acquire_lock {
134-
($db:expr, $key:expr) => {
135-
use sqlx::postgres::PgAdvisoryLock;
136-
137-
let key_string = serde_json::to_string($key).unwrap();
138-
let lock = PgAdvisoryLock::new(key_string);
139-
ryot_log!(debug, "Acquiring advisory lock: {:?}", lock);
140-
let conn = $db.get_postgres_connection_pool().acquire().await?;
141-
let acquired = lock.acquire(conn).await?;
142-
};
143-
}

crates/utils/dependent/src/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use common_models::{
1010
StringIdObject, UserLevelCacheKey,
1111
};
1212
use common_utils::{
13-
acquire_lock, ryot_log, sleep_for_n_seconds, MAX_IMPORT_RETRIES_FOR_PARTIAL_STATE, PAGE_SIZE,
13+
ryot_log, sleep_for_n_seconds, MAX_IMPORT_RETRIES_FOR_PARTIAL_STATE, PAGE_SIZE,
1414
SHOW_SPECIAL_SEASON_NAMES,
1515
};
1616
use database_models::{
@@ -1312,7 +1312,6 @@ pub async fn progress_update(
13121312
}
13131313
ryot_log!(debug, "Input for progress_update = {:?}", input);
13141314

1315-
acquire_lock!(&ss.db, &cache_and_lock_key);
13161315
let all_prev_seen = Seen::find()
13171316
.filter(seen::Column::Progress.lt(100))
13181317
.filter(seen::Column::UserId.eq(user_id))

0 commit comments

Comments
 (0)