aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2025-03-02 09:37:39 +0000
committerChristopher Baines <mail@cbaines.net>2025-03-02 09:48:45 +0000
commit595d18935c3ae6e5bbc72aa4751f17f8a772c9e2 (patch)
tree0d97143a3ca3a1be2ac7e7d1e4f382466a65687d
parent7a58a3de640cc3d0201fe64be3acb25460fab0e2 (diff)
downloadbuild-coordinator-master.tar
build-coordinator-master.tar.gz
Fix NULL values in the databaseHEADmaster
-rw-r--r--guix-build-coordinator/coordinator.scm4
-rw-r--r--guix-build-coordinator/datastore/sqlite.scm15
2 files changed, 5 insertions, 14 deletions
diff --git a/guix-build-coordinator/coordinator.scm b/guix-build-coordinator/coordinator.scm
index 93ce230..adb7575 100644
--- a/guix-build-coordinator/coordinator.scm
+++ b/guix-build-coordinator/coordinator.scm
@@ -1734,9 +1734,7 @@
(datastore-insert-to-allocated-builds
datastore
agent-id
- build-id
- ;; This is updated later, outside the transaction
- 'null)
+ build-id)
(build-coordinator-remove-build-from-allocation-plan
build-coordinator build-id)
`(,@build-details
diff --git a/guix-build-coordinator/datastore/sqlite.scm b/guix-build-coordinator/datastore/sqlite.scm
index fadef44..bb1d8e8 100644
--- a/guix-build-coordinator/datastore/sqlite.scm
+++ b/guix-build-coordinator/datastore/sqlite.scm
@@ -3517,8 +3517,7 @@ WHERE build_derivation_outputs.derivation_id = :derivation_id
(define-method (datastore-insert-to-allocated-builds
(datastore <sqlite-datastore>)
agent-id
- build-uuid
- submit-outputs?)
+ build-uuid)
(call-with-writer-thread
datastore
(lambda (db)
@@ -3526,20 +3525,14 @@ WHERE build_derivation_outputs.derivation_id = :derivation_id
(sqlite-prepare
db
"
-INSERT INTO allocated_builds (build_id, agent_id, submit_outputs)
- VALUES (:build_id, :agent_id, :submit_outputs)"
+INSERT INTO allocated_builds (build_id, agent_id)
+ VALUES (:build_id, :agent_id)"
#:cache? #t)))
(sqlite-bind-arguments
statement
#:build_id (db-find-build-id db build-uuid)
- #:agent_id agent-id
- #:submit_outputs
- (cond
- ((eq? submit-outputs? 'null) "NULL")
- ((eq? #f submit-outputs?) 0)
- ((eq? #t submit-outputs?) 1)
- (else (error "unknown submit-outputs"))))
+ #:agent_id agent-id)
(sqlite-step-and-reset statement))))
#t)