start tracking build-start time for build-time reporting

rust-lang · Oct 23, 2024 · d9f1a13 · d9f1a13
1 parent e7d5518
commit d9f1a13
Show file tree

Hide file tree

Showing 18 changed files with 60 additions and 44 deletions.
diff --git a/...616e0171b05f09b71795af14270961fa8bd0.json → ...d0d34e312cd5caeefcd77f0f1a94bd53fcb3.json b/...616e0171b05f09b71795af14270961fa8bd0.json → ...d0d34e312cd5caeefcd77f0f1a94bd53fcb3.json
diff --git a/...5bb47f6ebc389b0aa61f7732d1f354dc5259.json → ...e4b1806f0926d3494747854a036421399546.json b/...5bb47f6ebc389b0aa61f7732d1f354dc5259.json → ...e4b1806f0926d3494747854a036421399546.json
diff --git a/.sqlx/query-649f22aaffbd35cb00a820a68677797e8bbde159b10d04e3945520a61b63ecb0.json b/.sqlx/query-649f22aaffbd35cb00a820a68677797e8bbde159b10d04e3945520a61b63ecb0.json
diff --git a/.sqlx/query-7544bfef94310c33c8d34c30bc24e91b4aa2f198c1efd0f9ef562c0b85f4dddb.json b/.sqlx/query-7544bfef94310c33c8d34c30bc24e91b4aa2f198c1efd0f9ef562c0b85f4dddb.json
diff --git a/...4d76a1b03d3a8ca37c18b7a5b9296b94d4ea.json → ...0ea593a24d5d0c9ef291f786a27669cd626d.json b/...4d76a1b03d3a8ca37c18b7a5b9296b94d4ea.json → ...0ea593a24d5d0c9ef291f786a27669cd626d.json
diff --git a/...ff8b2ec47de33f2d74e0f1475fdf165e1ac2.json → ...bbdca1225e112fb869858060666750b80f1f.json b/...ff8b2ec47de33f2d74e0f1475fdf165e1ac2.json → ...bbdca1225e112fb869858060666750b80f1f.json
diff --git a/...3ba324fde11d9f5bd07ae264761dc38e1f2a.json → ...e3ca5d6b118da33795449e9386525eea912f.json b/...3ba324fde11d9f5bd07ae264761dc38e1f2a.json → ...e3ca5d6b118da33795449e9386525eea912f.json
diff --git a/...ff9d5169f8bf7c50315ef96d838b37c18cf1.json → ...786571008fe6088d142fd5f09a15b1a98344.json b/...ff9d5169f8bf7c50315ef96d838b37c18cf1.json → ...786571008fe6088d142fd5f09a15b1a98344.json
diff --git a/...73a3795cfe8e943716923ed9dfbaed3961af.json → ...ad3707b0ca37bbfca2d75e6e05b350dade04.json b/...73a3795cfe8e943716923ed9dfbaed3961af.json → ...ad3707b0ca37bbfca2d75e6e05b350dade04.json
diff --git a/...65f616eef21a09ffaaa243fc26f107ad6c87.json → ...6321ba93e043002509290acf736e7210caf2.json b/...65f616eef21a09ffaaa243fc26f107ad6c87.json → ...6321ba93e043002509290acf736e7210caf2.json
diff --git a/migrations/20241021050229_builds-started-finished.down.sql b/migrations/20241021050229_builds-started-finished.down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE builds DROP COLUMN build_started;
+ALTER TABLE builds RENAME COLUMN build_finished TO build_time;
diff --git a/migrations/20241021050229_builds-started-finished.up.sql b/migrations/20241021050229_builds-started-finished.up.sql
@@ -0,0 +1,5 @@
+ALTER TABLE builds
+    ADD COLUMN build_started TIMESTAMP WITH TIME ZONE;
+
+ALTER TABLE builds
+    RENAME COLUMN build_time TO build_finished;
diff --git a/src/db/add_package.rs b/src/db/add_package.rs
@@ -165,7 +165,7 @@ pub async fn update_build_status(conn: &mut sqlx::PgConnection, release_id: i32)
          FROM (
              SELECT
                r.id,
-               MAX(b.build_time) as last_build_time,
+               MAX(b.build_finished) as last_build_time,
                SUM(CASE WHEN b.build_status = 'success' THEN 1 ELSE 0 END) as success_count,
                SUM(CASE WHEN b.build_status = 'failure' THEN 1 ELSE 0 END) as failure_count
              FROM
@@ -257,7 +257,7 @@ pub(crate) async fn finish_build(
              build_server = $4,
              errors = $5,
              documentation_size = $6,
-             build_time = NOW()
+             build_finished = NOW()
          WHERE
             id = $7
          RETURNING rid",
@@ -348,8 +348,8 @@ pub(crate) async fn initialize_build(
     let hostname = hostname::get()?;
 
     let build_id = sqlx::query_scalar!(
-        "INSERT INTO builds(rid, build_status, build_server)
-         VALUES ($1, $2, $3)
+        "INSERT INTO builds(rid, build_status, build_server, build_started)
+         VALUES ($1, $2, $3, NOW())
          RETURNING id",
         release_id,
         BuildStatus::InProgress as BuildStatus,
@@ -628,6 +628,7 @@ mod test {
                 r#"SELECT
                 rustc_version,
                 docsrs_version,
+                build_started,
                 build_status as "build_status: BuildStatus",
                 errors
                 FROM builds
@@ -639,6 +640,7 @@ mod test {
 
             assert!(row.rustc_version.is_none());
             assert!(row.docsrs_version.is_none());
+            assert!(row.build_started.is_some());
             assert_eq!(row.build_status, BuildStatus::Failure);
             assert_eq!(row.errors, Some("error message".into()));
 

diff --git a/src/web/build_details.rs b/src/web/build_details.rs
@@ -72,7 +72,7 @@ pub(crate) async fn build_details_handler(
              builds.rustc_version,
              builds.docsrs_version,
              builds.build_status as "build_status: BuildStatus",
-             builds.build_time,
+             COALESCE(builds.build_finished, builds.build_started) as build_time,
              builds.output,
              builds.errors,
              releases.default_target
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE builds DROP COLUMN build_started;
		ALTER TABLE builds RENAME COLUMN build_finished TO build_time;