Skip to content

Use ON CONFLICT DO UPDATE #744

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 4 commits into from
May 6, 2020
Merged

Use ON CONFLICT DO UPDATE #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f32d1a9
Used ON CONFLICT DO UPDATE and formatted a few queries
Kixiron May 4, 2020
144ba54
Forgot the DO UPDATE part
Kixiron May 4, 2020
995076e
Update src/utils/github_updater.rs
Kixiron May 6, 2020
51abeed
Changed github regex
Kixiron May 6, 2020
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
178 changes: 69 additions & 109 deletions src/db/add_package.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,116 +44,76 @@ pub(crate) fn add_package_into_database(
let readme = get_readme(metadata_pkg, source_dir).unwrap_or(None);
let is_library = metadata_pkg.is_library();

let release_id: i32 = {
let rows = conn.query(
"SELECT id FROM releases WHERE crate_id = $1 AND version = $2",
&[&crate_id, &metadata_pkg.version.to_string()],
)?;
let rows = conn.query(
"INSERT INTO releases (
crate_id, version, release_time,
dependencies, target_name, yanked, build_status,
rustdoc_status, test_status, license, repository_url,
homepage_url, description, description_long, readme,
authors, keywords, have_examples, downloads, files,
doc_targets, is_library, doc_rustc_version,
documentation_url, default_target
)
VALUES (
$1, $2, $3, $4, $5, $6, $7, $8, $9,
$10, $11, $12, $13, $14, $15, $16, $17, $18,
$19, $20, $21, $22, $23, $24, $25
)
ON CONFLICT (crate_id, version) DO UPDATE
SET release_time = $3,
dependencies = $4,
target_name = $5,
yanked = $6,
build_status = $7,
rustdoc_status = $8,
test_status = $9,
license = $10,
repository_url = $11,
homepage_url = $12,
description = $13,
description_long = $14,
readme = $15,
authors = $16,
keywords = $17,
have_examples = $18,
downloads = $19,
files = $20,
doc_targets = $21,
is_library = $22,
doc_rustc_version = $23,
documentation_url = $24,
default_target = $25
RETURNING id",
&[
&crate_id,
&metadata_pkg.version,
&cratesio_data.release_time,
&dependencies.to_json(),
&metadata_pkg.package_name(),
&cratesio_data.yanked,
&res.successful,
&has_docs,
&false, // TODO: Add test status somehow
&metadata_pkg.license,
&metadata_pkg.repository,
&metadata_pkg.homepage,
&metadata_pkg.description,
&rustdoc,
&readme,
&metadata_pkg.authors.to_json(),
&metadata_pkg.keywords.to_json(),
&has_examples,
&cratesio_data.downloads,
&source_files,
&doc_targets.to_json(),
&is_library,
&res.rustc_version,
&metadata_pkg.documentation,
&default_target,
],
)?;

if rows.is_empty() {
let rows = conn.query(
"INSERT INTO releases (
crate_id, version, release_time,
dependencies, target_name, yanked, build_status,
rustdoc_status, test_status, license, repository_url,
homepage_url, description, description_long, readme,
authors, keywords, have_examples, downloads, files,
doc_targets, is_library, doc_rustc_version,
documentation_url, default_target
)
VALUES ( $1, $2, $3, $4, $5, $6, $7, $8, $9, $10,
$11, $12, $13, $14, $15, $16, $17, $18, $19,
$20, $21, $22, $23, $24, $25
)
RETURNING id",
&[
&crate_id,
&metadata_pkg.version,
&cratesio_data.release_time,
&dependencies.to_json(),
&metadata_pkg.package_name(),
&cratesio_data.yanked,
&res.successful,
&has_docs,
&false, // TODO: Add test status somehow
&metadata_pkg.license,
&metadata_pkg.repository,
&metadata_pkg.homepage,
&metadata_pkg.description,
&rustdoc,
&readme,
&metadata_pkg.authors.to_json(),
&metadata_pkg.keywords.to_json(),
&has_examples,
&cratesio_data.downloads,
&source_files,
&doc_targets.to_json(),
&is_library,
&res.rustc_version,
&metadata_pkg.documentation,
&default_target,
],
)?;
// return id
rows.get(0).get(0)
} else {
conn.query(
"UPDATE releases
SET release_time = $3,
dependencies = $4,
target_name = $5,
yanked = $6,
build_status = $7,
rustdoc_status = $8,
test_status = $9,
license = $10,
repository_url = $11,
homepage_url = $12,
description = $13,
description_long = $14,
readme = $15,
authors = $16,
keywords = $17,
have_examples = $18,
downloads = $19,
files = $20,
doc_targets = $21,
is_library = $22,
doc_rustc_version = $23,
documentation_url = $24,
default_target = $25
WHERE crate_id = $1 AND version = $2",
&[
&crate_id,
&metadata_pkg.version.to_string(),
&cratesio_data.release_time,
&dependencies.to_json(),
&metadata_pkg.package_name(),
&cratesio_data.yanked,
&res.successful,
&has_docs,
&false, // TODO: Add test status somehow
&metadata_pkg.license,
&metadata_pkg.repository,
&metadata_pkg.homepage,
&metadata_pkg.description,
&rustdoc,
&readme,
&metadata_pkg.authors.to_json(),
&metadata_pkg.keywords.to_json(),
&has_examples,
&cratesio_data.downloads,
&source_files,
&doc_targets.to_json(),
&is_library,
&res.rustc_version,
&metadata_pkg.documentation,
&default_target,
],
)?;
rows.get(0).get(0)
}
};
let release_id: i32 = rows.get(0).get(0);

