Fix SQLite/Postgres conversion binaries

Author: Kobzol

database/src/bin/postgres-to-sqlite.rs

@@ -191,12 +191,12 @@ impl Table for Error {
     }
 
     fn postgres_select_statement(&self, since_weeks_ago: Option<u32>) -> String {
-        let s = "select series, aid, error from ".to_string() + self.name();
+        let s = "select benchmark, aid, error from ".to_string() + self.name();
         with_filter_clause_maybe(s, ARTIFACT_JOIN_AND_WHERE, since_weeks_ago)
     }
 
     fn sqlite_insert_statement(&self) -> &'static str {
-        "insert into error (series, aid, error) VALUES (?, ?, ?)"
+        "insert into error (benchmark, aid, error) VALUES (?, ?, ?)"
     }
 
     fn sqlite_execute_insert(&self, statement: &mut rusqlite::Statement, row: tokio_postgres::Row) {
@@ -210,28 +210,6 @@ impl Table for Error {
     }
 }
 
-struct ErrorSeries;
-
-impl Table for ErrorSeries {
-    fn name(&self) -> &'static str {
-        "error_series"
-    }
-
-    fn postgres_select_statement(&self, _since_weeks_ago: Option<u32>) -> String {
-        "select id, crate from ".to_string() + self.name()
-    }
-
-    fn sqlite_insert_statement(&self) -> &'static str {
-        "insert into error_series (id, crate) VALUES (?, ?)"
-    }
-
-    fn sqlite_execute_insert(&self, statement: &mut rusqlite::Statement, row: tokio_postgres::Row) {
-        statement
-            .execute(params![row.get::<_, i32>(0), row.get::<_, &str>(1)])
-            .unwrap();
-    }
-}
-
 struct Pstat;
 
 impl Table for Pstat {
@@ -450,7 +428,6 @@ async fn main() -> anyhow::Result<()> {
         &Benchmark,
         &Collection,
         &CollectorProgress,
-        &ErrorSeries,
         &Error,
         &PstatSeries,
         &Pstat,

database/src/bin/sqlite-to-postgres.rs

@@ -218,7 +218,7 @@ struct Error;
 
 #[derive(Serialize)]
 struct ErrorRow<'a> {
-    series: i32,
+    benchmark: &'a str,
     aid: i32,
     error: Nullable<&'a str>,
 }
@@ -229,7 +229,7 @@ impl Table for Error {
     }
 
     fn sqlite_attributes() -> &'static str {
-        "series, aid, error"
+        "benchmark, aid, error"
     }
 
     fn postgres_generated_id_attribute() -> Option<&'static str> {
@@ -239,45 +239,14 @@ impl Table for Error {
     fn write_postgres_csv_row<W: Write>(writer: &mut csv::Writer<W>, row: &rusqlite::Row) {
         writer
             .serialize(ErrorRow {
-                series: row.get(0).unwrap(),
+                benchmark: row.get_ref(0).unwrap().as_str().unwrap(),
                 aid: row.get(1).unwrap(),
                 error: row.get_ref(2).unwrap().try_into().unwrap(),
             })
             .unwrap();
     }
 }
 
-struct ErrorSeries;
-
-#[derive(Serialize)]
-struct ErrorSeriesRow<'a> {
-    id: i32,
-    krate: &'a str,
-}
-
-impl Table for ErrorSeries {
-    fn name() -> &'static str {
-        "error_series"
-    }
-
-    fn sqlite_attributes() -> &'static str {
-        "id, crate"
-    }
-
-    fn postgres_generated_id_attribute() -> Option<&'static str> {
-        Some("id")
-    }
-
-    fn write_postgres_csv_row<W: Write>(writer: &mut csv::Writer<W>, row: &rusqlite::Row) {
-        writer
-            .serialize(ErrorSeriesRow {
-                id: row.get(0).unwrap(),
-                krate: row.get_ref(1).unwrap().as_str().unwrap(),
-            })
-            .unwrap();
-    }
-}
-
 struct Pstat;
 
 #[derive(Serialize)]
@@ -664,7 +633,6 @@ async fn main() -> anyhow::Result<()> {
     copy::<Benchmark>(&sqlite_tx, &postgres_tx).await;
     copy::<Collection>(&sqlite_tx, &postgres_tx).await;
     copy::<CollectorProgress>(&sqlite_tx, &postgres_tx).await;
-    copy::<ErrorSeries>(&sqlite_tx, &postgres_tx).await;
     copy::<Error>(&sqlite_tx, &postgres_tx).await;
     copy::<PstatSeries>(&sqlite_tx, &postgres_tx).await;
     copy::<Pstat>(&sqlite_tx, &postgres_tx).await;