Skip to content

controllers/summary: Read downloads from crate_downloads table #8249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 6, 2024
Merged

controllers/summary: Read downloads from crate_downloads table #8249

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions src/controllers/summary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::app::AppState;
use crate::controllers::cargo_prelude::AppResult;
use crate::models::{Category, Crate, CrateVersions, Keyword, TopVersions, Version};
use crate::schema::{crates, keywords, metadata, recent_crate_downloads};
use crate::schema::{crate_downloads, crates, keywords, metadata, recent_crate_downloads};
use crate::tasks::spawn_blocking;
use crate::views::{EncodableCategory, EncodableCrate, EncodableKeyword};
use axum::Json;
Expand All @@ -21,45 +21,50 @@ pub async fn summary(state: AppState) -> AppResult<Json<Value>> {

fn encode_crates(
conn: &mut PgConnection,
data: Vec<(Crate, Option<i64>)>,
data: Vec<(Crate, i64, Option<i64>)>,
) -> AppResult<Vec<EncodableCrate>> {
let recent_downloads = data.iter().map(|&(_, s)| s).collect::<Vec<_>>();
let downloads = data
.iter()
.map(|&(_, total, recent)| (total, recent))
.collect::<Vec<_>>();

let krates = data.into_iter().map(|(c, _)| c).collect::<Vec<_>>();
let krates = data.into_iter().map(|(c, _, _)| c).collect::<Vec<_>>();

let versions: Vec<Version> = krates.versions().load(conn)?;
versions
.grouped_by(&krates)
.into_iter()
.map(TopVersions::from_versions)
.zip(krates)
.zip(recent_downloads)
.map(|((top_versions, krate), recent_downloads)| {
let downloads = krate.downloads as i64;
.zip(downloads)
.map(|((top_versions, krate), (total, recent))| {
Ok(EncodableCrate::from_minimal(
krate,
Some(&top_versions),
None,
false,
downloads,
recent_downloads,
total,
recent,
))
})
.collect()
}

let selection = (
Crate::as_select(),
crate_downloads::downloads,
recent_crate_downloads::downloads.nullable(),
);

let new_crates = crates::table
.inner_join(crate_downloads::table)
.left_join(recent_crate_downloads::table)
.order(crates::created_at.desc())
.select(selection)
.limit(10)
.load(conn)?;
let just_updated = crates::table
.inner_join(crate_downloads::table)
.left_join(recent_crate_downloads::table)
.filter(crates::updated_at.ne(crates::created_at))
.order(crates::updated_at.desc())
Expand All @@ -68,19 +73,21 @@ pub async fn summary(state: AppState) -> AppResult<Json<Value>> {
.load(conn)?;

let mut most_downloaded_query = crates::table
.inner_join(crate_downloads::table)
.left_join(recent_crate_downloads::table)
.into_boxed();
if !config.excluded_crate_names.is_empty() {
most_downloaded_query =
most_downloaded_query.filter(crates::name.ne_all(&config.excluded_crate_names));
}
let most_downloaded = most_downloaded_query
.then_order_by(crates::downloads.desc())
.then_order_by(crate_downloads::downloads.desc())
.select(selection)
.limit(10)
.load(conn)?;

let mut most_recently_downloaded_query = crates::table
.inner_join(crate_downloads::table)
.inner_join(recent_crate_downloads::table)
.into_boxed();
if !config.excluded_crate_names.is_empty() {
Expand Down