add_keywords_into_database(&conn, &metadata_pkg, release_id)?;
add_authors_into_database(&conn, &metadata_pkg, release_id)?;
Expand Down
27 changes: 14 additions & 13 deletions src/utils/github_updater.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ pub fn github_updater() -> Result<()> {
// always the same across all versions of a crate
for row in &conn.query(
"SELECT DISTINCT ON (crates.name)
crates.name,
crates.id,
releases.repository_url
FROM crates
INNER JOIN releases ON releases.crate_id = crates.id
WHERE releases.repository_url ~ '^https*://github.com' AND
(crates.github_last_update < NOW() - INTERVAL '1 day' OR
crates.github_last_update IS NULL)
ORDER BY crates.name, releases.release_time DESC",
crates.name,
crates.id,
releases.repository_url
FROM crates
INNER JOIN releases ON releases.crate_id = crates.id
WHERE releases.repository_url ~ '^https?://github.com' AND
(crates.github_last_update < NOW() - INTERVAL '1 day' OR
crates.github_last_update IS NULL)
ORDER BY crates.name, releases.release_time DESC",
&[],
)? {
let crate_name: String = row.get(0);
Expand All @@ -42,10 +42,11 @@ pub fn github_updater() -> Result<()> {
.and_then(|fields| {
conn.execute(
"UPDATE crates
SET github_description = $1,
github_stars = $2, github_forks = $3,
github_issues = $4, github_last_commit = $5,
github_last_update = NOW() WHERE id = $6",
SET github_description = $1,
github_stars = $2, github_forks = $3,
github_issues = $4, github_last_commit = $5,
github_last_update = NOW()
WHERE id = $6",
&[
&fields.description,
&(fields.stars as i32),
Expand Down
12 changes: 4 additions & 8 deletions src/utils/release_activity_updater.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,11 @@ pub fn update_release_activity() -> Result<()> {
};

conn.query(
"INSERT INTO config (name, value) VALUES ('release_activity', $1)",
"INSERT INTO config (name, value) VALUES ('release_activity', $1)
ON CONFLICT (name) DO UPDATE
SET value = $1 WHERE config.name = 'release_activity'",
&[&map],
)
.or_else(|_| {
conn.query(
"UPDATE config SET value = $1 WHERE name = 'release_activity'",
&[&map],
)
})?;
)?;

Ok(())
}
Expand Down
30 changes: 15 additions & 15 deletions src/web/builds.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,21 +74,21 @@ pub fn build_list_handler(req: &mut Request) -> IronResult<Response> {
// FIXME: getting builds.output may cause performance issues when release have tons of builds
for row in &ctry!(conn.query(
"SELECT crates.name,
releases.version,
releases.description,
releases.rustdoc_status,
releases.target_name,
builds.id,
builds.rustc_version,
builds.cratesfyi_version,
builds.build_status,
builds.build_time,
builds.output
FROM builds
INNER JOIN releases ON releases.id = builds.rid
INNER JOIN crates ON releases.crate_id = crates.id
WHERE crates.name = $1 AND releases.version = $2
ORDER BY id DESC",
releases.version,
releases.description,
releases.rustdoc_status,
releases.target_name,
builds.id,
builds.rustc_version,
builds.cratesfyi_version,
builds.build_status,
builds.build_time,
builds.output
FROM builds
INNER JOIN releases ON releases.id = builds.rid
INNER JOIN crates ON releases.crate_id = crates.id
WHERE crates.name = $1 AND releases.version = $2
ORDER BY id DESC",
&[&name, &version]
)) {
let id: i32 = row.get(5);
Expand Down
56 changes: 28 additions & 28 deletions src/web/crate_details.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,34 +113,34 @@ impl CrateDetails {
pub fn new(conn: &Connection, name: &str, version: &str) -> Option<CrateDetails> {
// get all stuff, I love you rustfmt
let query = "SELECT crates.id,
releases.id,
crates.name,
releases.version,
releases.description,
releases.authors,
releases.dependencies,
releases.readme,
releases.description_long,
releases.release_time,
releases.build_status,
releases.rustdoc_status,
releases.repository_url,
releases.homepage_url,
releases.keywords,
releases.have_examples,
releases.target_name,
crates.versions,
crates.github_stars,
crates.github_forks,
crates.github_issues,
releases.is_library,
releases.doc_targets,
releases.license,
releases.documentation_url,
releases.default_target
FROM releases
INNER JOIN crates ON releases.crate_id = crates.id
WHERE crates.name = $1 AND releases.version = $2;";
releases.id,
crates.name,
releases.version,
releases.description,
releases.authors,
releases.dependencies,
releases.readme,
releases.description_long,
releases.release_time,
releases.build_status,
releases.rustdoc_status,
releases.repository_url,
releases.homepage_url,
releases.keywords,
releases.have_examples,
releases.target_name,
crates.versions,
crates.github_stars,
crates.github_forks,
crates.github_issues,
releases.is_library,
releases.doc_targets,
releases.license,
releases.documentation_url,
releases.default_target
FROM releases
INNER JOIN crates ON releases.crate_id = crates.id
WHERE crates.name = $1 AND releases.version = $2;";

let rows = conn.query(query, &[&name, &version]).unwrap();

Expand Down