Rename InputData to SiteCtxt

Author: rylev

site/src/comparison.rs

@@ -4,7 +4,7 @@
 
 use crate::api;
 use crate::db::{self, ArtifactId, Cache, Crate, Profile};
-use crate::load::InputData;
+use crate::load::SiteCtxt;
 use crate::selector::{self, Tag};
 
 use collector::Bound;
@@ -18,7 +18,7 @@ type BoxedError = Box<dyn Error + Send + Sync>;
 
 pub async fn handle_triage(
     body: api::triage::Request,
-    data: &InputData,
+    data: &SiteCtxt,
 ) -> Result<api::triage::Response, BoxedError> {
     let start = body.start;
     let end = body.end;
@@ -84,7 +84,7 @@ pub async fn handle_triage(
 
 pub async fn handle_compare(
     body: api::comparison::Request,
-    data: &InputData,
+    data: &SiteCtxt,
 ) -> Result<api::comparison::Response, BoxedError> {
     let master_commits = collector::master_commits().await?;
     let end = body.end;
@@ -241,7 +241,7 @@ pub async fn compare(
     start: Bound,
     end: Bound,
     stat: String,
-    data: &InputData,
+    data: &SiteCtxt,
 ) -> Result<Option<Comparison>, BoxedError> {
     let master_commits = collector::master_commits().await?;
     compare_given_commits(start, end, stat, data, &master_commits).await
@@ -252,7 +252,7 @@ pub async fn compare_given_commits(
     start: Bound,
     end: Bound,
     stat: String,
-    data: &InputData,
+    data: &SiteCtxt,
     master_commits: &[collector::MasterCommit],
 ) -> Result<Option<Comparison>, BoxedError> {
     let a = data

site/src/github.rs

@@ -1,6 +1,6 @@
 use crate::api::{github, ServerResult};
 use crate::comparison::{ComparisonSummary, Direction};
-use crate::load::{Config, InputData, TryCommit};
+use crate::load::{Config, SiteCtxt, TryCommit};
 use anyhow::Context as _;
 use hashbrown::HashSet;
 use serde::Deserialize;
@@ -39,7 +39,7 @@ async fn get_authorized_users() -> ServerResult<Vec<usize>> {
 
 pub async fn handle_github(
     request: github::Request,
-    data: Arc<InputData>,
+    data: Arc<SiteCtxt>,
 ) -> ServerResult<github::Response> {
     if request.comment.body.contains(" homu: ") {
         if let Some(sha) = handle_homu_res(&request).await {
@@ -152,7 +152,7 @@ pub async fn handle_github(
 // Returns the PR number
 async fn pr_and_try_for_rollup(
     client: &reqwest::Client,
-    data: Arc<InputData>,
+    data: Arc<SiteCtxt>,
     repository_url: &str,
     rollup_merge_sha: &str,
     origin_url: &str,
@@ -231,7 +231,7 @@ struct RollupBranch {
 
 async fn branch_for_rollup(
     client: &reqwest::Client,
-    data: &InputData,
+    data: &SiteCtxt,
     repository_url: &str,
     rollup_merge_sha: &str,
 ) -> anyhow::Result<RollupBranch> {
@@ -328,7 +328,7 @@ struct CreateRefRequest<'a> {
 
 pub async fn create_ref(
     client: &reqwest::Client,
-    data: &InputData,
+    data: &SiteCtxt,
     repository_url: &str,
     ref_: &str,
     sha: &str,
@@ -375,7 +375,7 @@ pub struct CreatePrResponse {
 
 pub async fn create_pr(
     client: &reqwest::Client,
-    data: &InputData,
+    data: &SiteCtxt,
     repository_url: &str,
     title: &str,
     head: &str,
@@ -423,7 +423,7 @@ struct CreateCommitResponse {
 
 pub async fn create_commit(
     client: &reqwest::Client,
-    data: &InputData,
+    data: &SiteCtxt,
     repository_url: &str,
     message: &str,
     tree: &str,
@@ -461,7 +461,7 @@ pub async fn create_commit(
 
 pub async fn get_commit(
     client: &reqwest::Client,
-    data: &InputData,
+    data: &SiteCtxt,
     repository_url: &str,
     sha: &str,
 ) -> anyhow::Result<github::Commit> {
@@ -497,7 +497,7 @@ pub async fn get_commit(
 
 async fn enqueue_sha(
     request: github::Request,
-    data: &InputData,
+    data: &SiteCtxt,
     commit: String,
 ) -> ServerResult<github::Response> {
     let client = reqwest::Client::new();
@@ -592,7 +592,7 @@ where
     }
 }
 
-pub async fn post_finished(data: &InputData) {
+pub async fn post_finished(data: &SiteCtxt) {
     // If the github token is not configured, do not run this -- we don't want
     // to mark things as complete without posting the comment.
     if data.config.keys.github.is_none() {
@@ -681,7 +681,7 @@ for rolling up. {}
 
 async fn categorize_benchmark(
     commit: &database::QueuedCommit,
-    data: &InputData,
+    data: &SiteCtxt,
 ) -> (String, Option<Direction>) {
     let comparison = match crate::comparison::compare(
         collector::Bound::Commit(commit.parent_sha.clone()),

site/src/load.rs

@@ -82,7 +82,7 @@ pub struct Config {
 }
 
 /// Site context object that contains global data
-pub struct InputData {
+pub struct SiteCtxt {
     /// Site configuration
     pub config: Config,
     /// Cached site landing page
@@ -93,7 +93,7 @@ pub struct InputData {
     pub pool: Pool,
 }
 
-impl InputData {
+impl SiteCtxt {
     pub fn summary_patches(&self) -> Vec<crate::db::Cache> {
         vec![
             crate::db::Cache::Empty,
@@ -111,9 +111,9 @@ impl InputData {
         crate::selector::range_subset(self.index.load().commits(), range)
     }
 
-    /// Initialize `InputData from the file system.
-    pub async fn from_fs(db: &str) -> anyhow::Result<InputData> {
-        if Path::new(db).join("times").exists() {
+    /// Initialize `SiteCtxt` from database url
+    pub async fn from_db_url(db_url: &str) -> anyhow::Result<Self> {
+        if Path::new(db_url).join("times").exists() {
             eprintln!("It looks like you're running the site off of the old data format");
             eprintln!(
                 "Please utilize the ingest-json script to convert the data into the new database format."
@@ -125,7 +125,7 @@ impl InputData {
             std::process::exit(1);
         }
 
-        let pool = Pool::open(db);
+        let pool = Pool::open(db_url);
 
         let mut conn = pool.connection().await;
         let index = db::Index::load(&mut *conn).await;
@@ -141,7 +141,7 @@ impl InputData {
             }
         };
 
-        Ok(InputData {
+        Ok(Self {
             config,
             index: ArcSwap::new(Arc::new(index)),
             pool,

site/src/main.rs

@@ -26,7 +26,7 @@ async fn main() {
     #[cfg(unix)]
     let _ = jemalloc_ctl::background_thread::write(true);
 
-    let data: Arc<RwLock<Option<Arc<load::InputData>>>> = Arc::new(RwLock::new(None));
+    let data: Arc<RwLock<Option<Arc<load::SiteCtxt>>>> = Arc::new(RwLock::new(None));
     let data_ = data.clone();
     let db_url = env::var("DATABASE_URL")
         .ok()
@@ -37,7 +37,7 @@ async fn main() {
         });
     let fut = tokio::task::spawn_blocking(move || {
         tokio::task::spawn(async move {
-            let res = Arc::new(load::InputData::from_fs(&db_url).await.unwrap());
+            let res = Arc::new(load::SiteCtxt::from_db_url(&db_url).await.unwrap());
             *data_.write() = Some(res.clone());
             let commits = res.index.load().commits().len();
             let artifacts = res.index.load().artifacts().count();

site/src/selector.rs

@@ -24,7 +24,7 @@
 
 use crate::db::{ArtifactId, Cache, Profile};
 use crate::interpolate::Interpolate;
-use crate::load::InputData as Db;
+use crate::load::SiteCtxt as Db;
 use async_trait::async_trait;
 use collector::Bound;
 use database::{Commit, Crate, Index, Lookup, ProcessStatistic, QueryLabel};

site/src/self_profile.rs

@@ -1,7 +1,7 @@
 //! This module handles self-profile "rich" APIs (e.g., chrome profiler JSON)
 //! generation from the raw artifacts on demand.
 
-use crate::load::InputData;
+use crate::load::SiteCtxt;
 use anyhow::Context;
 use bytes::Buf;
 use hyper::StatusCode;
@@ -67,7 +67,7 @@ impl fmt::Debug for Pieces {
 
 pub async fn get_pieces(
     body: crate::api::self_profile_raw::Request,
-    data: &InputData,
+    data: &SiteCtxt,
 ) -> Result<Pieces, Response> {
     let res = crate::server::handle_self_profile_raw(body, data).await;
     let url = match res {