diff options
Diffstat (limited to 'ext/kv')
| -rw-r--r-- | ext/kv/remote.rs | 12 | ||||
| -rw-r--r-- | ext/kv/sqlite.rs | 27 |
2 files changed, 24 insertions, 15 deletions
diff --git a/ext/kv/remote.rs b/ext/kv/remote.rs index 448a87b0d..21286fd47 100644 --- a/ext/kv/remote.rs +++ b/ext/kv/remote.rs @@ -494,9 +494,15 @@ async fn call_remote< // `unwrap()` never fails because `tx` is owned by the task held by `refresher`. metadata_rx.changed().await.unwrap(); }; - let Some(sc_endpoint) = metadata.endpoints.iter().find(|x| x.consistency == "strong") else { - return Err(type_error("No strong consistency endpoint is available for this database")); - }; + let Some(sc_endpoint) = metadata + .endpoints + .iter() + .find(|x| x.consistency == "strong") + else { + return Err(type_error( + "No strong consistency endpoint is available for this database", + )); + }; let full_url = format!("{}/{}", sc_endpoint.url, method); { diff --git a/ext/kv/sqlite.rs b/ext/kv/sqlite.rs index f67154cb4..ea46aae32 100644 --- a/ext/kv/sqlite.rs +++ b/ext/kv/sqlite.rs @@ -355,7 +355,7 @@ impl SqliteDb { spawn_blocking(move || { let mut db = db.try_lock().ok(); let Some(db) = db.as_mut().and_then(|x| x.as_mut()) else { - return Err(type_error(ERROR_USING_CLOSED_DATABASE)) + return Err(type_error(ERROR_USING_CLOSED_DATABASE)); }; let result = match db.transaction() { Ok(tx) => f(tx), @@ -626,16 +626,17 @@ impl SqliteQueue { tx: &rusqlite::Transaction<'_>, ) -> Result<bool, AnyError> { let Some((_, id, data, backoff_schedule, keys_if_undelivered)) = tx - .prepare_cached(STATEMENT_QUEUE_GET_RUNNING_BY_ID)? - .query_row([id], |row| { - let deadline: u64 = row.get(0)?; - let id: String = row.get(1)?; - let data: Vec<u8> = row.get(2)?; - let backoff_schedule: String = row.get(3)?; - let keys_if_undelivered: String = row.get(4)?; - Ok((deadline, id, data, backoff_schedule, keys_if_undelivered)) - }) - .optional()? else { + .prepare_cached(STATEMENT_QUEUE_GET_RUNNING_BY_ID)? + .query_row([id], |row| { + let deadline: u64 = row.get(0)?; + let id: String = row.get(1)?; + let data: Vec<u8> = row.get(2)?; + let backoff_schedule: String = row.get(3)?; + let keys_if_undelivered: String = row.get(4)?; + Ok((deadline, id, data, backoff_schedule, keys_if_undelivered)) + }) + .optional()? + else { return Ok(false); }; @@ -926,7 +927,9 @@ fn mutate_le64( mutate: impl FnOnce(u64, u64) -> u64, ) -> Result<(), AnyError> { let Value::U64(operand) = *operand else { - return Err(type_error(format!("Failed to perform '{op_name}' mutation on a non-U64 operand"))); + return Err(type_error(format!( + "Failed to perform '{op_name}' mutation on a non-U64 operand" + ))); }; let old_value = tx |