[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Danny Milosavljevic |
Date: |
Mon, 19 Feb 2018 17:02:24 -0500 (EST) |
branch: master
commit f5a15cab510178d46ea5dc7a79fd7bb96fd679f3
Author: Danny Milosavljevic <address@hidden>
Date: Mon Feb 19 22:49:04 2018 +0100
database: Fix grouping in db-get-builds.
* src/cuirass/database.scm (db-get-builds): Fix grouping.
---
src/cuirass/database.scm | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/src/cuirass/database.scm b/src/cuirass/database.scm
index df31122..751b8ef 100644
--- a/src/cuirass/database.scm
+++ b/src/cuirass/database.scm
@@ -432,30 +432,23 @@ Assumes that if group id stays the same the group headers
stay the same."
(match rows
(() (list (finish-group)))
- ((#((? same-group? x-builds-id) x-output-name x-output-path ...) . rest)
+ ((#((? same-group? x-builds-id) x-output-name x-output-path other-cells
...) . rest)
;; Accumulate group members of current group.
(let ((outputs (cons-output x-output-name x-output-path outputs)))
(collect-outputs repeated-builds-id repeated-row outputs rest)))
- ((#(x-builds-id x-output-name x-output-path timestamp starttime stoptime
log
- status derivation job-name system nix-name repo-name branch) . rest)
+ ((#(x-builds-id x-output-name x-output-path other-cells ...) . rest)
(cons ;; Finish current group.
(finish-group)
;; Start new group.
(let ((outputs (cons-output x-output-name x-output-path '())))
- (let ((x-repeated-row (vector timestamp starttime stoptime
- log status derivation job-name
system
- nix-name repo-name branch)))
+ (let ((x-repeated-row (list->vector other-cells)))
(collect-outputs x-builds-id x-repeated-row outputs rest)))))))
(define (group-outputs rows)
(match rows
(() '())
- ((#(x-builds-id x-output-name x-output-path timestamp starttime stoptime
- log status derivation job-name system
- nix-name repo-name branch) . rest)
- (let ((x-repeated-row (vector timestamp starttime stoptime
- log status derivation job-name system
- nix-name repo-name branch)))
+ ((#(x-builds-id x-output-name x-output-path other-cells ...) . rest)
+ (let ((x-repeated-row (list->vector other-cells)))
(collect-outputs x-builds-id x-repeated-row '() rows)))))
(let* ((order (if (eq? (assqx-ref filters 'order) 'build-id)