Send benchmark data (currently category) from DB to the compare site

Author: Kobzol

database/src/lib.rs

@@ -763,3 +763,9 @@ impl fmt::Display for CollectionId {
         write!(f, "{}", self.0)
     }
 }
+
+#[derive(Debug, Clone, Serialize)]
+pub struct BenchmarkData {
+    name: String,
+    category: String
+}

database/src/pool.rs

@@ -1,4 +1,4 @@
-use crate::{ArtifactId, ArtifactIdNumber};
+use crate::{ArtifactId, ArtifactIdNumber, BenchmarkData};
 use crate::{CollectionId, Index, Profile, QueryDatum, QueuedCommit, Scenario, Step};
 use chrono::{DateTime, Utc};
 use hashbrown::HashMap;
@@ -15,6 +15,7 @@ pub trait Connection: Send + Sync {
     async fn transaction(&mut self) -> Box<dyn Transaction + '_>;
 
     async fn load_index(&mut self) -> Index;
+    async fn get_benchmarks(&self) -> Vec<BenchmarkData>;
 
     async fn artifact_by_name(&self, artifact: &str) -> Option<ArtifactId>;
 

database/src/pool/postgres.rs

@@ -1,8 +1,5 @@
 use crate::pool::{Connection, ConnectionManager, ManagedConnection, Transaction};
-use crate::{
-    ArtifactId, ArtifactIdNumber, Benchmark, CollectionId, Commit, Date, Index, Profile,
-    QueuedCommit, Scenario,
-};
+use crate::{ArtifactId, ArtifactIdNumber, Benchmark, BenchmarkData, CollectionId, Commit, Date, Index, Profile, QueuedCommit, Scenario};
 use anyhow::Context as _;
 use chrono::{DateTime, TimeZone, Utc};
 use hashbrown::HashMap;
@@ -282,6 +279,7 @@ pub struct CachedStatements {
     collection_id: Statement,
     record_duration: Statement,
     in_progress_steps: Statement,
+    get_benchmarks: Statement,
 }
 
 pub struct PostgresTransaction<'a> {
@@ -456,6 +454,10 @@ impl PostgresConnection {
                         ))::int4
                 from collector_progress where aid = $1 order by step
                 ").await.unwrap(),
+                get_benchmarks: conn.prepare("
+                    select name, category
+                    from benchmark
+                ").await.unwrap()
             }),
             conn,
         }
@@ -596,6 +598,23 @@ where
                 .collect(),
         }
     }
+    async fn get_benchmarks(&self) -> Vec<BenchmarkData> {
+        let rows = self.conn()
+            .query(&self.statements().get_benchmarks, &[])
+            .await
+            .unwrap();
+        rows.into_iter()
+            .map(|r| {
+                let name: String = r.get(0);
+                let category: String = r.get(1);
+                BenchmarkData {
+                    name,
+                    category
+                }
+            })
+            .collect()
+    }
+
     async fn get_pstats(
         &self,
         pstat_series_row_ids: &[u32],

database/src/pool/sqlite.rs

@@ -1,5 +1,5 @@
 use crate::pool::{Connection, ConnectionManager, ManagedConnection, Transaction};
-use crate::{ArtifactId, Benchmark, CollectionId, Commit, Date, Profile};
+use crate::{ArtifactId, Benchmark, BenchmarkData, CollectionId, Commit, Date, Profile};
 use crate::{ArtifactIdNumber, Index, QueryDatum, QueuedCommit};
 use chrono::{DateTime, TimeZone, Utc};
 use hashbrown::HashMap;
@@ -504,6 +504,20 @@ impl Connection for SqliteConnection {
         }
     }
 
+    async fn get_benchmarks(&self) -> Vec<BenchmarkData> {
+        let conn = self.raw_ref();
+        let mut query = conn.prepare_cached("select name, category from benchmark").unwrap();
+        let rows = query.query_map([], |row| Ok(BenchmarkData {
+            name: row.get(0)?,
+            category: row.get(1)?
+        })).unwrap();
+        let mut benchmarks = Vec::new();
+        for row in rows {
+            benchmarks.push(row.unwrap());
+        }
+        benchmarks
+    }
+
     async fn get_pstats(
         &self,
         series: &[u32],

site/src/api.rs

@@ -128,7 +128,7 @@ pub mod bootstrap {
 
 pub mod comparison {
     use collector::Bound;
-    use database::Date;
+    use database::{BenchmarkData, Date};
     use serde::{Deserialize, Serialize};
     use std::collections::HashMap;
 
@@ -156,6 +156,7 @@ pub mod comparison {
         /// If `a` and `b` are adjacent artifacts (i.e., `a` is the parent of
         /// `b`).
         pub is_contiguous: bool,
+        pub benchmark_data: Vec<BenchmarkData>,
     }
 
     #[derive(Debug, Clone, Serialize)]

site/src/comparison.rs

@@ -109,6 +109,8 @@ pub async fn handle_compare(
     let prev = comparison.prev(&master_commits);
     let next = comparison.next(&master_commits);
     let is_contiguous = comparison.is_contiguous(&*conn, &master_commits).await;
+    let benchmark_map = conn.get_benchmarks().await;
+
     let comparisons = comparison
         .statistics
         .into_iter()
@@ -135,6 +137,7 @@ pub async fn handle_compare(
         new_errors,
         next,
         is_contiguous,
+        benchmark_data: benchmark_map
     })
 }