move StatisticSeries to database crate

Author: s7tya

database/src/lib.rs

@@ -6,6 +6,7 @@ use serde::{Deserialize, Serialize};
 use std::fmt;
 use std::hash;
 use std::ops::{Add, Sub};
+use std::sync::Arc;
 use std::time::Duration;
 
 pub mod pool;
@@ -432,6 +433,34 @@ intern!(pub struct QueryLabel);
 #[derive(Serialize, Deserialize, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
 pub struct ArtifactIdNumber(pub u32);
 
+#[derive(Debug)]
+pub struct ArtifactIdIter {
+    ids: Arc<Vec<ArtifactId>>,
+    idx: usize,
+}
+
+impl ArtifactIdIter {
+    pub fn new(artifact_ids: Arc<Vec<ArtifactId>>) -> ArtifactIdIter {
+        ArtifactIdIter {
+            ids: artifact_ids,
+            idx: 0,
+        }
+    }
+}
+
+impl Iterator for ArtifactIdIter {
+    type Item = ArtifactId;
+    fn next(&mut self) -> Option<Self::Item> {
+        let r = self.ids.get(self.idx)?;
+        self.idx += 1;
+        Some(r.clone())
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.ids.len(), Some(self.ids.len()))
+    }
+}
+
 /// Cached Id lookups for many database tables.
 ///
 /// This is a quick way to find what the database id for something.

database/src/selector.rs

@@ -3,7 +3,7 @@ use std::fmt;
 use chrono::NaiveDate;
 use serde::Deserialize;
 
-use crate::Commit;
+use crate::{ArtifactId, ArtifactIdIter, Commit};
 
 /// The bound for finding an artifact
 ///
@@ -92,3 +92,20 @@ impl<'de> Deserialize<'de> for Bound {
         deserializer.deserialize_str(BoundVisitor)
     }
 }
+
+#[derive(Debug)]
+pub struct StatisticSeries {
+    pub artifact_ids: ArtifactIdIter,
+    pub points: std::vec::IntoIter<Option<f64>>,
+}
+
+impl Iterator for StatisticSeries {
+    type Item = (ArtifactId, Option<f64>);
+    fn next(&mut self) -> Option<Self::Item> {
+        Some((self.artifact_ids.next()?, self.points.next().unwrap()))
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.artifact_ids.size_hint()
+    }
+}

site/src/selector.rs

@@ -25,6 +25,8 @@ use crate::db::{ArtifactId, Profile, Scenario};
 use crate::interpolate::Interpolate;
 use crate::load::SiteCtxt;
 
+use database::selector::StatisticSeries;
+use database::ArtifactIdIter;
 use database::{selector::Bound, Benchmark, CodegenBackend, Commit, Connection, Index, Lookup};
 
 use crate::comparison::Metric;
@@ -85,34 +87,6 @@ pub fn range_subset(data: Vec<Commit>, range: RangeInclusive<Bound>) -> Vec<Comm
     }
 }
 
-#[derive(Debug)]
-struct ArtifactIdIter {
-    ids: Arc<Vec<ArtifactId>>,
-    idx: usize,
-}
-
-impl ArtifactIdIter {
-    fn new(artifact_ids: Arc<Vec<ArtifactId>>) -> ArtifactIdIter {
-        ArtifactIdIter {
-            ids: artifact_ids,
-            idx: 0,
-        }
-    }
-}
-
-impl Iterator for ArtifactIdIter {
-    type Item = ArtifactId;
-    fn next(&mut self) -> Option<Self::Item> {
-        let r = self.ids.get(self.idx)?;
-        self.idx += 1;
-        Some(r.clone())
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (self.ids.len(), Some(self.ids.len()))
-    }
-}
-
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum Selector<T> {
     All,
@@ -424,13 +398,15 @@ impl SiteCtxt {
     }
 }
 
-#[derive(Debug)]
-pub struct StatisticSeries {
-    artifact_ids: ArtifactIdIter,
-    points: std::vec::IntoIter<Option<f64>>,
+trait StatisticSeriesExt {
+    async fn execute_query<Q: BenchmarkQuery>(
+        artifact_ids: Arc<Vec<ArtifactId>>,
+        ctxt: &SiteCtxt,
+        query: Q,
+    ) -> Result<Vec<SeriesResponse<Q::TestCase, StatisticSeries>>, String>;
 }
 
-impl StatisticSeries {
+impl StatisticSeriesExt for StatisticSeries {
     async fn execute_query<Q: BenchmarkQuery>(
         artifact_ids: Arc<Vec<ArtifactId>>,
         ctxt: &SiteCtxt,
@@ -452,14 +428,3 @@ impl StatisticSeries {
         Ok(result)
     }
 }
-
-impl Iterator for StatisticSeries {
-    type Item = (ArtifactId, Option<f64>);
-    fn next(&mut self) -> Option<Self::Item> {
-        Some((self.artifact_ids.next()?, self.points.next().unwrap()))
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.artifact_ids.size_hint()
-    }
-}