mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: Improve `rad stats` output 

Use daily/weekly figures.
This commit is contained in:
Alexis Sellier 2024-05-10 13:13:03 +02:00
parent 9766c67671
commit c5395f0674
No known key found for this signature in database
1 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
radicle-cli/src/commands/stats.rs
View File

@ -31,14 +31,17 @@ Options
}; };
#[derive(Default, Serialize)] #[derive(Default, Serialize)]
#[serde(rename_all = "camelCase")]
struct NodeStats { struct NodeStats {
all: usize, all: usize,
public: usize, public_daily: usize,
online: usize, online_daily: usize,
seeding: usize, online_weekly: usize,
seeding_weekly: usize,
} }
#[derive(Default, Serialize)] #[derive(Default, Serialize)]
#[serde(rename_all = "camelCase")]
struct LocalStats { struct LocalStats {
repos: usize, repos: usize,
issues: usize, issues: usize,
@ -48,12 +51,14 @@ struct LocalStats {
} }
#[derive(Default, Serialize)] #[derive(Default, Serialize)]
#[serde(rename_all = "camelCase")]
struct RepoStats { struct RepoStats {
unique: usize, unique: usize,
replicas: usize, replicas: usize,
} }
#[derive(Default, Serialize)] #[derive(Default, Serialize)]
#[serde(rename_all = "camelCase")]
struct Stats { struct Stats {
local: LocalStats, local: LocalStats,
repos: RepoStats, repos: RepoStats,
@ -108,6 +113,7 @@ pub fn run(_options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
} }
} }
let now = LocalTime::now();
let db = profile.database()?; let db = profile.database()?;
stats.nodes.all = address::Store::nodes(&db)?; stats.nodes.all = address::Store::nodes(&db)?;
stats.repos.replicas = routing::Store::len(&db)?; stats.repos.replicas = routing::Store::len(&db)?;
@ -126,46 +132,64 @@ pub fn run(_options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
} }
{ {
let now = LocalTime::now();
let since = now - LocalDuration::from_mins(60 * 24); // 1 day. let since = now - LocalDuration::from_mins(60 * 24); // 1 day.
let mut stmt = db.db.prepare( let mut stmt = db.db.prepare(
"SELECT COUNT(DISTINCT node) FROM announcements WHERE timestamp >= ?1 and timestamp < ?2", "SELECT COUNT(DISTINCT node) FROM announcements WHERE timestamp >= ?1 AND timestamp < ?2",
)?; )?;
stmt.bind((1, since.as_millis() as i64))?; stmt.bind((1, since.as_millis() as i64))?;
stmt.bind((2, now.as_millis() as i64))?; stmt.bind((2, now.as_millis() as i64))?;
// SAFETY: `COUNT` always returns a row. // SAFETY: `COUNT` always returns a row.
let row = stmt.into_iter().next().unwrap()?; let row = stmt.iter().next().unwrap()?;
let count = row.read::<i64, _>(0) as usize; stats.nodes.online_daily = row.read::<i64, _>(0) as usize;
stats.nodes.online = count; let since = now - LocalDuration::from_mins(60 * 24 * 7); // 1 week.
stmt.reset()?;
stmt.bind((1, since.as_millis() as i64))?;
stmt.bind((2, now.as_millis() as i64))?;
let row = stmt.iter().next().unwrap()?;
stats.nodes.online_weekly = row.read::<i64, _>(0) as usize;
} }
{ {
let row = db let since = now - LocalDuration::from_mins(60 * 24); // 1 day.
.db let mut stmt = db.db.prepare(
.prepare("SELECT COUNT(DISTINCT node) FROM addresses")? "SELECT COUNT(DISTINCT ann.node) FROM announcements as ann
JOIN addresses AS addr
ON ann.node == addr.node
WHERE ann.timestamp >= ?1 AND ann.timestamp < ?2",
)?;
stmt.bind((1, since.as_millis() as i64))?;
stmt.bind((2, now.as_millis() as i64))?;
let row = stmt
.into_iter() .into_iter()
.next() .next()
// SAFETY: `COUNT` always returns a row. // SAFETY: `COUNT` always returns a row.
.unwrap()?; .unwrap()?;
let count = row.read::<i64, _>(0) as usize; let count = row.read::<i64, _>(0) as usize;
stats.nodes.public = count; stats.nodes.public_daily = count;
} }
{ {
let row = db let since = now - LocalDuration::from_mins(60 * 24 * 7); // 1 week.
.db let mut stmt = db.db.prepare(
.prepare("SELECT COUNT(DISTINCT node) FROM routing")? "SELECT COUNT(DISTINCT node) FROM routing
WHERE timestamp >= ?1 AND timestamp < ?2",
)?;
stmt.bind((1, since.as_millis() as i64))?;
stmt.bind((2, now.as_millis() as i64))?;
let row = stmt
.into_iter() .into_iter()
.next() .next()
// SAFETY: `COUNT` always returns a row. // SAFETY: `COUNT` always returns a row.
.unwrap()?; .unwrap()?;
let count = row.read::<i64, _>(0) as usize; let count = row.read::<i64, _>(0) as usize;
stats.nodes.seeding = count; stats.nodes.seeding_weekly = count;
} }
let output = term::json::to_pretty(&stats, Path::new("stats.json"))?; let output = term::json::to_pretty(&stats, Path::new("stats.json"))?;