query for non-cancelled job groups

Author: ehigham

batch/batch/driver/main.py

@@ -1537,9 +1537,9 @@ async def compact(tx: Transaction, record: dict):
     SELECT C.id FROM job_groups_cancelled AS C
     INNER JOIN job_group_self_and_ancestors AS D
        ON C.id           = D.batch_id
-      AND C.job_group_id = D.job_group_id
-    WHERE D.batch_id    = G.batch_id
-      AND D.ancestor_id = G.job_group_id
+      AND C.job_group_id = D.ancestor_id
+    WHERE D.batch_id     = G.batch_id
+      AND D.job_group_id = G.job_group_id
 ) AS C ON TRUE
 INNER JOIN LATERAL (
     SELECT {keys}
@@ -1582,9 +1582,9 @@ async def delete_dead_job_group_cancellable_resources_records(db: Database):
     SELECT C.id FROM job_groups_cancelled AS C
     INNER JOIN job_group_self_and_ancestors AS D
        ON C.id           = D.batch_id
-      AND C.job_group_id = D.job_group_id
-    WHERE D.batch_id    = G.batch_id
-      AND D.ancestor_id = G.job_group_id
+      AND C.job_group_id = D.ancestor_id
+    WHERE D.batch_id     = G.batch_id
+      AND D.job_group_id = G.job_group_id
 ) AS C ON TRUE
 INNER JOIN LATERAL (
     SELECT {keys}