Skip to content

Commit

Permalink
Revert "Favor registry for queued crates"
Browse files Browse the repository at this point in the history 
This reverts commit 8687b7b.
  • Loading branch information
Joshua Nelson committed Oct 30, 2020
1 parent c276522 commit 7d81b24
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 61 deletions.
9 changes: 3 additions & 6 deletions src/bin/cratesfyi.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,12 +170,9 @@ impl QueueSubcommand {
crate_name,
crate_version,
build_priority,
} => ctx.build_queue()?.add_crate(
&crate_name,
&crate_version,
build_priority,
ctx.config()?.registry_url.as_deref(),
)?,
} => ctx
.build_queue()?
.add_crate(&crate_name, &crate_version, build_priority)?,

Self::DefaultPriority { subcommand } => subcommand.handle_args(ctx)?,
}
Expand Down
34 changes: 13 additions & 21 deletions src/build_queue.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ pub(crate) struct QueuedCrate {
pub(crate) name: String,
pub(crate) version: String,
pub(crate) priority: i32,
pub(crate) registry: Option<String>,
}

#[derive(Debug)]
Expand All @@ -30,16 +29,10 @@ impl BuildQueue {
}
}

pub fn add_crate(
&self,
name: &str,
version: &str,
priority: i32,
registry: Option<&str>,
) -> Result<()> {
pub fn add_crate(&self, name: &str, version: &str, priority: i32) -> Result<()> {
self.db.get()?.execute(
"INSERT INTO queue (name, version, priority, registry) VALUES ($1, $2, $3, $4);",
&[&name, &version, &priority, &registry],
"INSERT INTO queue (name, version, priority) VALUES ($1, $2, $3);",
&[&name, &version, &priority],
)?;
Ok(())
}
Expand Down Expand Up @@ -70,7 +63,7 @@ impl BuildQueue {

pub(crate) fn queued_crates(&self) -> Result<Vec<QueuedCrate>> {
let query = self.db.get()?.query(
"SELECT id, name, version, priority, registry
"SELECT id, name, version, priority
FROM queue
WHERE attempt < $1
ORDER BY priority ASC, attempt ASC, id ASC",
Expand All @@ -84,7 +77,6 @@ impl BuildQueue {
name: row.get("name"),
version: row.get("version"),
priority: row.get("priority"),
registry: row.get("registry"),
})
.collect())
}
Expand Down Expand Up @@ -157,7 +149,7 @@ mod tests {
("high-priority-baz", "1.0.0", -1000),
];
for krate in &test_crates {
queue.add_crate(krate.0, krate.1, krate.2, None)?;
queue.add_crate(krate.0, krate.1, krate.2)?;
}

let assert_next = |name| -> Result<()> {
Expand Down Expand Up @@ -222,9 +214,9 @@ mod tests {
let queue = env.build_queue();

assert_eq!(queue.pending_count()?, 0);
queue.add_crate("foo", "1.0.0", 0, None)?;
queue.add_crate("foo", "1.0.0", 0)?;
assert_eq!(queue.pending_count()?, 1);
queue.add_crate("bar", "1.0.0", 0, None)?;
queue.add_crate("bar", "1.0.0", 0)?;
assert_eq!(queue.pending_count()?, 2);

queue.process_next_crate(|krate| {
Expand All @@ -243,11 +235,11 @@ mod tests {
let queue = env.build_queue();

assert_eq!(queue.prioritized_count()?, 0);
queue.add_crate("foo", "1.0.0", 0, None)?;
queue.add_crate("foo", "1.0.0", 0)?;
assert_eq!(queue.prioritized_count()?, 1);
queue.add_crate("bar", "1.0.0", -100, None)?;
queue.add_crate("bar", "1.0.0", -100)?;
assert_eq!(queue.prioritized_count()?, 2);
queue.add_crate("baz", "1.0.0", 100, None)?;
queue.add_crate("baz", "1.0.0", 100)?;
assert_eq!(queue.prioritized_count()?, 2);

queue.process_next_crate(|krate| {
Expand All @@ -270,9 +262,9 @@ mod tests {
let queue = env.build_queue();

assert_eq!(queue.failed_count()?, 0);
queue.add_crate("foo", "1.0.0", -100, None)?;
queue.add_crate("foo", "1.0.0", -100)?;
assert_eq!(queue.failed_count()?, 0);
queue.add_crate("bar", "1.0.0", 0, None)?;
queue.add_crate("bar", "1.0.0", 0)?;

for _ in 0..MAX_ATTEMPTS {
assert_eq!(queue.failed_count()?, 0);
Expand Down Expand Up @@ -304,7 +296,7 @@ mod tests {
("baz", "1.0.0", 10),
];
for krate in &test_crates {
queue.add_crate(krate.0, krate.1, krate.2, None)?;
queue.add_crate(krate.0, krate.1, krate.2)?;
}

assert_eq!(
Expand Down
14 changes: 0 additions & 14 deletions src/db/migrate.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,20 +475,6 @@ pub fn migrate(version: Option<Version>, conn: &mut Client) -> CratesfyiResult<(
DROP TYPE feature;
"
),
migration!(
context,
20,
// description
"Support alternative registries",
// upgrade query
"
ALTER TABLE queue ADD COLUMN registry TEXT DEFAULT NULL;
",
// downgrade query
"
ALTER TABLE queue DROP COLUMN registry;
"
)
];

for migration in migrations {
Expand Down
18 changes: 5 additions & 13 deletions src/docbuilder/queue.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,10 @@ impl DocBuilder {
ChangeKind::Added => {
let priority = get_crate_priority(&mut conn, &krate.name)?;

match self.build_queue.add_crate(
&krate.name,
&krate.version,
priority,
index.repository_url(),
) {
match self
.build_queue
.add_crate(&krate.name, &krate.version, priority)
{
Ok(()) => {
debug!("{}-{} added into build queue", krate.name, krate.version);
crates_added += 1;
Expand Down Expand Up @@ -81,13 +79,7 @@ impl DocBuilder {
queue.process_next_crate(|krate| {
processed = true;

let kind = krate
.registry
.as_ref()
.map(|r| PackageKind::Registry(r.as_str()))
.unwrap_or(PackageKind::CratesIo);

builder.build_package(&krate.name, &krate.version, kind)?;
builder.build_package(&krate.name, &krate.version, PackageKind::CratesIo)?;
Ok(())
})?;

Expand Down
4 changes: 0 additions & 4 deletions src/index/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,4 @@ impl Index {
);
}
}

pub fn repository_url(&self) -> Option<&str> {
self.repository_url.as_deref()
}
}
6 changes: 3 additions & 3 deletions src/web/releases.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1126,9 +1126,9 @@ mod tests {
.expect("missing heading")
.any(|el| el.text_contents().contains("nothing")));

queue.add_crate("foo", "1.0.0", 0, None)?;
queue.add_crate("bar", "0.1.0", -10, None)?;
queue.add_crate("baz", "0.0.1", 10, None)?;
queue.add_crate("foo", "1.0.0", 0)?;
queue.add_crate("bar", "0.1.0", -10)?;
queue.add_crate("baz", "0.0.1", 10)?;

let full = kuchiki::parse_html().one(web.get("/releases/queue").send()?.text()?);
let items = full
Expand Down

0 comments on commit 7d81b24

Please sign in to comment.