Simplify querying of statistical descriptions

Author: Kobzol

database/src/bin/import-sqlite.rs

@@ -1,4 +1,4 @@
-use database::{CompileBenchmark, Lookup, Pool};
+use database::{CompileBenchmark, Pool};
 use hashbrown::HashMap;
 use std::collections::HashSet;
 
@@ -45,7 +45,8 @@ async fn main() {
         let sqlite_aid = sqlite_conn.artifact_id(&aid).await;
         let postgres_aid = postgres_conn.artifact_id(&aid).await;
 
-        for &(benchmark, profile, scenario, metric) in sqlite_idx.all_statistic_descriptions() {
+        for (&(benchmark, profile, scenario, metric), id) in sqlite_idx.all_statistic_descriptions()
+        {
             if benchmarks.insert(benchmark) {
                 postgres_conn
                     .record_compile_benchmark(
@@ -56,15 +57,6 @@ async fn main() {
                     .await;
             }
 
-            let id = database::DbLabel::StatisticDescription {
-                benchmark,
-                profile,
-                scenario,
-                metric,
-            }
-            .lookup(&sqlite_idx)
-            .unwrap();
-
             let stat = sqlite_conn
                 .get_pstats(&[id], &[Some(sqlite_aid)])
                 .await

database/src/lib.rs

@@ -563,6 +563,8 @@ impl Lookup for ArtifactId {
     }
 }
 
+pub type StatisticalDescriptionId = u32;
+
 impl Index {
     pub async fn load(conn: &mut dyn pool::Connection) -> Index {
         conn.load_index().await
@@ -613,8 +615,16 @@ impl Index {
     // for it as keeping indices around would be annoying.
     pub fn all_statistic_descriptions(
         &self,
-    ) -> impl Iterator<Item = &'_ (Benchmark, Profile, Scenario, Metric)> + '_ {
-        self.pstat_series.map.keys()
+    ) -> impl Iterator<
+        Item = (
+            &(Benchmark, Profile, Scenario, Metric),
+            StatisticalDescriptionId,
+        ),
+    > + '_ {
+        self.pstat_series
+            .map
+            .iter()
+            .map(|(test_case, &row_id)| (test_case, row_id))
     }
 
     pub fn artifact_id_for_commit(&self, commit: &str) -> Option<ArtifactId> {

site/src/selector.rs

@@ -274,7 +274,7 @@ impl StatisticSeries {
         let index = ctxt.index.load();
         let mut statistic_descriptions = index
             .all_statistic_descriptions()
-            .filter(|&&(b, p, s, m)| {
+            .filter(|(&(b, p, s, m), _)| {
                 query.benchmark.matches(b)
                     && query.profile.matches(p)
                     && query.scenario.matches(s)
@@ -284,18 +284,7 @@ impl StatisticSeries {
 
         statistic_descriptions.sort_unstable();
 
-        let sids = statistic_descriptions
-            .iter()
-            .map(|&&(b, p, s, m)| {
-                let query = crate::db::DbLabel::StatisticDescription {
-                    benchmark: b,
-                    profile: p,
-                    scenario: s,
-                    metric: m,
-                };
-                query.lookup(&index).unwrap()
-            })
-            .collect::<Vec<_>>();
+        let sids: Vec<_> = statistic_descriptions.iter().map(|(_, sid)| *sid).collect();
         let aids = artifact_ids
             .iter()
             .map(|aid| aid.lookup(&index))
@@ -312,7 +301,7 @@ impl StatisticSeries {
             .into_iter()
             .zip(&statistic_descriptions)
             .filter(|(points, _)| points.iter().any(|value| value.is_some()))
-            .map(|(points, &&(benchmark, profile, scenario, metric))| {
+            .map(|(points, (&(benchmark, profile, scenario, metric), _))| {
                 SeriesResponse {
                     series: StatisticSeries {
                         artifact_ids: ArtifactIdIter::new(artifact_ids.clone()),