diff options
| author | Christopher Baines <mail@cbaines.net> | 2021-01-16 19:16:13 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2021-01-16 19:16:13 +0000 |
| commit | 7b34a18f4e1bb2ddbd72ccd465294acc6b3d1ab2 (patch) | |
| tree | d01cfd793b02cdf500478597cad625cfcafaa2c5 /guix-build-coordinator | |
| parent | ffb441e0c8eb687585b5a93fce0e8ad73bae1c6d (diff) | |
| download | build-coordinator-7b34a18f4e1bb2ddbd72ccd465294acc6b3d1ab2.tar build-coordinator-7b34a18f4e1bb2ddbd72ccd465294acc6b3d1ab2.tar.gz | |
Start migrating derivation-inputs to derivation_inputs
As I think underscores are more idiomatic in JSON.
Diffstat (limited to 'guix-build-coordinator')
| -rw-r--r-- | guix-build-coordinator/agent.scm | 3 | ||||
| -rw-r--r-- | guix-build-coordinator/datastore/sqlite.scm | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/guix-build-coordinator/agent.scm b/guix-build-coordinator/agent.scm index 683f501..8c038ab 100644 --- a/guix-build-coordinator/agent.scm +++ b/guix-build-coordinator/agent.scm @@ -97,7 +97,8 @@ (define (process-job build) (let ((build-id (assoc-ref build "uuid")) - (derivation-name (assoc-ref build "derivation-name"))) + (derivation-name (or (assoc-ref build "derivation_name") + (assoc-ref build "derivation-name")))) (log-msg lgr 'INFO build-id ": setting up to build: " diff --git a/guix-build-coordinator/datastore/sqlite.scm b/guix-build-coordinator/datastore/sqlite.scm index 5cab70f..ce6ea91 100644 --- a/guix-build-coordinator/datastore/sqlite.scm +++ b/guix-build-coordinator/datastore/sqlite.scm @@ -41,6 +41,7 @@ datastore-mark-build-as-processed datastore-delete-relevant-outputs-from-unbuilt-outputs datastore-store-output-metadata + datastore-list-unbuilt-derivation-outputs datastore-list-build-outputs datastore-new-agent datastore-list-agents @@ -2173,6 +2174,7 @@ WHERE build_derivation_outputs.derivation_name = :derivation_name (#f #f) (#(uuid derivation_name) `((uuid . ,uuid) + ;; TODO Switch this to derivation_name (derivation-name . ,derivation_name)))) result)) '() @@ -2264,6 +2266,7 @@ WHERE agent_id = :agent_id" (match row (#(uuid derivation_name) `((uuid . ,uuid) + ;; TODO Switch this to derivation_name (derivation-name . ,derivation_name)))) result)) '() @@ -2336,6 +2339,7 @@ WHERE allocated_builds.agent_id = :agent_id" (match-lambda (#(uuid derivation_name priority) `((uuid . ,uuid) + ;; TODO Switch this to derivation_name (derivation-name . ,derivation_name) (priority . ,priority)))) statement))) |