Skip to content

prevent race conditions when initializing crate record in DB #2482

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
Apr 17, 2024
Merged

prevent race conditions when initializing crate record in DB #2482

Show file tree
Hide file tree
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
22 changes: 22 additions & 0 deletions .sqlx/query-2c1f393f0c38c013c99629b5f0d3611c5153730091dd5488e2ef21b495942b93.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 0 additions & 22 deletions .sqlx/query-7be4a44a1336e41023eca9b313d23adcafaeaeeb39322c565e59f3c4af79ca56.json
View file
Open in desktop

This file was deleted.

54 changes: 18 additions & 36 deletions src/db/add_package.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pub(crate) async fn add_package_into_database(
archive_storage: bool,
) -> Result<i32> {
debug!("Adding package into database");
let crate_id = initialize_package_in_database(conn, metadata_pkg).await?;
let crate_id = initialize_crate(conn, &metadata_pkg.name).await?;
let dependencies = convert_dependencies(metadata_pkg);
let rustdoc = get_rustdoc(metadata_pkg, source_dir).unwrap_or(None);
let readme = get_readme(metadata_pkg, source_dir).unwrap_or(None);
Expand Down Expand Up @@ -261,24 +261,19 @@ pub(crate) async fn add_build_into_database(
Ok(build_id)
}

async fn initialize_package_in_database(
conn: &mut sqlx::PgConnection,
pkg: &MetadataPackage,
) -> Result<i32> {
if let Some(id) = sqlx::query_scalar!("SELECT id FROM crates WHERE name = $1", pkg.name)
.fetch_optional(&mut *conn)
.await?
{
Ok(id)
} else {
// insert crate into database if it is not exists
Ok(sqlx::query_scalar!(
"INSERT INTO crates (name) VALUES ($1) RETURNING id",
pkg.name,
)
.fetch_one(&mut *conn)
.await?)
}
pub(crate) async fn initialize_crate(conn: &mut sqlx::PgConnection, name: &str) -> Result<i32> {
sqlx::query_scalar!(
"INSERT INTO crates (name)
VALUES ($1)
ON CONFLICT (name) DO UPDATE
SET -- this `SET` is needed so the id is always returned.
name = EXCLUDED.name
RETURNING id",
name
)
.fetch_one(&mut *conn)
.await
.map_err(Into::into)
}

/// Convert dependencies into Vec<(String, String, String, bool)>
Expand Down Expand Up @@ -526,7 +521,7 @@ where
mod test {
use super::*;
use crate::test::*;
use crate::utils::{CargoMetadata, MetadataPackage};
use crate::utils::CargoMetadata;
use test_case::test_case;

#[test]
Expand Down Expand Up @@ -647,13 +642,7 @@ mod test {
async_wrapper(|env| async move {
let mut conn = env.async_db().await.async_conn().await;

let crate_id = initialize_package_in_database(
&mut conn,
&MetadataPackage {
..Default::default()
},
)
.await?;
let crate_id = initialize_crate(&mut conn, "").await?;

let owner1 = CrateOwner {
avatar: "avatar".into(),
Expand Down Expand Up @@ -691,8 +680,7 @@ mod test {
fn update_owner_detais() {
async_wrapper(|env| async move {
let mut conn = env.async_db().await.async_conn().await;
let crate_id =
initialize_package_in_database(&mut conn, &MetadataPackage::default()).await?;
let crate_id = initialize_crate(&mut conn, "").await?;

// set initial owner details
update_owners_in_database(
Expand Down Expand Up @@ -737,13 +725,7 @@ mod test {
fn add_new_owners_and_delete_old() {
async_wrapper(|env| async move {
let mut conn = env.async_db().await.async_conn().await;
let crate_id = initialize_package_in_database(
&mut conn,
&MetadataPackage {
..Default::default()
},
)
.await?;
let crate_id = initialize_crate(&mut conn, "").await?;

// set initial owner details
update_owners_in_database(
Expand Down
Loading