diff options
author | Christopher Baines <mail@cbaines.net> | 2019-07-07 21:23:18 +0100 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2019-07-07 21:23:18 +0100 |
commit | 2ea78cff47fd05d658a5f3c02f64f44c4404d995 (patch) | |
tree | 1b55460dc9bb49ca1d4a5758b3fbd34aa9da5bb0 /guix-data-service/jobs/load-new-guix-revision.scm | |
parent | c00405e23273d998f77ab930d209062ea892aa10 (diff) | |
download | data-service-2ea78cff47fd05d658a5f3c02f64f44c4404d995.tar data-service-2ea78cff47fd05d658a5f3c02f64f44c4404d995.tar.gz |
Tweak how logs are stored
Previously, the query for the jobs page was really slow, as it checked the
load_new_guix_revision_job_log_parts table for each job, doing a sequential
scan through the potentially large table.
Adding an index didn't seem to help, as the query planner would belive the
query could return loads of rows, where actually, all that needed checking is
whether a single row existed with a given job_id.
To avoid adding the index to the load_new_guix_revision_job_log_parts table,
and fighting with the query planner, this commit changes the
load_new_guix_revision_job_logs table to include a blank entry for jobs which
are currently being processed. This is inserted at the start of the job, and
then updated at the end to combine and replace all the parts.
This all means that the jobs page should render quickly now.
Diffstat (limited to 'guix-data-service/jobs/load-new-guix-revision.scm')
-rw-r--r-- | guix-data-service/jobs/load-new-guix-revision.scm | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm index 7eb6cdf..fc76416 100644 --- a/guix-data-service/jobs/load-new-guix-revision.scm +++ b/guix-data-service/jobs/load-new-guix-revision.scm @@ -96,7 +96,8 @@ (string-append "SELECT " (sql-html-escape (get-characters "contents")) - " FROM load_new_guix_revision_job_logs WHERE job_id = $1")) + " FROM load_new_guix_revision_job_logs" + " WHERE job_id = $1 AND contents IS NOT NULL")) (define parts-query (string-append @@ -113,6 +114,13 @@ (((contents)) contents))))) +(define (insert-empty-log-entry conn job-id) + (exec-query + conn + "INSERT INTO load_new_guix_revision_job_logs (job_id, contents) VALUES +($1, NULL)" + (list job-id))) + (define (combine-log-parts! conn job-id) (with-postgresql-transaction conn @@ -120,10 +128,13 @@ (exec-query conn (string-append - "INSERT INTO load_new_guix_revision_job_logs (job_id, contents) " - "SELECT job_id, STRING_AGG(contents, '' ORDER BY id ASC) FROM " + "UPDATE load_new_guix_revision_job_logs SET contents = " + "(" + "SELECT STRING_AGG(contents, '' ORDER BY id ASC) FROM " "load_new_guix_revision_job_log_parts WHERE job_id = $1 " - "GROUP BY job_id") + "GROUP BY job_id" + ")" + "WHERE job_id = $1") (list job-id)) (exec-query conn @@ -613,8 +624,6 @@ SELECT ), EXISTS ( SELECT 1 FROM load_new_guix_revision_job_logs WHERE job_id = load_new_guix_revision_jobs.id - UNION ALL - SELECT 1 FROM load_new_guix_revision_job_log_parts WHERE job_id = load_new_guix_revision_jobs.id ) AS log_exists FROM load_new_guix_revision_jobs ORDER BY load_new_guix_revision_jobs.id DESC") @@ -686,6 +695,7 @@ ORDER BY load_new_guix_revision_jobs.id DESC") (let ((result (with-postgresql-connection (lambda (logging-conn) + (insert-empty-log-entry logging-conn id) (let ((logging-port (log-port id logging-conn))) (set-current-output-port logging-port) (set-current-error-port logging-port) |