for regex aggregation, only aggregate for same user

2026-05-24 22:24:20 +02:00
parent e16e6b8797
commit 5383ab8391
1 changed files with 3 additions and 2 deletions
@@ -441,14 +441,15 @@ def aggregate_records(records: list[JobRecord], args: argparse.Namespace) -> lis
            matched = False
            for pat, rx in compiled:
                if rx.search(rec.jobname):
-                    key = (pat, rec.cpus, rec.nodes, rec.reqmem_gb, rec.reqwall_hours)
+                    key = (pat, rec.cpus, rec.nodes, rec.reqmem_gb, rec.reqwall_hours,
+                           rec.username)
                    buckets[key].append(rec)
                    matched = True
                    break
            if not matched:
                unmatched.append(rec)

-        out = [make_aggregate_row(v, username="*", jobname=k[0]) for k, v in buckets.items()]
+        out = [make_aggregate_row(v, username=k[5], jobname=k[0]) for k, v in buckets.items()]
        out.extend(make_single_row(r) for r in unmatched)
        return out