Overview
| Comment: | Add multi-patts to selectors in dashboard |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | multi-selectors |
| Files: | files | file ages | folders |
| SHA1: |
31e91bbc093c2fe577ad694fa576ebdd |
| User & Date: | mrwellan on 2012-04-02 22:49:33 |
| Other Links: | branch diff | manifest | tags |
Context
|
2012-04-04
| ||
| 17:30 | Pulled in the beginings of multi-filter code check-in: 3e1180bef3 user: mrwellan tags: trunk | |
|
2012-04-02
| ||
| 22:49 | Add multi-patts to selectors in dashboard Closed-Leaf check-in: 31e91bbc09 user: mrwellan tags: multi-selectors | |
| 09:19 | Cache run info check-in: fa2b98fd70 user: mrwellan tags: trunk | |
Changes
Modified dashboard.scm from [0a91cd17dd] to [25b312e0d1].
| ︙ | ︙ | |||
175 176 177 178 179 180 181 | (maxtests 0) (states (hash-table-keys *state-ignore-hash*)) (statuses (hash-table-keys *status-ignore-hash*))) (debug:print 6 "update-rundat, got " (length runs) " runs") (if (> (+ *last-update* 300) (current-seconds)) ;; every five minutes (begin (set! *last-update* (current-seconds)) | | | 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 | (maxtests 0) (states (hash-table-keys *state-ignore-hash*)) (statuses (hash-table-keys *status-ignore-hash*))) (debug:print 6 "update-rundat, got " (length runs) " runs") (if (> (+ *last-update* 300) (current-seconds)) ;; every five minutes (begin (set! *last-update* (current-seconds)) (set! *tot-run-count* (length runs)))) ;; (rdb:get-num-runs *db* runnamepatt)))) (for-each (lambda (run) (let* ((run-id (db:get-value-by-header run header "id")) (tests (let ((tsts (rdb:get-tests-for-run *db* run-id testnamepatt itemnamepatt states statuses))) (if *tests-sort-reverse* (reverse tsts) tsts))) (key-vals (rdb:get-key-vals *db* run-id))) (if (> (length tests) maxtests) (set! maxtests (length tests))) |
| ︙ | ︙ |
Modified db.scm from [4d7c770d20] to [a8d45b3634].
| ︙ | ︙ | |||
288 289 290 291 292 293 294 |
(define (runs:get-std-run-fields keys remfields)
(let* ((header (append (map key:get-fieldname keys)
remfields))
(keystr (conc (keys->keystr keys) ","
(string-intersperse remfields ","))))
(list keystr header)))
| < < < < > | | > > > > > | | | | | | | | | | | | | | | | | | | | | | | < > | 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 |
(define (runs:get-std-run-fields keys remfields)
(let* ((header (append (map key:get-fieldname keys)
remfields))
(keystr (conc (keys->keystr keys) ","
(string-intersperse remfields ","))))
(list keystr header)))
;; replace header and keystr with a call to runs:get-std-run-fields
;;
;; keypatts: ( (KEY1 "abc%def")(KEY2 "%") )
;; runpatts: patt1,patt2 ...
;;
(define (db:get-runs db runpatt count offset keypatts)
(let* ((res '())
(keys (db:get-keys db))
(runpatts (string-split runpatt ","))
(runpattstr (string-intersperse (map (lambda (patt)
(conc "runname LIKE '" patt "'"))
runpatts)
" OR "))
(remfields (list "id" "runname" "state" "status" "owner" "event_time"))
(header (append (map key:get-fieldname keys)
remfields))
(keystr (conc (keys->keystr keys) ","
(string-intersperse remfields ",")))
(qrystr (conc "SELECT " keystr " FROM runs WHERE (" runpattstr ") " ;; runname LIKE ? "
;; Generate: " AND x LIKE 'keypatt' ..."
(if (null? keypatts) ""
(conc " AND "
(string-join
(map (lambda (keypatt)
(let ((key (car keypatt))
(patt (cadr keypatt)))
(conc key " LIKE '" patt "'")))
keypatts)
" AND ")))
" ORDER BY event_time DESC "
(if (number? count)
(conc " LIMIT " count)
"")
(if (number? offset)
(conc " OFFSET " offset)
""))))
(debug:print 8 "INFO: db:get-runs qrystr: " qrystr "\nkeypatts: " keypatts "\n offset: " offset " limit: " count)
(sqlite3:for-each-row
(lambda (a . x)
(set! res (cons (apply vector a x) res)))
db
qrystr
)
(vector header res)))
;; just get count of runs
(define (db:get-num-runs db runpatt)
(let ((numruns 0))
(sqlite3:for-each-row
(lambda (count)
|
| ︙ | ︙ |