Include priority information in the allocation plan output

Also switch derivation-name to use an underscore.

1 files changed, 10 insertions, 4 deletions

diff --git a/guix-build-coordinator/datastore/sqlite.scm b/guix-build-coordinator/datastore/sqlite.scm
index ff30c0b..b22ea59 100644
--- a/guix-build-coordinator/datastore/sqlite.scm
+++ b/guix-build-coordinator/datastore/sqlite.scm
@@ -3269,12 +3269,15 @@ WHERE agent_id = :agent_id"
                 db
                 (string-append
                  "
-SELECT builds.uuid, derivations.name
+SELECT builds.uuid, derivations.name, builds.priority,
+       unprocessed_builds_with_derived_priorities.derived_priority
 FROM builds
 INNER JOIN derivations
   ON builds.derivation_id = derivations.id
 INNER JOIN build_allocation_plan
   ON builds.id = build_allocation_plan.build_id
+LEFT JOIN unprocessed_builds_with_derived_priorities
+  ON builds.id = unprocessed_builds_with_derived_priorities.build_id
 WHERE build_allocation_plan.agent_id = :agent_id
   AND builds.processed = 0
   AND builds.id NOT IN (SELECT build_id FROM allocated_builds)
@@ -3294,9 +3297,12 @@ LIMIT :limit"
 
           (let ((builds (sqlite-map
                          (match-lambda
-                           (#(uuid derivation_name)
-                            `((uuid            . ,uuid)
-                              (derivation-name . ,derivation_name)
+                           (#(uuid derivation_name
+                                   priority derived_priority)
+                            `((uuid             . ,uuid)
+                              (derivation_name  . ,derivation_name)
+                              (priority         . ,priority)
+                              (derived_priority . ,derived_priority)
                               (tags . ,(vector-map
                                         (lambda (_ tag)
                                           (match tag