rewrite to use CTE that doesn't depend on version history

Author: hawkw

dev-tools/omdb/src/bin/omdb/db/sitrep.rs

@@ -8,7 +8,6 @@ use crate::db::DbFetchOptions;
 use crate::db::check_limit;
 use crate::helpers::const_max_len;
 use crate::helpers::datetime_opt_rfc3339_concise;
-use crate::helpers::display_option_blank;
 use anyhow::Context;
 use async_bb8_diesel::AsyncRunQueryDsl;
 use chrono::{DateTime, Utc};
@@ -138,8 +137,6 @@ pub(super) async fn cmd_db_sitrep_history(
     struct SitrepRow {
         v: u32,
         id: Uuid,
-        #[tabled(display_with = "display_option_blank")]
-        orphans: Option<usize>,
         #[tabled(display_with = "datetime_opt_rfc3339_concise")]
         created_at: Option<DateTime<Utc>>,
         comment: String,
@@ -160,17 +157,6 @@ pub(super) async fn cmd_db_sitrep_history(
 
     let mut rows = Vec::with_capacity(versions.len());
     for v in versions {
-        let orphans = match datastore.fm_sitrep_list_orphaned(&opctx, &v).await
-        {
-            Ok(o) => Some(o.len()),
-            Err(e) => {
-                eprintln!(
-                    "failed to list orphaned sitreps at v{}: {e}",
-                    v.version
-                );
-                None
-            }
-        };
         let (comment, time_created) =
             match datastore.fm_sitrep_metadata_read(&opctx, v.id).await {
                 Ok(s) => (s.comment, Some(s.time_created)),
@@ -185,7 +171,6 @@ pub(super) async fn cmd_db_sitrep_history(
         rows.push(SitrepRow {
             v: v.version,
             id: v.id.into_untyped_uuid(),
-            orphans,
             created_at: time_created,
             comment,
         });

dev-tools/omdb/src/bin/omdb/nexus.rs

@@ -60,7 +60,6 @@ use nexus_types::internal_api::background::InstanceReincarnationStatus;
 use nexus_types::internal_api::background::InstanceUpdaterStatus;
 use nexus_types::internal_api::background::InventoryLoadStatus;
 use nexus_types::internal_api::background::LookupRegionPortStatus;
-use nexus_types::internal_api::background::OrphanedSitreps;
 use nexus_types::internal_api::background::ReadOnlyRegionReplacementStartStatus;
 use nexus_types::internal_api::background::RegionReplacementDriverStatus;
 use nexus_types::internal_api::background::RegionReplacementStatus;
@@ -3148,72 +3147,38 @@ fn print_task_fm_sitrep_loader(details: &serde_json::Value) {
 }
 
 fn print_task_fm_sitrep_gc(details: &serde_json::Value) {
-    let SitrepGcStatus { versions_scanned, orphaned_sitreps, errors } =
-        match serde_json::from_value::<SitrepGcStatus>(details.clone()) {
-            Err(error) => {
-                eprintln!(
-                    "warning: failed to interpret task details: {:?}: {:?}",
-                    error, details
-                );
-                return;
-            }
-            Ok(status) => status,
-        };
+    let SitrepGcStatus {
+        orphaned_sitreps_found,
+        orphaned_sitreps_deleted,
+        errors,
+    } = match serde_json::from_value::<SitrepGcStatus>(details.clone()) {
+        Err(error) => {
+            eprintln!(
+                "warning: failed to interpret task details: {:?}: {:?}",
+                error, details
+            );
+            return;
+        }
+        Ok(status) => status,
+    };
 
-    pub const TOTAL_VERSIONS_SCANNED: &str = "total versions scanned:";
-    pub const VERSIONS_WITH_ORPHANS: &str = "versions with orphans:";
-    pub const ORPHANS_FOUND: &str = "total orphaned sitreps found:";
-    pub const ORPHANS_DELETED: &str = "total orphaned sitreps deleted:";
+    pub const ORPHANS_FOUND: &str = "orphaned sitreps found:";
+    pub const ORPHANS_DELETED: &str = "orphaned sitreps deleted:";
     pub const ERRORS: &str = "errors:";
-    pub const WIDTH: usize = const_max_len(&[
-        TOTAL_VERSIONS_SCANNED,
-        VERSIONS_WITH_ORPHANS,
-        ERRORS,
-        ORPHANS_FOUND,
-        ORPHANS_DELETED,
-    ]) + 1;
+    pub const WIDTH: usize =
+        const_max_len(&[ERRORS, ORPHANS_FOUND, ORPHANS_DELETED]) + 1;
     pub const NUM_WIDTH: usize = 4;
-
-    #[derive(tabled::Tabled)]
-    struct OrphanedSitrepsRow {
-        version: u32,
-        found: usize,
-        deleted: usize,
-    }
-    let mut total_found = 0;
-    let mut total_deleted = 0;
-    let rows: Vec<_> = orphaned_sitreps
-        .iter()
-        .map(|(&version, &OrphanedSitreps { found, deleted })| {
-            total_found += found;
-            total_deleted += deleted;
-            OrphanedSitrepsRow { version, found, deleted }
-        })
-        .collect();
-
     if !errors.is_empty() {
         println!("{ERRICON}   {ERRORS:<WIDTH$}{:>NUM_WIDTH$}", errors.len());
         for error in errors {
             println!("      > {error}")
         }
     }
+
+    println!("    {ORPHANS_FOUND:<WIDTH$}{orphaned_sitreps_found:>NUM_WIDTH$}");
     println!(
-        "    {TOTAL_VERSIONS_SCANNED:<WIDTH$}{versions_scanned:>NUM_WIDTH$}"
-    );
-    println!(
-        "    {VERSIONS_WITH_ORPHANS:<WIDTH$}{:>NUM_WIDTH$}",
-        orphaned_sitreps.len()
+        "    {ORPHANS_DELETED:<WIDTH$}{orphaned_sitreps_deleted:>NUM_WIDTH$}"
     );
-    println!("    {ORPHANS_FOUND:<WIDTH$}{total_found:>NUM_WIDTH$}");
-    println!("    {ORPHANS_DELETED:<WIDTH$}{total_deleted:>NUM_WIDTH$}");
-
-    // Don't print the table listing the number of GC'd sitreps per version
-    // if it's empty, 'cause it looks kinda weird.
-    if !rows.is_empty() {
-        let mut table = tabled::Table::new(rows);
-        bgtask_apply_kv_style(&mut table);
-        println!("{table}");
-    }
 }
 
 const ERRICON: &str = "/!\\";

dev-tools/omdb/tests/successes.out

@@ -627,10 +627,8 @@ task: "fm_sitrep_gc"
   configured period: every <REDACTED_DURATION>s
   last completed activation: <REDACTED ITERATIONS>, triggered by <TRIGGERED_BY_REDACTED>
     started at <REDACTED_TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
-    total versions scanned:            0
-    versions with orphans:             0
-    total orphaned sitreps found:      0
-    total orphaned sitreps deleted:    0
+    orphaned sitreps found:      0
+    orphaned sitreps deleted:    0
 
 task: "fm_sitrep_loader"
   configured period: every <REDACTED_DURATION>s
@@ -1183,10 +1181,8 @@ task: "fm_sitrep_gc"
   configured period: every <REDACTED_DURATION>s
   last completed activation: <REDACTED ITERATIONS>, triggered by <TRIGGERED_BY_REDACTED>
     started at <REDACTED_TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
-    total versions scanned:            0
-    versions with orphans:             0
-    total orphaned sitreps found:      0
-    total orphaned sitreps deleted:    0
+    orphaned sitreps found:      0
+    orphaned sitreps deleted:    0
 
 task: "fm_sitrep_loader"
   configured period: every <REDACTED_DURATION>s