Fix the builds with blocking counts

Don't just count the builds for directly related derivations, but indirectly
related ones as well.

1 files changed, 13 insertions, 9 deletions

diff --git a/guix-build-coordinator/datastore/sqlite.scm b/guix-build-coordinator/datastore/sqlite.scm
index c0798e9..2b39c51 100644
--- a/guix-build-coordinator/datastore/sqlite.scm
+++ b/guix-build-coordinator/datastore/sqlite.scm
@@ -305,17 +305,21 @@ SELECT
   builds.uuid,
   builds.derivation_name,
   (
+    WITH RECURSIVE related_derivations(name) AS (
+      VALUES(builds.derivation_name)
+    UNION
+      SELECT derivation_inputs.derivation_name
+      FROM derivation_outputs
+      INNER JOIN related_derivations
+        ON derivation_outputs.derivation_name = related_derivations.name
+      INNER JOIN derivation_inputs
+        ON derivation_outputs.id = derivation_inputs.derivation_output_id
+    )
     SELECT COUNT(DISTINCT blocked_builds.uuid)
-    FROM derivation_outputs
-    INNER JOIN derivation_outputs AS matching_derivation_outputs
-      ON derivation_outputs.output = matching_derivation_outputs.output
-    INNER JOIN derivation_inputs
-     ON matching_derivation_outputs.id =
-        derivation_inputs.derivation_output_id
+    FROM related_derivations
     INNER JOIN builds AS blocked_builds
-      ON derivation_inputs.derivation_name = blocked_builds.derivation_name
-     AND blocked_builds.processed = 0
-    WHERE derivation_outputs.derivation_name = builds.derivation_name
+      ON related_derivations.name = blocked_builds.derivation_name
+    AND blocked_builds.processed = 0
   )
 FROM builds
 INNER JOIN build_results