Overview
| Comment: | fixed bug |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | rebase-runs-summary-contexts-menu |
| Files: | files | file ages | folders |
| SHA1: |
b340b2ea35e9c92e605214ae09eca9c1 |
| User & Date: | bb on 2016-09-16 23:49:59 |
| Other Links: | branch diff | manifest | tags |
Context
|
2016-09-16
| ||
| 23:49 | fixed bug Closed-Leaf check-in: b340b2ea35 user: bb tags: rebase-runs-summary-contexts-menu | |
| 17:49 | rebase continues. Merging in 95589 check-in: a2e344d47e user: mrwellan tags: rebase-runs-summary-contexts-menu | |
Changes
Modified dashboard.scm from [79a3912085] to [8a31d16bb7].
| ︙ | ︙ | |||
1446 1447 1448 1449 1450 1451 1452 | userdata: (conc "run-id: " run-id)) (hash-table-set! (dboard:tabdat-path-run-ids tabdat) run-path run-id) ;; (set! colnum (+ colnum 1)) )))) run-ids))) (define (dashboard:run-id->tests-mindat run-id tabdat runs-hash) | | | | | | < > > > > | | < < | | 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 |
userdata: (conc "run-id: " run-id))
(hash-table-set! (dboard:tabdat-path-run-ids tabdat) run-path run-id)
;; (set! colnum (+ colnum 1))
))))
run-ids)))
(define (dashboard:run-id->tests-mindat run-id tabdat runs-hash)
(let* ((run (hash-table-ref/default runs-hash run-id #f)) ;; extra
(last-update (hash-table-ref/default (dboard:tabdat-run-update-times tabdat) run-id 0))
(db-path (or (hash-table-ref/default (dboard:tabdat-run-db-paths tabdat) run-id #f)
(let* ((db-dir (tasks:get-task-db-path))
(db-pth (conc db-dir "/" run-id ".db")))
(hash-table-set! (dboard:tabdat-run-db-paths tabdat) run-id db-pth)
db-pth)))
(key-vals (rmt:get-key-vals run-id)) ;; extra
(testnamepatt (or (dboard:tabdat-test-patts tabdat) "%")) ;; extra
(tests-dat (if (or (not run-id)
(configf:lookup *configdat* "setup" "do-not-use-db-file-timestamps")
(not (hash-table-exists? (dboard:tabdat-last-test-dat tabdat) run-id))
(>= (file-modification-time db-path) last-update))
(let ((res
(dboard:get-tests-dat tabdat run-id 0) ;; "0)" was: "last-update)" ;; NOTE FROM 1.61 --> ;; DO NOT USE last-update yet. Need to redesign this to use dboard:get-tests-for-run-duplicate
;; TODO: replace above line (get-tests-dat) with below line (get-tests-for-run-duplicate); above is a list, below is a hash - therein lies the problem. The minimize-test-data depends on a pre-sorted list as input; hash is by nature unsorted. and its not a list.
;;(dboard:get-tests-for-run-duplicate tabdat run-id run testnamepatt key-vals)
))
res)
(hash-table-ref (dboard:tabdat-last-test-dat tabdat) run-id)))
(tests-mindat (dcommon:minimize-test-data tests-dat))) ;; reduces data for display
(dboard:tabdat-last-runs-update-set! tabdat (- (current-seconds) 2)) ;; moved to here to group with other update timestamp recordings
(hash-table-set! (dboard:tabdat-last-test-dat tabdat) run-id tests-dat) ;; moved out of one branch of test-dat let cond
(hash-table-set! (dboard:tabdat-run-update-times tabdat) run-id (- (current-seconds) 10)) ;; ditto
tests-mindat))
(define (dashboard:runs-summary-xor-matrix-content tabdat runs-hash)
(let* ((src-run-id (dboard:tabdat-prev-run-id tabdat))
(dest-run-id (dboard:tabdat-curr-run-id tabdat)))
(if (and src-run-id dest-run-id)
(dcommon:xor-tests-mindat
(dashboard:run-id->tests-mindat src-run-id tabdat runs-hash)
(dashboard:run-id->tests-mindat dest-run-id tabdat runs-hash))
#f)))
-
(define (dashboard:runs-summary-updater commondat tabdat tb cell-lookup run-matrix)
(dboard:runs-summary-control-panel-updater tabdat)
(let* ((last-runs-update (dboard:tabdat-last-runs-update tabdat))
(runs-dat (rmt:get-runs-by-patt (dboard:tabdat-keys tabdat) "%" #f #f #f #f last-runs-update))
(runs-header (vector-ref runs-dat 0)) ;; 0 is header, 1 is list of records
(runs (vector-ref runs-dat 1))
(run-id (dboard:tabdat-curr-run-id tabdat))
(runs-hash (let ((ht (make-hash-table)))
(for-each (lambda (run)
(hash-table-set! ht (db:get-value-by-header run runs-header "id") run))
runs)
ht)))
(dboard:update-tree tabdat runs-hash runs-header tb)
(if run-id ;; moved matrix-content calculation code to run-id->tests-mindat
(let* ((matrix-content
(case (dboard:tabdat-runs-summary-mode tabdat)
((one-run) (dashboard:run-id->tests-mindat run-id tabdat runs-hash))
((xor-two-runs) (dashboard:runs-summary-xor-matrix-content tabdat runs-hash))
(else (dashboard:run-id->tests-mindat run-id tabdat runs-hash)))))
(when matrix-content
(let* ((indices (common:sparse-list-generate-index matrix-content)) ;; proc: set-cell))
(row-indices (cadr indices))
(col-indices (car indices))
(max-row (if (null? row-indices) 1 (common:max (map cadr row-indices))))
(max-col (if (null? col-indices) 1 (common:max (map cadr col-indices))))
(max-visible (max (- (dboard:tabdat-num-tests tabdat) 15) 3)) ;; (dboard:tabdat-num-tests tabdat) is proportional to the size of the window
(numrows 1)
(numcols 1)
(changed #f)
)
(dboard:tabdat-filters-changed-set! tabdat #f) ;; refactor coalesces here
(let loop ((pass-num 0)
(changed #f))
;; Update the runs tree
(dboard:update-tree tabdat runs-hash runs-header tb)
(if (eq? pass-num 1)
(begin ;; big reset
|
| ︙ | ︙ |