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

fix: do not force kind_created_at_index when there are tags

Browse Source
This commit is contained in:
Greg Heartsfield 2023-01-06 12:57:48 -06:00
parent 807d1aa384
commit 62e8da689d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/db.rs
View File

@ -510,6 +510,7 @@ fn override_index(f: &ReqFilter) -> Option<String> {
ks.len() > 1 && ks.len() > 1 &&
f.since.is_none() && f.since.is_none() &&
f.until.is_none() && f.until.is_none() &&
f.tags.is_none() &&
f.authors.is_none() { f.authors.is_none() {
return Some("kind_created_at_index".into()); return Some("kind_created_at_index".into());
} }
@ -529,15 +530,12 @@ fn query_from_filter(f: &ReqFilter) -> (String, Vec<Box<dyn ToSql>>, Option<Stri
let empty_query = "SELECT e.content, e.created_at FROM event e WHERE 1=0".to_owned(); let empty_query = "SELECT e.content, e.created_at FROM event e WHERE 1=0".to_owned();
// query parameters for SQLite // query parameters for SQLite
let empty_params: Vec<Box<dyn ToSql>> = vec![]; let empty_params: Vec<Box<dyn ToSql>> = vec![];
return (empty_query, empty_params); return (empty_query, empty_params, None);
} }
// 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);
if let Some(n) = &idx_name { let idx_stmt = idx_name.as_ref().map_or_else(|| "".to_owned(), |i| format!("INDEXED BY {}",i));
debug!("using explicit index: {:?}", n);
}
let idx_stmt = idx_name.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
let mut params: Vec<Box<dyn ToSql>> = vec![]; let mut params: Vec<Box<dyn ToSql>> = vec![];
@ -680,7 +678,7 @@ fn query_from_sub(sub: &Subscription) -> (String, Vec<Box<dyn ToSql>>, Vec<Strin
// build a dynamic SQL query for an entire subscription, based on // build a dynamic SQL query for an entire subscription, based on
// SQL subqueries for filters. // SQL subqueries for filters.
let mut subqueries: Vec<String> = Vec::new(); let mut subqueries: Vec<String> = Vec::new();
let indexes = vec![]; let mut indexes = vec![];
// subquery params // subquery params
let mut params: Vec<Box<dyn ToSql>> = vec![]; let mut params: Vec<Box<dyn ToSql>> = vec![];
// for every filter in the subscription, generate a subquery // for every filter in the subscription, generate a subquery