add priority column to build queue

Author: QuietMisdreavus

src/db/migrate.rs

@@ -169,6 +169,16 @@ pub fn migrate(version: Option<Version>) -> CratesfyiResult<()> {
             "DROP TABLE authors, author_rels, keyword_rels, keywords, owner_rels,
                         owners, releases, crates, builds, queue, files, config;"
         ),
+        migration!(
+            // version
+            2,
+            // description
+            "Added priority column to build queue",
+            // upgrade query
+            "ALTER TABLE queue ADD COLUMN priority INT DEFAULT 0;",
+            // downgrade query
+            "ALTER TABLE queue DROP COLUMN priority;"
+        ),
     ];
 
     for migration in migrations {

src/docbuilder/queue.rs

@@ -20,7 +20,7 @@ impl DocBuilder {
         changes.reverse();
 
         for krate in changes.iter().filter(|k| k.kind != ChangeKind::Yanked) {
-            conn.execute("INSERT INTO queue (name, version) VALUES ($1, $2)",
+            conn.execute("INSERT INTO queue (name, version, priority) VALUES ($1, $2, 0)",
                          &[&krate.name, &krate.version])
                 .ok();
             debug!("{}-{} added into build queue", krate.name, krate.version);
@@ -46,7 +46,7 @@ impl DocBuilder {
         for row in &try!(conn.query("SELECT id, name, version
                                      FROM queue
                                      WHERE attempt < 5
-                                     ORDER BY id ASC",
+                                     ORDER BY priority ASC, attempt ASC, id ASC",
                                     &[])) {
             let id: i32 = row.get(0);
             let name: String = row.get(1);
@@ -79,7 +79,7 @@ impl DocBuilder {
         let query = try!(conn.query("SELECT id, name, version
                                      FROM queue
                                      WHERE attempt < 5
-                                     ORDER BY attempt ASC, id ASC
+                                     ORDER BY priority ASC, attempt ASC, id ASC
                                      LIMIT 1",
                                     &[]));
 

src/web/releases.rs

@@ -565,7 +565,7 @@ pub fn build_queue_handler(req: &mut Request) -> IronResult<Response> {
     for krate in &conn.query("SELECT name, version
                               FROM queue
                               WHERE attempt < 5
-                              ORDER BY id ASC",
+                              ORDER BY priority ASC, attempt ASC, id ASC",
                &[])
         .unwrap() {
         crates.push((krate.get(0), krate.get(1)));