Merge pull request #9869 from Turbo87/deps

Remove `spawn_blocking()` call from `GET /crates/:crate_id/:version/dependencies` endpoint

Author: Turbo87

src/controllers/version/metadata.rs

@@ -6,10 +6,8 @@
 
 use axum::extract::Path;
 use axum::Json;
+use crates_io_database::schema::{crates, dependencies};
 use crates_io_worker::BackgroundJob;
-use diesel::{
-    BoolExpressionMethods, ExpressionMethods, PgExpressionMethods, QueryDsl, RunQueryDsl,
-};
 use diesel_async::async_connection_wrapper::AsyncConnectionWrapper;
 use http::request::Parts;
 use http::StatusCode;
@@ -21,11 +19,13 @@ use crate::app::AppState;
 use crate::auth::AuthCheck;
 use crate::models::token::EndpointScope;
 use crate::models::{
-    insert_version_owner_action, Crate, Rights, Version, VersionAction, VersionOwnerAction,
+    insert_version_owner_action, Crate, Dependency, Rights, Version, VersionAction,
+    VersionOwnerAction,
 };
 use crate::rate_limiter::LimitedAction;
 use crate::schema::versions;
 use crate::tasks::spawn_blocking;
+use crate::util::diesel::prelude::*;
 use crate::util::diesel::Conn;
 use crate::util::errors::{bad_request, custom, version_not_found, AppResult};
 use crate::views::{EncodableDependency, EncodableVersion};
@@ -54,24 +54,26 @@ pub async fn dependencies(
     state: AppState,
     Path((crate_name, version)): Path<(String, String)>,
 ) -> AppResult<Json<Value>> {
+    use diesel_async::RunQueryDsl;
+
     if semver::Version::parse(&version).is_err() {
         return Err(version_not_found(&crate_name, &version));
     }
 
     let mut conn = state.db_read().await?;
     let (version, _) = version_and_crate(&mut conn, &crate_name, &version).await?;
-    spawn_blocking(move || {
-        let conn: &mut AsyncConnectionWrapper<_> = &mut conn.into();
 
-        let deps = version.dependencies(conn)?;
-        let deps = deps
-            .into_iter()
-            .map(|(dep, crate_name)| EncodableDependency::from_dep(dep, &crate_name))
-            .collect::<Vec<_>>();
-
-        Ok(Json(json!({ "dependencies": deps })))
-    })
-    .await
+    let deps = Dependency::belonging_to(&version)
+        .inner_join(crates::table)
+        .select((Dependency::as_select(), crates::name))
+        .order((dependencies::optional, crates::name))
+        .load::<(Dependency, String)>(&mut conn)
+        .await?
+        .into_iter()
+        .map(|(dep, crate_name)| EncodableDependency::from_dep(dep, &crate_name))
+        .collect::<Vec<_>>();
+
+    Ok(Json(json!({ "dependencies": deps })))
 }
 
 /// Handles the `GET /crates/:crate_id/:version/authors` route.
@@ -173,6 +175,8 @@ pub fn perform_version_yank_update(
     yanked: Option<bool>,
     yank_message: Option<String>,
 ) -> AppResult<()> {
+    use diesel::RunQueryDsl;
+
     let auth = AuthCheck::default()
         .with_endpoint_scope(EndpointScope::Yank)
         .for_crate(&krate.name)

src/models/version.rs

@@ -5,7 +5,7 @@ use chrono::NaiveDateTime;
 use crates_io_index::features::FeaturesMap;
 use serde::Deserialize;
 
-use crate::models::{Crate, Dependency, User};
+use crate::models::{Crate, User};
 use crate::schema::*;
 use crate::util::diesel::prelude::*;
 use crate::util::diesel::Conn;
@@ -35,17 +35,6 @@ pub struct Version {
 }
 
 impl Version {
-    /// Returns (dependency, crate dependency name)
-    pub fn dependencies(&self, conn: &mut impl Conn) -> QueryResult<Vec<(Dependency, String)>> {
-        use diesel::RunQueryDsl;
-
-        Dependency::belonging_to(self)
-            .inner_join(crates::table)
-            .select((Dependency::as_select(), crates::name))
-            .order((dependencies::optional, crates::name))
-            .load(conn)
-    }
-
     pub fn record_readme_rendering(version_id: i32, conn: &mut impl Conn) -> QueryResult<usize> {
         use diesel::dsl::now;
         use diesel::RunQueryDsl;