Overview
Comment: | Remaining bugs fixed in inmem. Passes all but one test |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
074aff24eff3f4529837346f6144a66e |
User & Date: | matt on 2013-11-22 22:43:09 |
Other Links: | manifest | tags |
Context
2013-11-23
| ||
22:52 | Merged from v1.55 check-in: 0e5db02276 user: matt tags: trunk | |
2013-11-22
| ||
22:44 | Merged trunk with inmem fixes to v1.60 check-in: f5036458ae user: matt tags: v1.60 | |
22:43 | Remaining bugs fixed in inmem. Passes all but one test check-in: 074aff24ef user: matt tags: trunk | |
2013-11-19
| ||
22:28 | Switched to faster db sync routine check-in: 5555ed8e38 user: matt tags: trunk | |
Changes
Modified db.scm from [1e1ddd7dfa] to [4436d7e0c5].
︙ | ︙ | |||
236 237 238 239 240 241 242 | (lambda (dat) (let ((tblname (car dat)) (count (cdr dat))) (if (> count 0) (debug:print 0 (format #f " ~10a ~5a" tblname count))))) (sort (hash-table->alist numrecs)(lambda (a b)(> (cdr a)(cdr b)))))))) | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 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 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 | (lambda (dat) (let ((tblname (car dat)) (count (cdr dat))) (if (> count 0) (debug:print 0 (format #f " ~10a ~5a" tblname count))))) (sort (hash-table->alist numrecs)(lambda (a b)(> (cdr a)(cdr b)))))))) ;; (define (db:sync-to fromdb todb) ;; ;; strategy ;; ;; 1. Get all run-ids ;; ;; 2. For each run-id ;; ;; a. Sync that run in a transaction ;; (let ((trecchgd 0) ;; (rrecchgd 0) ;; (tmrecchgd 0)) ;; ;; ;; First sync test_meta data ;; (let ((tmgetstmt (sqlite3:prepare todb "SELECT id,testname,author,owner,description,reviewed,iterated,avg_runtime,avg_disk,tags,jobgroup FROM test_meta WHERE id=?;")) ;; (tmputstmt (sqlite3:prepare todb "INSERT OR REPLACE INTO test_meta (id,testname,author,owner,description,reviewed,iterated,avg_runtime,avg_disk,tags,jobgroup) ;; VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);")) ;; (tmdats (db:testmeta-get-all fromdb))) ;; ;; (debug:print 7 "Updating as many as " (length tdats) " records for run " run-id) ;; (for-each ;; (lambda (tmdat) ;; iterate over tests ;; (let ((testm-id (vector-ref tmdat 0))) ;; (sqlite3:with-transaction ;; todb ;; (lambda () ;; (let ((curr-tmdat #f)) ;; (sqlite3:for-each-row ;; (lambda (a . b) ;; (set! curr-tmdat (apply vector a b))) ;; tmgetstmt testm-id) ;; (if (not (equal? curr-tmdat tmdat)) ;; something changed ;; (begin ;; (debug:print 0 " test-id: " testm-id ;; "\ncurr-tdat: " curr-tmdat ;; "\n tdat: " tmdat) ;; (apply sqlite3:execute tmputstmt (vector->list tmdat)) ;; (set! tmrecchgd (+ tmrecchgd 1))))))))) ;; tmdats) ;; (sqlite3:finalize! tmgetstmt) ;; (sqlite3:finalize! tmputstmt)) ;; ;; ;; First sync tests data ;; (let ((run-ids (db:get-all-run-ids fromdb)) ;; (tgetstmt (sqlite3:prepare todb "SELECT id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment FROM tests WHERE id=?;")) ;; (tputstmt (sqlite3:prepare todb "INSERT OR REPLACE INTO tests (id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment) ;; VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? );"))) ;; (for-each ;; (lambda (run-id) ;; (let ((tdats (db:get-all-tests-info-by-run-id fromdb run-id))) ;; ;; (debug:print 7 "Updating as many as " (length tdats) " records for run " run-id) ;; (for-each ;; (lambda (tdat) ;; iterate over tests ;; (let ((test-id (vector-ref tdat 0))) ;; (sqlite3:with-transaction ;; todb ;; (lambda () ;; (let ((curr-tdat #f)) ;; (sqlite3:for-each-row ;; (lambda (a . b) ;; (set! curr-tdat (apply vector a b))) ;; tgetstmt ;; test-id) ;; (if (not (equal? curr-tdat tdat)) ;; something changed ;; (begin ;; (debug:print 0 " test-id: " test-id ;; "\ncurr-tdat: " curr-tdat ;; "\n tdat: " tdat) ;; (apply sqlite3:execute tputstmt (vector->list tdat)) ;; (set! trecchgd (+ trecchgd 1))))))))) ;; tdats))) ;; run-ids) ;; (sqlite3:finalize! tgetstmt) ;; (sqlite3:finalize! tputstmt)) ;; ;; ;; Next sync runs table ;; (let* ((rdats '()) ;; (keys (db:get-keys fromdb)) ;; (rstdfields (conc "id," (string-intersperse keys ",") ",runname,state,status,owner,event_time,comment,fail_count,pass_count")) ;; (rnumfields (length (string-split rstdfields ","))) ;; (runslots (string-intersperse (make-list rnumfields "?") ",")) ;; (rgetstmt (sqlite3:prepare todb (conc "SELECT " rstdfields " FROM runs WHERE id=?;"))) ;; (rputstmt (sqlite3:prepare todb (conc "INSERT OR REPLACE INTO runs (" rstdfields ") VALUES ( " runslots " );")))) ;; ;; first collect all the source run data ;; (sqlite3:for-each-row ;; (lambda (a . b) ;; (set! rdats (cons (apply vector a b) rdats))) ;; fromdb ;; (conc "SELECT " rstdfields " FROM runs;")) ;; (sqlite3:with-transaction ;; todb ;; (lambda () ;; (for-each ;; (lambda (rdat) ;; (let ((run-id (vector-ref rdat 0)) ;; (curr-rdat #f)) ;; ;; first get the current value of the equivalent row from the target ;; ;; read, then insert/overwrite if different ;; (sqlite3:for-each-row ;; (lambda (a . b) ;; (set! curr-rdat (apply vector a b))) ;; rgetstmt ;; run-id) ;; (if (not (equal? curr-rdat rdat)) ;; (begin ;; (debug:print 0 " run-id: " run-id ;; "\ncurr-rdat: " curr-rdat ;; "\n rdat: " rdat) ;; (set! rrecchgd (+ rrecchgd 1)) ;; (apply sqlite3:execute rputstmt (vector->list rdat)))))) ;; rdats))) ;; (sqlite3:finalize! rgetstmt) ;; (sqlite3:finalize! rputstmt)) ;; ;; (if (> rrecchgd 0) (debug:print 0 "synced " rrecchgd " changed records in runs table")) ;; (if (> trecchgd 0) (debug:print 0 "synced " trecchgd " changed records in tests table")) ;; (if (> tmrecchgd 0) (debug:print 0 "sync'd " tmrecchgd " changed records in test_meta table")) ;; (+ rrecchgd trecchgd tmrecchgd))) (define (db:sync-back) (db:sync-tables (db:tbls *inmemdb*) *inmemdb* *db*)) ;; (db:sync-to *inmemdb* *db*)) ;; keeping it around for debugging purposes only (define (open-run-close-no-exception-handling proc idb . params) (debug:print-info 11 "open-run-close-no-exception-handling START given a db=" (if idb "yes " "no ") ", params=" params) |
︙ | ︙ | |||
1454 1455 1456 1457 1458 1459 1460 | (define (db:get-test-info-by-id db test-id) (if (not test-id) (begin (debug:print-info 4 "db:get-test-info-by-id called with test-id=" test-id) #f) (let ((res #f)) (sqlite3:for-each-row | | | | | | | | 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 | (define (db:get-test-info-by-id db test-id) (if (not test-id) (begin (debug:print-info 4 "db:get-test-info-by-id called with test-id=" test-id) #f) (let ((res #f)) (sqlite3:for-each-row (lambda (id run-id testname state status event-time host cpuload diskfree uname rundir item-path run_duration final_logf comment pass_count fail_count) ;; 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 (set! res (vector id run-id testname state status event-time host cpuload diskfree uname rundir item-path run_duration final_logf comment pass_count fail_count))) db "SELECT id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment,pass_count,fail_count FROM tests WHERE id=?;" test-id) res))) ;; Use db:test-get* to access ;; ;; Get test data using test_ids (define (db:get-test-info-by-ids db test-ids) (if (null? test-ids) (begin (debug:print-info 4 "db:get-test-info-by-ids called with test-ids=" test-ids) '()) (let ((res '())) (sqlite3:for-each-row (lambda (id run-id testname state status event-time host cpuload diskfree uname rundir item-path run_duration final_logf comment pass_count fail_count) ;; 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 (set! res (cons (vector id run-id testname state status event-time host cpuload diskfree uname rundir item-path run_duration final_logf comment pass_count fail_count) res))) db (conc "SELECT id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment,pass_count,fail_count FROM tests WHERE id in (" (string-intersperse (map conc test-ids) ",") ");")) res))) (define (db:get-test-info db run-id testname item-path) (db:get-test-info-by-id db (db:get-test-id db run-id testname item-path))) (define (db:test-get-rundir-from-test-id db test-id) |
︙ | ︙ | |||
1515 1516 1517 1518 1519 1520 1521 | ;; db-get-test-steps-for-run (define (db:get-steps-for-test db test-id) (let* ((res '())) (sqlite3:for-each-row (lambda (id test-id stepname state status event-time logfile) (set! res (cons (vector id test-id stepname state status event-time (if (string? logfile) logfile "")) res))) db | | | | 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 | ;; db-get-test-steps-for-run (define (db:get-steps-for-test db test-id) (let* ((res '())) (sqlite3:for-each-row (lambda (id test-id stepname state status event-time logfile) (set! res (cons (vector id test-id stepname state status event-time (if (string? logfile) logfile "")) res))) db "SELECT id,test_id,stepname,state,status,event_time,logfile FROM test_steps WHERE status != 'DELETED' AND test_id=? ORDER BY id ASC;" ;; event_time DESC,id ASC; test-id) (reverse res))) (define (db:get-steps-data db test-id) (let ((res '())) (sqlite3:for-each-row (lambda (id test-id stepname state status event-time logfile) (set! res (cons (vector id test-id stepname state status event-time (if (string? logfile) logfile "")) res))) db "SELECT id,test_id,stepname,state,status,event_time,logfile FROM test_steps WHERE status != 'DELETED' AND test_id=? ORDER BY id ASC;" ;; event_time DESC,id ASC; test-id) (reverse res))) ;;====================================================================== ;; T E S T D A T A ;;====================================================================== |
︙ | ︙ | |||
1550 1551 1552 1553 1554 1555 1556 | (set! fail-count fcount) (set! pass-count pcount)) db "SELECT (SELECT count(id) FROM test_data WHERE test_id=? AND status like 'fail') AS fail_count, (SELECT count(id) FROM test_data WHERE test_id=? AND status like 'pass') AS pass_count;" test-id test-id) ;; Now rollup the counts to the central megatest.db | | | 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 | (set! fail-count fcount) (set! pass-count pcount)) db "SELECT (SELECT count(id) FROM test_data WHERE test_id=? AND status like 'fail') AS fail_count, (SELECT count(id) FROM test_data WHERE test_id=? AND status like 'pass') AS pass_count;" test-id test-id) ;; Now rollup the counts to the central megatest.db (db:general-call db 'pass-fail-counts (list pass-count fail-count test-id)) ;; if the test is not FAIL then set status based on the fail and pass counts. (db:general-call db 'test_data-pf-rollup (list test-id test-id test-id test-id)))) (define (db:csv->test-data db test-id csvdata) (debug:print 4 "test-id " test-id ", csvdata: " csvdata) (let ((csvlist (csv->list (make-csv-reader (open-input-string csvdata) |
︙ | ︙ | |||
1791 1792 1793 1794 1795 1796 1797 | '(set-test-state "UPDATE tests SET state=? WHERE id=?;") '(set-test-status "UPDATE tests SET state=? WHERE id=?;") '(state-status "UPDATE tests SET state=?,status=? WHERE id=?;") '(state-status-msg "UPDATE tests SET state=?,status=?,comment=? WHERE id=?;") ;; Test comment '(set-test-comment "UPDATE tests SET comment=? WHERE id=?;") '(set-test-start-time "UPDATE tests SET event_time=strftime('%s','now') WHERE id=?;") | | | 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 | '(set-test-state "UPDATE tests SET state=? WHERE id=?;") '(set-test-status "UPDATE tests SET state=? WHERE id=?;") '(state-status "UPDATE tests SET state=?,status=? WHERE id=?;") '(state-status-msg "UPDATE tests SET state=?,status=?,comment=? WHERE id=?;") ;; Test comment '(set-test-comment "UPDATE tests SET comment=? WHERE id=?;") '(set-test-start-time "UPDATE tests SET event_time=strftime('%s','now') WHERE id=?;") '(pass-fail-counts "UPDATE tests SET pass_count=?,fail_count=? WHERE id=?;") ;; test_data-pf-rollup is used to set a tests PASS/FAIL based on the pass/fail info from the steps '(test_data-pf-rollup "UPDATE tests SET status=CASE WHEN (SELECT fail_count FROM tests WHERE id=?) > 0 THEN 'FAIL' WHEN (SELECT pass_count FROM tests WHERE id=?) > 0 AND (SELECT status FROM tests WHERE id=?) NOT IN ('WARN','FAIL') THEN 'PASS' |
︙ | ︙ | |||
1834 1835 1836 1837 1838 1839 1840 | WHERE run_id=? AND testname=? AND item_path != '' AND status = 'SKIP') > 0 THEN 'SKIP' ELSE 'UNKNOWN' END WHERE run_id=? AND testname=? AND item_path='';") ;; STEPS | | | 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 | WHERE run_id=? AND testname=? AND item_path != '' AND status = 'SKIP') > 0 THEN 'SKIP' ELSE 'UNKNOWN' END WHERE run_id=? AND testname=? AND item_path='';") ;; STEPS '(delete-test-step-records "UPDATE test_steps SET status='DELETED' WHERE id=?;") '(delete-test-data-records "UPDATE test_data SET status='DELETED' WHERE id=?;") ;; using status since no state field )) ;; do not run these as part of the transaction (define db:special-queries '(rollup-tests-pass-fail ;; db:roll-up-pass-fail-counts ;; WHY NOT!? login |
︙ | ︙ |
Modified db_records.scm from [0d200cb062] to [f39e373ffe].
︙ | ︙ | |||
10 11 12 13 14 15 16 17 18 19 20 21 22 23 | (define-inline (db:test-get-diskfree vec) (vector-ref vec 8)) (define-inline (db:test-get-uname vec) (vector-ref vec 9)) (define-inline (db:test-get-rundir vec) (vector-ref vec 10)) (define-inline (db:test-get-item-path vec) (vector-ref vec 11)) (define-inline (db:test-get-run_duration vec) (vector-ref vec 12)) (define-inline (db:test-get-final_logf vec) (vector-ref vec 13)) (define-inline (db:test-get-comment vec) (vector-ref vec 14)) (define-inline (db:test-get-fullname vec) (conc (db:test-get-testname vec) "/" (db:test-get-item-path vec))) (define-inline (db:test-get-first_err vec) (printable (vector-ref vec 15))) (define-inline (db:test-get-first_warn vec) (printable (vector-ref vec 16))) (define-inline (db:test-set-cpuload! vec val)(vector-set! vec 7 val)) | > > | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | (define-inline (db:test-get-diskfree vec) (vector-ref vec 8)) (define-inline (db:test-get-uname vec) (vector-ref vec 9)) (define-inline (db:test-get-rundir vec) (vector-ref vec 10)) (define-inline (db:test-get-item-path vec) (vector-ref vec 11)) (define-inline (db:test-get-run_duration vec) (vector-ref vec 12)) (define-inline (db:test-get-final_logf vec) (vector-ref vec 13)) (define-inline (db:test-get-comment vec) (vector-ref vec 14)) (define-inline (db:test-get-pass_count vec) (vector-ref vec 15)) (define-inline (db:test-get-fail_count vec) (vector-ref vec 16)) (define-inline (db:test-get-fullname vec) (conc (db:test-get-testname vec) "/" (db:test-get-item-path vec))) (define-inline (db:test-get-first_err vec) (printable (vector-ref vec 15))) (define-inline (db:test-get-first_warn vec) (printable (vector-ref vec 16))) (define-inline (db:test-set-cpuload! vec val)(vector-set! vec 7 val)) |
︙ | ︙ |
Modified megatest.scm from [5ef722ccf8] to [7ff16c8955].
︙ | ︙ | |||
630 631 632 633 634 635 636 | (print " cpuload: " (db:test-get-cpuload test) "\n diskfree: " (db:test-get-diskfree test) "\n uname: " (db:test-get-uname test) "\n rundir: " (db:test-get-rundir test) ) ;; Each test ;; DO NOT remote run | | | 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 | (print " cpuload: " (db:test-get-cpuload test) "\n diskfree: " (db:test-get-diskfree test) "\n uname: " (db:test-get-uname test) "\n rundir: " (db:test-get-rundir test) ) ;; Each test ;; DO NOT remote run (let ((steps (db:get-steps-for-test db (db:test-get-id test)))) (for-each (lambda (step) (format #t " Step: ~20a State: ~10a Status: ~10a Time ~22a\n" (tdb:step-get-stepname step) (tdb:step-get-state step) (tdb:step-get-status step) |
︙ | ︙ |
Modified tests/unittests/server.scm from [4b5ecf2866] to [b1c30eb42e].
︙ | ︙ | |||
79 80 81 82 83 84 85 86 87 88 | (test "get local testinfo" "test1" (vector-ref (db:get-testinfo-state-status *db* 1) 2)) (test "get testinfo" "test1" (vector-ref (rmt:get-testinfo-state-status 1) 2)) ;;====================================================================== ;; D B ;;====================================================================== (test #f '(#t "exit process started") (rmt:kill-server)) ;; *toppath* *my-client-signature* #f))) | > > > > > > > > > > > > > > > > > > > > > > > > > > | 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 | (test "get local testinfo" "test1" (vector-ref (db:get-testinfo-state-status *db* 1) 2)) (test "get testinfo" "test1" (vector-ref (rmt:get-testinfo-state-status 1) 2)) ;;====================================================================== ;; D B ;;====================================================================== (test "pass fail counts" #t (rmt:general-call 'pass-fail-counts 10 9 1)) (test "get pass fail counts" 19 (let ((dat (rmt:get-test-info-by-id 1))) (+ (db:test-get-pass_count dat) (db:test-get-fail_count dat)))) (define testregistry (make-hash-table)) (for-each (lambda (tname) (for-each (lambda (itempath) (let ((tkey (conc tname "/" itempath)) (rpass (random 10)) (rfail (random 10))) (hash-table-set! testregistry tkey (list tname itempath)) (rmt:general-call 'register-test 1 tname itempath) (let* ((tid (rmt:get-test-id 1 tname itempath)) (tdat (rmt:get-test-info-by-id tid))) (rmt:general-call 'pass-fail-counts rpass rfail (db:test-get-id tdat)) (let* ((resdat (rmt:get-test-info-by-id tid))) (test "set/get pass fail counts" (list rpass rfail) (list (db:test-get-pass_count resdat) (db:test-get-fail_count resdat))))))) (list "" "a" "b" "c" "d" "e" "f" "g" "h" "i" "j"))) (list "test1" "test2" "test3" "test4" "test5")) (test #f '(#t "exit process started") (rmt:kill-server)) ;; *toppath* *my-client-signature* #f))) |