nik/chorus
1
0
Fork 0
mirror of https://github.com/mikedilger/chorus.git synced 2026-03-04 06:36:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix LIMIT bug

Browse Source
This commit is contained in:
Mike Dilger 2024-02-29 17:49:07 +13:00
parent f7276d6ce8
commit 3a6f89649e
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
chorus-lib/src/store/mod.rs
View File

@ -248,16 +248,16 @@ impl Store {
if filter.num_ids() > 0 {
// Fetch by id
for id in filter.ids() {
// Stop if limited
if output.len() >= filter.limit() as usize {
return Ok(output);
}
if let Some(event) = self.get_event_by_id(id)? {
// and check each against the rest of the filter
if filter.event_matches(&event)? && screen(&event) {
output.push(event);
}
}
// Stop if limited
if output.len() >= filter.limit() as usize {
return Ok(output);
}
}
} else if filter.num_authors() > 0 && filter.num_kinds() > 0 {
for author in filter.authors() {
@ -281,6 +281,10 @@ impl Store {
let txn = self.env.read_txn()?;
let iter = self.akci.range(&txn, &range)?;
for result in iter {
// Stop if limited
if output.len() >= filter.limit() as usize {
return Ok(output);
}
let (_key, offset) = result?;
if let Some(event) = self.events.get_event_by_offset(offset)? {
// check against the rest of the filter
@ -296,10 +300,6 @@ impl Store {
}
}
}
// Stop if limited
if output.len() >= filter.limit() as usize {
return Ok(output);
}
}
}
}
@ -330,6 +330,10 @@ impl Store {
let txn = self.env.read_txn()?;
let iter = self.akci.range(&txn, &range)?;
for result in iter {
// Stop if limited
if output.len() >= filter.limit() as usize {
return Ok(output);
}
let (_key, offset) = result?;
if let Some(event) = self.events.get_event_by_offset(offset)? {
// check against the rest of the filter
@ -337,10 +341,6 @@ impl Store {
output.push(event);
}
}
// Stop if limited
if output.len() >= filter.limit() as usize {
return Ok(output);
}
}
}
}
@ -373,6 +373,10 @@ impl Store {
let txn = self.env.read_txn()?;
let iter = self.akci.range(&txn, &range)?;
for result in iter {
// Stop if limited
if output.len() >= filter.limit() as usize {
return Ok(output);
}
let (_key, offset) = result?;
if let Some(event) = self.events.get_event_by_offset(offset)? {
// check against the rest of the filter
@ -380,10 +384,6 @@ impl Store {
output.push(event);
}
}
// Stop if limited
if output.len() >= filter.limit() as usize {
return Ok(output);
}
}
}
}
@ -406,14 +406,14 @@ impl Store {
let txn = self.env.read_txn()?;
let iter = self.ci.iter(&txn)?;
for result in iter {
if count >= filter.limit() {
break;
}
let (_key, offset) = result?;
if let Some(event) = self.events.get_event_by_offset(offset)? {
if filter.event_matches(&event)? && screen(&event) {
output.push(event);
count += 1;
if count >= filter.limit() {
break;
}
}
}
}