cbaines pushed a commit to branch master
in repository data-service.

commit bbbcea8ff694c03aabb365339c31e95b272281d6
Author: Christopher Baines <[email protected]>
AuthorDate: Tue Jul 16 16:13:17 2024 +0100

    Add more time logging in to insert-missing-derivations
---
 guix-data-service/model/derivation.scm | 126 ++++++++++++++++-----------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/guix-data-service/model/derivation.scm 
b/guix-data-service/model/derivation.scm
index 7023eef..1b82889 100644
--- a/guix-data-service/model/derivation.scm
+++ b/guix-data-service/model/derivation.scm
@@ -1623,70 +1623,70 @@ LIMIT $1"
      " RETURNING id"
      ";"))
 
-  (simple-format
-   #t "debug: insert-missing-derivations: inserting ~A derivations\n"
-   (length derivations))
-  (let ((derivation-ids
-         (append-map
-          (lambda (chunk)
-            (map (lambda (result)
-                   (string->number (car result)))
-                 (exec-query conn (insert-into-derivations chunk))))
-          (chunk derivations 500))))
-
-    (simple-format
-     #t "debug: insert-missing-derivations: updating hash table\n")
-    (for-each (lambda (derivation derivation-id)
-                (hash-set! derivation-ids-hash-table
-                           (derivation-file-name derivation)
-                           derivation-id))
-              derivations
-              derivation-ids)
-
-    (simple-format
-     #t "debug: insert-missing-derivations: inserting outputs\n")
-    (for-each (lambda (derivation-id derivation)
-                (insert-derivation-outputs conn
-                                           derivation-id
-                                           (derivation-outputs derivation)))
-              derivation-ids
-              derivations)
-
-    (simple-format
-     #t "debug: insert-missing-derivations: inserting sources\n")
-    (for-each (lambda (derivation-id derivation)
-                (let ((sources (derivation-sources derivation)))
-                  (unless (null? sources)
-                    (let ((sources-ids
-                           (insert-derivation-sources conn
-                                                      derivation-id
-                                                      sources)))
-                      (map (lambda (id source-file)
-                             (insert-derivation-source-file-nar conn
-                                                                id
-                                                                source-file))
-                           sources-ids
-                           sources)))))
-              derivation-ids
-              derivations)
-
-    (simple-format
-     #t "debug: insert-missing-derivations: ensure-input-derivations-exist\n")
-
-    (ensure-input-derivations-exist (deduplicate-strings
-                                     (map derivation-input-path
-                                          (append-map derivation-inputs
-                                                      derivations))))
-
-    (with-time-logging
-        (simple-format
-         #f "insert-missing-derivations: inserting inputs for ~A derivations"
-         (length derivations))
-      (insert-derivation-inputs conn
-                                derivation-ids
-                                derivations))
+  (with-time-logging
+      (simple-format
+       #f "insert-missing-derivations: inserting ~A derivations"
+       (length derivations))
+    (let ((derivation-ids
+           (append-map
+            (lambda (chunk)
+              (map (lambda (result)
+                     (string->number (car result)))
+                   (exec-query conn (insert-into-derivations chunk))))
+            (chunk derivations 500))))
+
+      (with-time-logging
+          "insert-missing-derivations: updating hash table"
+        (for-each (lambda (derivation derivation-id)
+                    (hash-set! derivation-ids-hash-table
+                               (derivation-file-name derivation)
+                               derivation-id))
+                  derivations
+                  derivation-ids))
+
+      (with-time-logging
+          "insert-missing-derivations: inserting outputs"
+        (for-each (lambda (derivation-id derivation)
+                    (insert-derivation-outputs conn
+                                               derivation-id
+                                               (derivation-outputs 
derivation)))
+                  derivation-ids
+                  derivations))
+
+      (with-time-logging
+          "insert-missing-derivations: inserting sources"
+        (for-each (lambda (derivation-id derivation)
+                    (let ((sources (derivation-sources derivation)))
+                      (unless (null? sources)
+                        (let ((sources-ids
+                               (insert-derivation-sources conn
+                                                          derivation-id
+                                                          sources)))
+                          (map (lambda (id source-file)
+                                 (insert-derivation-source-file-nar conn
+                                                                    id
+                                                                    
source-file))
+                               sources-ids
+                               sources)))))
+                  derivation-ids
+                  derivations))
+
+      (with-time-logging
+          "insert-missing-derivations: ensure-input-derivations-exist"
+        (ensure-input-derivations-exist (deduplicate-strings
+                                         (map derivation-input-path
+                                              (append-map derivation-inputs
+                                                          derivations)))))
+
+      (with-time-logging
+          (simple-format
+           #f "insert-missing-derivations: inserting inputs for ~A derivations"
+           (length derivations))
+        (insert-derivation-inputs conn
+                                  derivation-ids
+                                  derivations))
 
-    derivation-ids))
+      derivation-ids)))
 
 (define (select-derivations-by-id conn ids)
   (define query

Reply via email to