diff options
| -rw-r--r-- | guix-data-service/model/derivation.scm | 76 | ||||
| -rw-r--r-- | sqitch/deploy/derivation_output_sets.sql | 50 | ||||
| -rw-r--r-- | sqitch/revert/derivation_output_sets.sql | 8 | ||||
| -rw-r--r-- | sqitch/sqitch.plan | 1 | ||||
| -rw-r--r-- | sqitch/verify/derivation_output_sets.sql | 7 |
5 files changed, 129 insertions, 13 deletions
diff --git a/guix-data-service/model/derivation.scm b/guix-data-service/model/derivation.scm index f26eeea..9b71e75 100644 --- a/guix-data-service/model/derivation.scm +++ b/guix-data-service/model/derivation.scm @@ -289,19 +289,63 @@ ORDER BY derivations.file_name ";")) (define (insert-into-derivation-outputs output-names - derivation-output-ids) + derivation-output-details-ids) (string-append "INSERT INTO derivation_outputs " "(derivation_id, name, derivation_output_details_id) VALUES " (string-join - (map (lambda (output-name derivation-output-id) + (map (lambda (output-name derivation-output-details-id) (simple-format #f "(~A, '~A', ~A)" - derivation-id output-name derivation-output-id)) + derivation-id + output-name + derivation-output-details-id)) output-names - derivation-output-ids) + derivation-output-details-ids) ",") ";")) + (define (select-derivation-output-details-sets-id derivation-output-details-ids) + (match (exec-query + conn + (string-append + " +SELECT id +FROM derivation_output_details_sets +WHERE derivation_output_details_ids = ARRAY[" + (string-join (map number->string + derivation-output-details-ids) + ",") + "]")) + (((id)) + (string->number id)) + (_ #f))) + + (define (insert-into-derivation-output-details-sets + derivation-output-details-ids) + (match (exec-query + conn + (string-append + " +INSERT INTO derivation_output_details_sets (derivation_output_details_ids) +VALUES (ARRAY[" + (string-join (map number->string derivation-output-details-ids) + ",") + "]) +RETURNING id")) + (((id)) + (string->number id)))) + + (define (insert-into-derivations-by-output-details-set + derivation_output_details_set_id) + (exec-query + conn + " +INSERT INTO derivations_by_output_details_set + (derivation_id, derivation_output_details_set_id) +VALUES ($1, $2)" + (list (number->string derivation-id) + (number->string derivation_output_details_set_id)))) + (let* ((derivation-outputs (map cdr names-and-derivation-outputs)) (derivation-output-paths (map derivation-output-path derivation-outputs)) @@ -333,14 +377,15 @@ ORDER BY derivations.file_name (two-lists->vhash (map derivation-output-path missing-entries) new-derivation-output-details-ids)) - (derivation-output-ids + (derivation-output-details-ids (map (lambda (path) - (cdr - (or (vhash-assoc path - existing-derivation-output-details-entries) - (vhash-assoc path - new-entries-id-lookup-vhash) - (error "missing derivation output details entry")))) + (string->number + (cdr + (or (vhash-assoc path + existing-derivation-output-details-entries) + (vhash-assoc path + new-entries-id-lookup-vhash) + (error "missing derivation output details entry"))))) derivation-output-paths)) (derivation-output-names @@ -348,9 +393,14 @@ ORDER BY derivations.file_name (exec-query conn (insert-into-derivation-outputs derivation-output-names - derivation-output-ids)) + derivation-output-details-ids)) + + (insert-into-derivations-by-output-details-set + (or + (select-derivation-output-details-sets-id derivation-output-details-ids) + (insert-into-derivation-output-details-sets derivation-output-details-ids))) - derivation-output-ids)) + derivation-output-details-ids)) (define (select-derivation-by-file-name conn file-name) (define query diff --git a/sqitch/deploy/derivation_output_sets.sql b/sqitch/deploy/derivation_output_sets.sql new file mode 100644 index 0000000..258b9f2 --- /dev/null +++ b/sqitch/deploy/derivation_output_sets.sql @@ -0,0 +1,50 @@ +-- Deploy guix-data-service:derivation_output_sets to pg + +BEGIN; + +CREATE TABLE derivation_output_details_sets ( + id integer PRIMARY KEY GENERATED ALWAYS AS IDENTITY, + derivation_output_details_ids integer[] NOT NULL, + UNIQUE (derivation_output_details_ids) +); + +CREATE TABLE derivations_by_output_details_set ( + derivation_id integer REFERENCES derivations (id), + derivation_output_details_set_id integer REFERENCES derivation_output_details_sets (id), + PRIMARY KEY (derivation_id, derivation_output_details_set_id), + UNIQUE (derivation_id) +); + +CREATE INDEX derivations_by_output_details_set_id_idx + ON derivations_by_output_details_set (derivation_output_details_set_id); + +INSERT INTO derivation_output_details_sets (derivation_output_details_ids) ( + SELECT DISTINCT ARRAY_AGG( + derivation_output_details_id + ORDER BY derivation_output_details_id + ) + FROM derivation_outputs + GROUP BY derivation_id +); + +INSERT INTO derivations_by_output_details_set ( + SELECT derivation_id, derivation_output_details_sets.id + FROM ( + SELECT derivation_id, + derivation_output_details_ids + FROM ( + SELECT derivation_id, + ARRAY_AGG( + derivation_output_details_id + ORDER BY derivation_output_details_id + ) AS derivation_output_details_ids + FROM derivation_outputs + GROUP BY derivation_id + ) AS derivation_output_groups + ) data + INNER JOIN derivation_output_details_sets + ON data.derivation_output_details_ids = + derivation_output_details_sets.derivation_output_details_ids +); + +COMMIT; diff --git a/sqitch/revert/derivation_output_sets.sql b/sqitch/revert/derivation_output_sets.sql new file mode 100644 index 0000000..6df4efa --- /dev/null +++ b/sqitch/revert/derivation_output_sets.sql @@ -0,0 +1,8 @@ +-- Revert guix-data-service:derivation_output_sets from pg + +BEGIN; + +DROP TABLE derivations_by_output_details_set; +DROP TABLE derivation_output_details_sets; + +COMMIT; diff --git a/sqitch/sqitch.plan b/sqitch/sqitch.plan index 58b272d..2f5b512 100644 --- a/sqitch/sqitch.plan +++ b/sqitch/sqitch.plan @@ -36,3 +36,4 @@ change_nars_size_to_bigint 2019-12-04T21:24:21Z <chris@phact> # Change nars.si change_nar_urls_size_to_bigint 2019-12-04T21:49:07Z <chris@phact> # Change nar_urls.size to bigint sort_out_duplicate_builds 2019-12-05T12:43:53Z <chris@phact> # Sort out duplicate builds add_some_database_indexes 2019-12-05T15:53:04Z Christopher Baines <mail@cbaines.net> # Add some indexes +derivation_output_sets 2019-12-05T23:19:05Z Christopher Baines <mail@cbaines.net> # Describe the sets of derivation outputs diff --git a/sqitch/verify/derivation_output_sets.sql b/sqitch/verify/derivation_output_sets.sql new file mode 100644 index 0000000..daa0dd0 --- /dev/null +++ b/sqitch/verify/derivation_output_sets.sql @@ -0,0 +1,7 @@ +-- Verify guix-data-service:derivation_output_sets on pg + +BEGIN; + +-- XXX Add verifications here. + +ROLLBACK; |