Skip to content

The fastest, cheapest, most efficient open-source agent harness. Run more than 500 agents on a $10 VPS.

refactor(storage): adjust query execution patterns in tinyflows reader

Steven Enamakelc5ffa58d9029
diff --git a/crates/openhuman-core/src/storage/import/tinyflows_reader/checkpoint_reader.rs b/crates/openhuman-core/src/storage/import/tinyflows_reader/checkpoint_reader.rs
index b5184e0f6b..b07e68c3a7 100644
--- a/crates/openhuman-core/src/storage/import/tinyflows_reader/checkpoint_reader.rs
+++ b/crates/openhuman-core/src/storage/import/tinyflows_reader/checkpoint_reader.rs
@@ -73,7 +73,7 @@ where
let mut statement = connection.prepare(
"SELECT CASE WHEN length(CAST(record AS BLOB)) <= ?1 THEN CAST(record AS BLOB) END, seq FROM checkpoints ORDER BY seq LIMIT ?2 OFFSET ?3",
)?;
- statement
+ let rows = statement
.query_map(
[MAX_IMPORT_RECORD_PAYLOAD_BYTES as i64, SQLITE_PAGE_ROWS, offset],
|row| {
@@ -83,7 +83,8 @@ where
))
},
)?
- .collect::<std::result::Result<Vec<_>, _>>()
+ .collect::<std::result::Result<Vec<_>, _>>();
+ rows
})
.await?;
if rows.is_empty() {
diff --git a/crates/openhuman-core/src/storage/import/tinyflows_reader/legacy_cron.rs b/crates/openhuman-core/src/storage/import/tinyflows_reader/legacy_cron.rs
index b949b6f755..91c49084f4 100644
--- a/crates/openhuman-core/src/storage/import/tinyflows_reader/legacy_cron.rs
+++ b/crates/openhuman-core/src/storage/import/tinyflows_reader/legacy_cron.rs
@@ -14,7 +14,7 @@
use std::collections::HashSet;
use std::path::Path;
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
use chrono::{DateTime, Utc};
use std::collections::HashMap;
use tinyflows_bus::schedule::types::{
@@ -22,7 +22,7 @@ use tinyflows_bus::schedule::types::{
SessionTarget,
};
-use super::legacy_db::{column_or, LegacyDb};
+use super::legacy_db::{LegacyDb, column_or};
use super::report::ImportReport;
/// What `jobs.db` held, decoded.
@@ -114,7 +114,7 @@ async fn read_jobs(
let mut rows = db
.read("cron jobs", move |conn| {
let mut statement = conn.prepare(&select)?;
- statement
+ let rows = statement
.query_map([], |row| {
Ok(JobRow {
id: row.get(0)?,
@@ -141,7 +141,8 @@ async fn read_jobs(
claim_generation: row.get(21)?,
})
})?
- .collect::<Result<Vec<_>, _>>()
+ .collect::<Result<Vec<_>, _>>();
+ rows
})
.await?;
if tables.contains("cron_job_policies") {
@@ -169,11 +170,12 @@ async fn read_policies(db: &LegacyDb) -> Result<HashMap<String, (Option<i64>, i6
db.read("cron job policies", |conn| {
let mut statement =
conn.prepare("SELECT job_id, retries, single_flight FROM cron_job_policies")?;
- statement
+ let rows = statement
.query_map([], |row| {
Ok((row.get::<_, String>(0)?, (row.get(1)?, row.get(2)?)))
})?
- .collect::<Result<HashMap<_, _>, _>>()
+ .collect::<Result<HashMap<_, _>, _>>();
+ rows
})
.await
}
@@ -251,7 +253,7 @@ async fn read_runs(db: &LegacyDb, report: &mut ImportReport) -> Result<Vec<CronR
let rows = db
.read("cron runs", move |conn| {
let mut statement = conn.prepare(&select)?;
- statement
+ let rows = statement
.query_map([], |row| {
Ok((
row.get::<_, i64>(0)?,
@@ -264,7 +266,8 @@ async fn read_runs(db: &LegacyDb, report: &mut ImportReport) -> Result<Vec<CronR
row.get::<_, Option<String>>(7)?,
))
})?
- .collect::<Result<Vec<_>, _>>()
+ .collect::<Result<Vec<_>, _>>();
+ rows
})
.await?;
let mut runs = Vec::new();
diff --git a/crates/openhuman-core/src/storage/import/tinyflows_reader/legacy_db.rs b/crates/openhuman-core/src/storage/import/tinyflows_reader/legacy_db.rs
index 4e6d7d89de..a466349e15 100644
--- a/crates/openhuman-core/src/storage/import/tinyflows_reader/legacy_db.rs
+++ b/crates/openhuman-core/src/storage/import/tinyflows_reader/legacy_db.rs
@@ -52,9 +52,10 @@ impl LegacyDb {
self.read("the table list", |connection| {
let mut statement =
connection.prepare("SELECT name FROM sqlite_master WHERE type = 'table'")?;
- statement
+ let rows = statement
.query_map([], |row| row.get::<_, String>(0))?
- .collect::<rusqlite::Result<HashSet<_>>>()
+ .collect::<rusqlite::Result<HashSet<_>>>();
+ rows
})
.await
}
@@ -63,9 +64,10 @@ impl LegacyDb {
pub(super) async fn columns(&self, table: &'static str) -> Result<HashSet<String>> {
self.read("a column list", move |connection| {
let mut statement = connection.prepare(&format!("PRAGMA table_info({table})"))?;
- statement
+ let rows = statement
.query_map([], |row| row.get::<_, String>(1))?
- .collect::<rusqlite::Result<HashSet<_>>>()
+ .collect::<rusqlite::Result<HashSet<_>>>();
+ rows
})
.await
}