nostr/nostr-rs-relay
1
0
Fork 0
mirror of https://github.com/scsibug/nostr-rs-relay.git synced 2024-11-24 17:49:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: clippy suggestions

Browse Source
This commit is contained in:
Greg Heartsfield 2023-01-09 22:12:04 -06:00
parent ed336111bb
commit 3d3d1bde53
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/db.rs
View File

@ -534,7 +534,7 @@ fn query_from_filter(f: &ReqFilter) -> (String, Vec<Box<dyn ToSql>>, Option<Stri
} }
// check if the index needs to be overriden // check if the index needs to be overriden
let idx_name = override_index(&f); let idx_name = override_index(f);
let idx_stmt = idx_name.as_ref().map_or_else(|| "".to_owned(), |i| format!("INDEXED BY {}",i)); let idx_stmt = idx_name.as_ref().map_or_else(|| "".to_owned(), |i| format!("INDEXED BY {}",i));
let mut query = format!("SELECT e.content, e.created_at FROM event e {}", idx_stmt); let mut query = format!("SELECT e.content, e.created_at FROM event e {}", idx_stmt);
// query parameters for SQLite // query parameters for SQLite
@ -859,7 +859,7 @@ pub async fn db_query(
// check if a checkpoint is trying to run, and abort // check if a checkpoint is trying to run, and abort
if row_count % 100 == 0 { if row_count % 100 == 0 {
{ {
if let Err(_) = safe_to_read.try_lock() { if safe_to_read.try_lock().is_err() {
// lock was held, abort this query // lock was held, abort this query
debug!("query aborted due to checkpoint (cid: {}, sub: {:?})", client_id, sub.id); debug!("query aborted due to checkpoint (cid: {}, sub: {:?})", client_id, sub.id);
return Ok(()); return Ok(());
@ -889,7 +889,7 @@ pub async fn db_query(
return ok; return ok;
} }
// check if a checkpoint is trying to run, and abort // check if a checkpoint is trying to run, and abort
if let Err(_) = safe_to_read.try_lock() { if safe_to_read.try_lock().is_err() {
// lock was held, abort this query // lock was held, abort this query
debug!("query aborted due to checkpoint (cid: {}, sub: {:?})", client_id, sub.id); debug!("query aborted due to checkpoint (cid: {}, sub: {:?})", client_id, sub.id);
return Ok(()); return Ok(());