Return both end_time and duration for the last recorded artifact collection

Author: Kobzol

database/src/lib.rs

@@ -668,3 +668,9 @@ pub struct CompileBenchmark {
     pub name: String,
     pub category: String,
 }
+
+#[derive(Debug)]
+pub struct ArtifactCollection {
+    pub duration: Duration,
+    pub end_time: DateTime<Utc>,
+}

database/src/pool.rs

@@ -1,4 +1,4 @@
-use crate::{ArtifactId, ArtifactIdNumber, CompileBenchmark};
+use crate::{ArtifactCollection, ArtifactId, ArtifactIdNumber, CompileBenchmark};
 use crate::{CollectionId, Index, Profile, QueuedCommit, Scenario, Step};
 use chrono::{DateTime, Utc};
 use hashbrown::HashMap;
@@ -153,7 +153,7 @@ pub trait Connection: Send + Sync {
 
     async fn in_progress_steps(&self, aid: &ArtifactId) -> Vec<Step>;
 
-    async fn last_end_time(&self) -> Option<DateTime<Utc>>;
+    async fn last_artifact_collection(&self) -> Option<ArtifactCollection>;
 
     /// Returns the sha of the parent commit, if available.
     ///

database/src/pool/postgres.rs

@@ -1,7 +1,7 @@
 use crate::pool::{Connection, ConnectionManager, ManagedConnection, Transaction};
 use crate::{
-    ArtifactId, ArtifactIdNumber, Benchmark, CollectionId, Commit, CommitType, CompileBenchmark,
-    Date, Index, Profile, QueuedCommit, Scenario,
+    ArtifactCollection, ArtifactId, ArtifactIdNumber, Benchmark, CollectionId, Commit, CommitType,
+    CompileBenchmark, Date, Index, Profile, QueuedCommit, Scenario,
 };
 use anyhow::Context as _;
 use chrono::{DateTime, TimeZone, Utc};
@@ -1194,18 +1194,21 @@ where
             })
             .collect()
     }
-    async fn last_end_time(&self) -> Option<DateTime<Utc>> {
+    async fn last_artifact_collection(&self) -> Option<ArtifactCollection> {
         self.conn()
             .query_opt(
-                "select date_recorded \
+                "select date_recorded, duration \
                 from artifact_collection_duration \
                 order by date_recorded desc \
                 limit 1;",
                 &[],
             )
             .await
             .unwrap()
-            .map(|r| r.get(0))
+            .map(|r| ArtifactCollection {
+                end_time: r.get(0),
+                duration: Duration::from_secs(r.get::<_, i32>(1) as u64),
+            })
     }
     async fn parent_of(&self, sha: &str) -> Option<String> {
         self.conn()

database/src/pool/sqlite.rs

@@ -1,6 +1,7 @@
 use crate::pool::{Connection, ConnectionManager, ManagedConnection, Transaction};
 use crate::{
-    ArtifactId, Benchmark, CollectionId, Commit, CommitType, CompileBenchmark, Date, Profile,
+    ArtifactCollection, ArtifactId, Benchmark, CollectionId, Commit, CommitType, CompileBenchmark,
+    Date, Profile,
 };
 use crate::{ArtifactIdNumber, Index, QueryDatum, QueuedCommit};
 use chrono::{DateTime, NaiveDateTime, TimeZone, Utc};
@@ -1149,18 +1150,24 @@ impl Connection for SqliteConnection {
             .collect()
     }
 
-    async fn last_end_time(&self) -> Option<DateTime<Utc>> {
+    async fn last_artifact_collection(&self) -> Option<ArtifactCollection> {
         self.raw_ref()
             .query_row(
-                "select date_recorded + duration \
+                "select date_recorded + duration, duration \
                 from artifact_collection_duration \
                 order by date_recorded desc \
                 limit 1;",
                 params![],
-                |r| Ok(Utc.timestamp_opt(r.get(0)?, 0).unwrap()),
+                |r| {
+                    Ok((
+                        Utc.timestamp_opt(r.get(0)?, 0).unwrap(),
+                        Duration::from_secs(r.get(1)?),
+                    ))
+                },
             )
             .optional()
             .unwrap()
+            .map(|(end_time, duration)| ArtifactCollection { end_time, duration })
     }
 
     async fn parent_of(&self, sha: &str) -> Option<String> {

site/src/request_handlers/status_page.rs

@@ -54,7 +54,10 @@ pub async fn handle_status_page(ctxt: Arc<SiteCtxt>) -> status::Response {
         benchmarks: benchmark_state,
         missing,
         current,
-        most_recent_end: conn.last_end_time().await.map(|d| d.timestamp()),
+        most_recent_end: conn
+            .last_artifact_collection()
+            .await
+            .map(|d| d.end_time.timestamp()),
     }
 }