Overview
Comment: | Raw porting to dbstruct system done |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | refactor-db |
Files: | files | file ages | folders |
SHA1: |
fef516eecca2c5c0ac1f4156a9fe6c07 |
User & Date: | matt on 2013-10-17 23:46:58 |
Other Links: | branch diff | manifest | tags |
Context
2013-10-17
| ||
23:52 | Merged in couple additional changes from v1.55 check-in: 42ccc89874 user: matt tags: refactor-db | |
23:46 | Raw porting to dbstruct system done check-in: fef516eecc user: matt tags: refactor-db | |
00:19 | More conversion done for move to divided db check-in: 37d1161e33 user: matt tags: refactor-db | |
Changes
Modified db.scm from [d81032bdb1] to [887e6a835b].
︙ | ︙ | |||
26 27 28 29 30 31 32 33 34 35 36 37 38 39 | (declare (unit db)) (declare (uses common)) (declare (uses keys)) (declare (uses ods)) (declare (uses fs-transport)) (declare (uses client)) (declare (uses mt)) (include "common_records.scm") (include "db_records.scm") (include "key_records.scm") (include "run_records.scm") ;; timestamp type (val1 val2 ...) | > | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | (declare (unit db)) (declare (uses common)) (declare (uses keys)) (declare (uses ods)) (declare (uses fs-transport)) (declare (uses client)) (declare (uses mt)) (declare (uses filedb)) (include "common_records.scm") (include "db_records.scm") (include "key_records.scm") (include "run_records.scm") ;; timestamp type (val1 val2 ...) |
︙ | ︙ | |||
51 52 53 54 55 56 57 58 59 60 61 62 63 64 | (if db db (let ((db (open-db run-id))) (if run-id (hash-table-set! (vector-ref dbstruct 1) run-id db) (vector-set! dbstruct 0 db)) db)))) ;; This routine creates the db. It is only called if the db is not already opened ;; (define (open-db dbstruct run-id) ;; (conc *toppath* "/megatest.db") (car *configinfo*))) (if (not *toppath*) (if (not (setup-for-run)) (begin | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 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 | (if db db (let ((db (open-db run-id))) (if run-id (hash-table-set! (vector-ref dbstruct 1) run-id db) (vector-set! dbstruct 0 db)) db)))) ;;====================================================================== ;; K E E P F I L E D B I N dbstruct ;;====================================================================== (define (db:get-filedb dbstruct) (let ((db (vector-ref dbstruct 2))) (if db db (let ((fdb (filedb:open-db (conc *toplevel* "/db/files.db")))) (vector-set! dbstruct 2 fdb) fdb)))) ;; Can also be used to save arbitrary strings ;; (define (db:save-path dbstruct path) (let ((fdb (db:get-filedb dbstruct))) (filedb:register-path fdb path))) ;; Use to get a path. To get an arbitrary string see next define ;; (define (db:get-path dbstruct id) (let ((fdb (db:get-filedb dbstruct))) (filedb:get-path db id))) ;;====================================================================== ;; U S E F I L E D B T O S T O R E S T R I N G S ;; ;; N O T E ! ! T H I S C L O B B E R S M U L T I P L E //// T O / ;; ;; Replace with something proper! ;; ;;====================================================================== ;; Use to save a stored string, pad with _ to deal with trimming the prepending of / ;; (define (db:save-string dbstruct str) (let ((fdb (db:get-filedb dbstruct))) (filedb:register-path fdb (conc "_" str)))) ;; Use to get a stored string ;; (define (db:get-string dbstruct id) (let ((fdb (db:get-filedb dbstruct))) (string-drop (filedb:get-path fdb id) 2))) ;; This routine creates the db. It is only called if the db is not already opened ;; (define (open-db dbstruct run-id) ;; (conc *toppath* "/megatest.db") (car *configinfo*))) (if (not *toppath*) (if (not (setup-for-run)) (begin |
︙ | ︙ | |||
1052 1053 1054 1055 1056 1057 1058 | (define (db:test-set-comment dbstruct run-id test-id comment) (sqlite3:execute (db:get-db dbstruct run-id) "UPDATE tests SET comment=? WHERE id=?;" comment test-id)) | | | < < < < < < < < < | | | | < < < | < | | | > | | | 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 | (define (db:test-set-comment dbstruct run-id test-id comment) (sqlite3:execute (db:get-db dbstruct run-id) "UPDATE tests SET comment=? WHERE id=?;" comment test-id)) (define (db:test-set-rundir! dbstruct run-id test-name item-path rundir-id) (sqlite3:execute (db:get-db dbstruct run-id)(db:lookup-query 'test-set-rundir) test-name item-path)) (define (db:test-set-rundir-by-test-id dbstruct run-id test-id rundir-id) (sqlite3:execute (db:get-db dbstruct run-id) 'test-set-rundir-by-test-id rundir-id test-id)) (define (db:test-get-rundir-from-test-id dbstruct run-id test-id) (let ((res #f)) (sqlite3:for-each-row (lambda (tpath) (set! res tpath)) (db:get-db dbstruct run-id) "SELECT rundir FROM tests WHERE id=?;" test-id) res)) (define (db:test-set-log! dbstruct run-id test-id logf-id) (if (string? logf)(sqlite3:execute (db:get-db dbstruct run-id) 'test-set-log logf-id test-id))) ;;====================================================================== ;; Misc. test related queries ;;====================================================================== ;; MUST BE CALLED local! ;; (define (db:test-get-paths-matching dbstruct keynames target fnamepatt #!key (res '())) ;; BUG: Move the values derived from args to parameters and push to megatest.scm (let* ((testpatt (if (args:get-arg "-testpatt")(args:get-arg "-testpatt") "%")) (statepatt (if (args:get-arg ":state") (args:get-arg ":state") "%")) (statuspatt (if (args:get-arg ":status") (args:get-arg ":status") "%")) (runname (if (args:get-arg ":runname") (args:get-arg ":runname") "%")) (paths-from-db (db:test-get-paths-matching-keynames-target-new dbstruct keynames target res testpatt: testpatt statepatt: statepatt statuspatt: statuspatt runname: runname))) (if fnamepatt (apply append (map (lambda (p) |
︙ | ︙ | |||
1133 1134 1135 1136 1137 1138 1139 | (sqlite3:for-each-row (lambda (p) (set! res (cons p res))) db qrystr) res)) | | | | > | | | | | > > > | | | | | | | | | | | | | | | | | 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 | (sqlite3:for-each-row (lambda (p) (set! res (cons p res))) db qrystr) res)) (define (db:test-get-paths-matching-keynames-target-new dbstruct keynames target res #!key (testpatt "%") (statepatt "%") (statuspatt "%") (runname "%")) (let* ((row-ids '()) (keystr (string-intersperse (map (lambda (key val) (conc key " like '" val "'")) keynames (string-split target "/")) " AND ")) (testqry (tests:match->sqlqry testpatt)) (runsqry (sqlite3:prepare (db:get-db dbstruct #f)(conc "SELECT id FROM runs WHERE " keystr " AND runname LIKE '" runname "';"))) (tstsqry (conc "SELECT rundir_id FROM tests WHERE " testqry " AND state LIKE '" statepatt "' AND status LIKE '" statuspatt "' ORDER BY event_time ASC;"))) (sqlite3:for-each-row (lambda (rid) (set! row-ids (cons rid row-ids))) runsqry) (for-each (lambda (rid) (sqlite3:for-each-row (lambda (p) (set! res (cons p res))) (db:get-db dbstruct rid) tstsqry)) row-ids) ;; (sqlite3:finalize! tstsqry) (sqlite3:finalize! runsqry) res)) ;; NEVER FINISHED? ;; look through tests from matching runs for a file ;; NEVER FINISHED? (define (db:test-get-first-path-matching dbstruct keynames target fname) ;; NEVER FINISHED? ;; [refpaths] is the section where references to other megatest databases are stored ;; NEVER FINISHED? ;; ;; NEVER FINISHED? ;; NEED TO REVISIT THIS!!! BUGGISHNESS ;; NEVER FINISHED? ;; ;; NEVER FINISHED? (let ((mt-paths (configf:get-section "refpaths")) ;; NEVER FINISHED? (res (db:test-get-paths-matching dbstruct keynames target fname))) ;; NEVER FINISHED? (let loop ((pathdat (if (null? paths) #f (car mt-paths))) ;; NEVER FINISHED? (tal (if (null? paths) '()(cdr mt-paths)))) ;; NEVER FINISHED? (if (not (null? res)) ;; NEVER FINISHED? (car res) ;; return first found ;; NEVER FINISHED? (if path ;; NEVER FINISHED? (let* ((db (open-db path: (cadr pathdat))) ;; NEVER FINISHED? (newres (db:test-get-paths-matching db keynames target fname))) ;; NEVER FINISHED? (debug:print-info 4 "Trying " (car pathdat) " at " (cadr pathdat)) ;; NEVER FINISHED? (sqlite3:finalize! db) ;; NEVER FINISHED? (if (not (null? newres)) ;; NEVER FINISHED? (car newres) ;; NEVER FINISHED? (if (null? tal) ;; NEVER FINISHED? #f ;; NEVER FINISHED? (loop (car tal)(cdr tal)))))))))) ;;====================================================================== ;; QUEUE UP META, TEST STATUS AND STEPS REMOTE ACCESS ;;====================================================================== ;; NOTE: Can remove the regex and base64 encoding for zmq (define (db:obj->string obj) |
︙ | ︙ | |||
1229 1230 1231 1232 1233 1234 1235 | ;; ;; cdb:client-call is the unified interface to all the transports. It dispatches the ;; query to a server routine (e.g. server:client-send-recieve) that ;; transports the data to the server where it is passed to db:process-queue-item ;; which either returns the data to the calling server routine or ;; directly calls the returning procedure (e.g. zmq). ;; | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | < > | | | | | | | | | | | | | | | | > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > | | > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > > > > | < < < < | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > | | > > | | | | | | > | | | | | | < < < | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | < | < < | | | | | | < | < | | | | < | < < | | | | | | | < | | | < < < < < < < < < | | < < < < < < < < < < < < | | < | < < | | | | | | < | < | | | 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 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 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 | ;; ;; cdb:client-call is the unified interface to all the transports. It dispatches the ;; query to a server routine (e.g. server:client-send-recieve) that ;; transports the data to the server where it is passed to db:process-queue-item ;; which either returns the data to the calling server routine or ;; directly calls the returning procedure (e.g. zmq). ;; ;; (define (cdb:client-call serverdat qtype immediate numretries . params) ;; (debug:print-info 11 "cdb:client-call serverdat=" serverdat ", qtype=" qtype ", immediate=" immediate ", numretries=" numretries ", params=" params) ;; (case *transport-type* ;; ((fs) ;; (let ((packet (vector "na" qtype immediate "na" params 0))) ;; (fs:process-queue-item packet))) ;; ((http) ;; (let* ((client-sig (client:get-signature)) ;; (query-sig (message-digest-string (md5-primitive) (conc qtype immediate params))) ;; (zdat (db:obj->string (vector client-sig qtype immediate query-sig params (current-seconds))))) ;; (with-output-to-string (lambda ()(serialize params)))) ;; (debug:print-info 11 "zdat=" zdat) ;; (let* ((res #f) ;; (rawdat (http-transport:client-send-receive serverdat zdat)) ;; (tmp #f)) ;; (debug:print-info 11 "Sent " zdat ", received " rawdat) ;; (if rawdat ;; (begin ;; (set! tmp (db:string->obj rawdat)) ;; (vector-ref tmp 2)) ;; (begin ;; (debug:print 0 "ERROR: Communication with the server failed. Exiting if possible") ;; (exit 1)))))) ;; ((zmq) ;; (handle-exceptions ;; exn ;; (begin ;; (debug:print-info 0 "cdb:client-call timeout or error. Trying again in 5 seconds") ;; (thread-sleep! 5) ;; (if (> numretries 0)(apply cdb:client-call serverdat qtype immediate (- numretries 1) params))) ;; (let* ((push-socket (vector-ref serverdat 0)) ;; (sub-socket (vector-ref serverdat 1)) ;; (client-sig (client:get-signature)) ;; (query-sig (message-digest-string (md5-primitive) (conc qtype immediate params))) ;; (zdat (db:obj->string (vector client-sig qtype immediate query-sig params (current-seconds)))) ;; (with-output-to-string (lambda ()(serialize params)))) ;; (res #f) ;; (send-receive (lambda () ;; (debug:print-info 11 "sending message") ;; (send-message push-socket zdat) ;; (debug:print-info 11 "message sent") ;; (let loop () ;; ;; get the sender info ;; ;; this should match (client:get-signature) ;; ;; we will need to process "all" messages here some day ;; (receive-message* sub-socket) ;; ;; now get the actual message ;; (let ((myres (db:string->obj (receive-message* sub-socket)))) ;; (if (equal? query-sig (vector-ref myres 1)) ;; (set! res (vector-ref myres 2)) ;; (loop))))))) ;; ;; (timeout (lambda () ;; ;; (let loop ((n numretries)) ;; ;; (thread-sleep! 15) ;; ;; (if (not res) ;; ;; (if (> numretries 0) ;; ;; (begin ;; ;; (debug:print 2 "WARNING: no reply to query " params ", trying resend") ;; ;; (debug:print-info 11 "re-sending message") ;; ;; (send-message push-socket zdat) ;; ;; (debug:print-info 11 "message re-sent") ;; ;; (loop (- n 1))) ;; ;; ;; (apply cdb:client-call *runremote* qtype immediate (- numretries 1) params)) ;; ;; (begin ;; ;; (debug:print 0 "ERROR: cdb:client-call timed out " params ", exiting.") ;; ;; (exit 5)))))))) ;; (debug:print-info 11 "Starting threads") ;; (let ((th1 (make-thread send-receive "send receive")) ;; ;; (th2 (make-thread timeout "timeout")) ;; ) ;; (thread-start! th1) ;; ;; (thread-start! th2) ;; (thread-join! th1) ;; (debug:print-info 11 "cdb:client-call returning res=" res) ;; res)))))) ;; NOT NEEDED FOR NOW (define (cdb:set-verbosity serverdat val) ;; NOT NEEDED FOR NOW (cdb:client-call serverdat 'set-verbosity #f *default-numtries* val)) ;; NOT NEEDED FOR NOW ;; NOT NEEDED FOR NOW (define (cdb:login serverdat keyval signature) ;; NOT NEEDED FOR NOW (cdb:client-call serverdat 'login #t *default-numtries* keyval megatest-version signature)) ;; NOT NEEDED FOR NOW ;; NOT NEEDED FOR NOW (define (cdb:logout serverdat keyval signature) ;; NOT NEEDED FOR NOW (cdb:client-call serverdat 'logout #t *default-numtries* keyval signature)) ;; NOT NEEDED FOR NOW ;; NOT NEEDED FOR NOW (define (cdb:num-clients serverdat) ;; NOT NEEDED FOR NOW (cdb:client-call serverdat 'numclients #t *default-numtries*)) ;; NOT NEEDED FOR NOW ;; I think this would be more efficient if executed on client side FIXME??? (define (db:test-set-status-state dbstruct run-id test-id status state msg-id) (if (member state '("LAUNCHED" "REMOTEHOSTSTART")) (sqlite3:execute (db:get-db dbstruct run-id) 'set-test-start-time test-id)) (if msg (sqlite3:execute (db:get-db dbstruct run-id) 'state-status-msg state status msg-id test-id) (sqlite3:execute (db:get-db dbstruct run-id) 'state-status state status test-id))) (define (db:test-rollup-test_data-pass-fail dbstruct run-id test-id) (sqlite3:execute (db:get-db dbstruct run-id) 'test_data-pf-rollup test-id test-id test-id test-id)) (define (db:pass-fail-counts dbstruct run-id test-id fail-count pass-count) (sqlite3:execute (db:get-db dbstruct run-id) 'pass-fail-counts fail-count pass-count test-id)) (define (db:tests-register-test dbstruct run-id test-name item-path) (sqlite3:execute (db:get-db dbstruct run-id) 'register-test run-id test-name item-path)) ;; more transactioned calls, these for roll-up-pass-fail stuff (define (db:update-pass-fail-counts dbstruct run-id test-name) (sqlite3:execute (db:get-db dbstruct run-id) 'update-fail-pass-counts test-name test-name test-name)) (define (db:top-test-set-running dbstruct run-id test-name) (sqlite3:execute (db:get-db dbstruct run-id) 'top-test-set-running test-name)) (define (db:top-test-set-per-pf-counts dbstruct run-id test-name) (sqlite3:execute (db:get-db dbstruct run-id) 'top-test-set-per-pf-counts test-name test-name test-name)) ;;= ;; NOT NEEDED FOR NOW (define (cdb:flush-queue serverdat) ;; NOT NEEDED FOR NOW (cdb:client-call serverdat 'flush #f *default-numtries*)) ;; NOT NEEDED FOR NOW ;; NOT NEEDED FOR NOW (define (cdb:kill-server serverdat pid) ;; NOT NEEDED FOR NOW (cdb:client-call serverdat 'killserver #t *default-numtries* pid)) ;; (define (cdb:roll-up-pass-fail-counts serverdat run-id test-name item-path status) ;; (cdb:client-call serverdat 'immediate #f *default-numtries* open-run-close db:roll-up-pass-fail-counts #f run-id test-name item-path status)) ;; ;; (define (db:get-test-info serverdat run-id test-name item-path) ;; (cdb:client-call serverdat 'immediate #f *default-numtries* open-run-close db:get-test-info #f run-id test-name item-path)) ;; ;; (define (cdb:get-test-info-by-id serverdat test-id) ;; (let ((test-dat (cdb:client-call serverdat 'immediate #f *default-numtries* open-run-close db:get-test-info-by-id #f test-id))) ;; (hash-table-set! *test-info* test-id (vector (current-seconds) test-dat)) ;; cached for use where up-to-date info is not needed ;; test-dat)) ;; ;; ;; db should be db open proc or #f ;; (define (cdb:remote-run proc db . params) ;; (apply cdb:client-call *runremote* 'immediate #f *default-numtries* open-run-close proc #f params)) ;; (define (db:test-get-logfile-info dbstruct run-id test-name) (let ((res #f)) (sqlite3:for-each-row (lambda (path-id final_logf-id) (let ((path (db:get-path dbstruct path-id)) (final_logf (db:get-string dbstruct final_logf-id))) (set! logf final_logf) (set! res (list path final_logf)) (if (directory? path) (debug:print 2 "Found path: " path) (debug:print 2 "No such path: " path)))) (db:get-db dbstruct run-id) "SELECT rundir_id,final_logf_id FROM tests WHERE testname=? AND item_path='';" test-name) res)) ;;====================================================================== ;; A G R E G A T E D T R A N S A C T I O N D B W R I T E S ;;====================================================================== (define db:queries (list '(register-test "INSERT OR IGNORE INTO tests (run_id,testname,event_time,item_path,state,status) VALUES (?,?,strftime('%s','now'),?,'NOT_STARTED','n/a');") ;; DONE ;; Test state and status '(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=?;") ;; DONE '(state-status-msg "UPDATE tests SET state=?,status=?,comment_id=? WHERE id=?;") ;; DONE ;; Test comment '(set-test-comment "UPDATE tests SET comment_id=? WHERE id=?;") '(set-test-start-time "UPDATE tests SET event_time=strftime('%s','now') WHERE id=?;") ;; DONE '(pass-fail-counts "UPDATE tests SET fail_count=?,pass_count=? WHERE id=?;") ;; DONE ;; 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' ELSE status END WHERE id=?;") ;; DONE '(test-set-log "UPDATE tests SET final_logf_id=? WHERE id=?;") ;; DONE '(test-set-rundir-by-test-id "UPDATE tests SET rundir_id=? WHERE id=?") ;; DONE '(test-set-rundir "UPDATE tests SET rundir_id=? AND testname=? AND item_path=?;") ;; DONE '(delete-tests-in-state "DELETE FROM tests WHERE state=?;") ;; DONE '(tests:test-set-toplog "UPDATE tests SET final_logf=? WHERE run_id=? AND testname=? AND item_path='';") '(update-cpuload-diskfree "UPDATE tests SET cpuload=?,diskfree=? WHERE id=?;") ;; DONE '(update-run-duration "UPDATE tests SET run_duration=? WHERE id=?;") ;; DONE '(update-uname-host "UPDATE tests SET uname=?,host=? WHERE id=?;") ;; DONE '(update-test-state "UPDATE tests SET state=? WHERE state=? AND run_id=? AND testname=? AND NOT (item_path='' AND testname IN (SELECT DISTINCT testname FROM tests WHERE testname=? AND item_path != ''));") '(update-test-status "UPDATE tests SET status=? WHERE status like ? AND run_id=? AND testname=? AND NOT (item_path='' AND testname IN (SELECT DISTINCT testname FROM tests WHERE testname=? AND item_path != ''));") ;; stuff for roll-up-pass-fail-counts '(update-fail-pass-counts "UPDATE tests SET fail_count=(SELECT count(id) FROM tests WHERE testname=? AND item_path != '' AND status IN ('FAIL','CHECK')), pass_count=(SELECT count(id) FROM tests WHERE testname=? AND item_path != '' AND status IN ('PASS','WARN','WAIVED')) WHERE testname=? AND item_path='';") ;; DONE '(top-test-set-running "UPDATE tests SET state='RUNNING' WHERE testname=? AND item_path='';") ;; DONE '(top-test-set-per-pf-counts "UPDATE tests SET state=CASE WHEN (SELECT count(id) FROM tests WHERE testname=? AND item_path != '' AND state in ('RUNNING','NOT_STARTED','LAUNCHED','REMOTEHOSTSTART')) > 0 THEN 'RUNNING' ELSE 'COMPLETED' END, status=CASE WHEN fail_count > 0 THEN 'FAIL' WHEN pass_count > 0 AND fail_count=0 THEN 'PASS' WHEN (SELECT count(id) FROM tests WHERE testname=? AND item_path != '' AND status = 'SKIP') > 0 THEN 'SKIP' ELSE 'UNKNOWN' END WHERE testname=? AND item_path='';") ;; DONE )) (define (db:lookup-query qry-name) (let ((q (alist-ref qry-name db:queries))) (if q (car q) #f))) ;; 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 immediate flush sync set-verbosity killserver )) ;; not used, intended to indicate to run in calling process (define db:run-local-queries '()) ;; rollup-tests-pass-fail)) ;; DISABLING FOR NOW (define (db:process-cached-writes db) ;; DISABLING FOR NOW (let ((queries (make-hash-table)) ;; DISABLING FOR NOW (data #f)) ;; DISABLING FOR NOW (mutex-lock! *incoming-mutex*) ;; DISABLING FOR NOW ;; data is a list of query packets <vector qry-sig query params ;; DISABLING FOR NOW (set! data (reverse *incoming-writes*)) ;; (sort ... (lambda (a b)(< (vector-ref a 1)(vector-ref b 1))))) ;; DISABLING FOR NOW (set! *server:last-write-flush* (current-milliseconds)) ;; DISABLING FOR NOW (set! *incoming-writes* '()) ;; DISABLING FOR NOW (mutex-unlock! *incoming-mutex*) ;; DISABLING FOR NOW (if (> (length data) 0) ;; DISABLING FOR NOW ;; Process if we have data ;; DISABLING FOR NOW (begin ;; DISABLING FOR NOW (debug:print-info 7 "Writing cached data " data) ;; DISABLING FOR NOW ;; DISABLING FOR NOW ;; Prepare the needed sql statements ;; DISABLING FOR NOW ;; ;; DISABLING FOR NOW (for-each (lambda (request-item) ;; DISABLING FOR NOW (let ((stmt-key (vector-ref request-item 0)) ;; DISABLING FOR NOW (query (vector-ref request-item 1))) ;; DISABLING FOR NOW (hash-table-set! queries stmt-key (sqlite3:prepare db query)))) ;; DISABLING FOR NOW data) ;; DISABLING FOR NOW ;; DISABLING FOR NOW ;; No outer loop needed. Single loop for write items only. Reads trigger flush of queue ;; DISABLING FOR NOW ;; and then are executed. ;; DISABLING FOR NOW (sqlite3:with-transaction ;; DISABLING FOR NOW db ;; DISABLING FOR NOW (lambda () ;; DISABLING FOR NOW (for-each ;; DISABLING FOR NOW (lambda (hed) ;; DISABLING FOR NOW (let* ((params (vector-ref hed 2)) ;; DISABLING FOR NOW (stmt-key (vector-ref hed 0)) ;; DISABLING FOR NOW (stmt (hash-table-ref/default queries stmt-key #f))) ;; DISABLING FOR NOW (if stmt ;; DISABLING FOR NOW (apply sqlite3:execute stmt params) ;; DISABLING FOR NOW (debug:print 0 "ERROR: Problem Executing " stmt-key " for " params)))) ;; DISABLING FOR NOW data))) ;; DISABLING FOR NOW ;; DISABLING FOR NOW ;; let all the waiting calls know all is done ;; DISABLING FOR NOW (mutex-lock! *completed-mutex*) ;; DISABLING FOR NOW (for-each (lambda (item) ;; DISABLING FOR NOW (let ((qry-sig (cdb:packet-get-client-sig item))) ;; DISABLING FOR NOW (debug:print-info 7 "Registering query " qry-sig " as done") ;; DISABLING FOR NOW (hash-table-set! *completed-writes* qry-sig #t))) ;; DISABLING FOR NOW data) ;; DISABLING FOR NOW (mutex-unlock! *completed-mutex*) ;; DISABLING FOR NOW ;; DISABLING FOR NOW ;; Finalize the statements. Should this be done inside the mutex above? ;; DISABLING FOR NOW ;; I think sqlite3 mutexes will keep the data safe ;; DISABLING FOR NOW (for-each (lambda (stmt-key) ;; DISABLING FOR NOW (sqlite3:finalize! (hash-table-ref queries stmt-key))) ;; DISABLING FOR NOW (hash-table-keys queries)) ;; DISABLING FOR NOW ;; DISABLING FOR NOW ;; Do a little record keeping ;; DISABLING FOR NOW (let ((cache-size (length data))) ;; DISABLING FOR NOW (if (> cache-size *max-cache-size*) ;; DISABLING FOR NOW (set! *max-cache-size* cache-size))) ;; DISABLING FOR NOW #t) ;; DISABLING FOR NOW #f))) ;; DISABLING FOR NOW ;; DISABLING FOR NOW (define *db:process-queue-mutex* (make-mutex)) ;; DISABLING FOR NOW ;; DISABLING FOR NOW (define *number-of-writes* 0) ;; DISABLING FOR NOW (define *writes-total-delay* 0) ;; DISABLING FOR NOW (define *total-non-write-delay* 0) ;; DISABLING FOR NOW (define *number-non-write-queries* 0) ;; DISABLING FOR NOW ;; DISABLING FOR NOW ;; The queue is a list of vectors where the zeroth slot indicates the type of query to ;; DISABLING FOR NOW ;; apply and the second slot is the time of the query and the third entry is a list of ;; DISABLING FOR NOW ;; values to be applied ;; DISABLING FOR NOW ;; ;; DISABLING FOR NOW (define (db:queue-write-and-wait db qry-sig query params) ;; DISABLING FOR NOW (let ((queue-len 0) ;; DISABLING FOR NOW (res #f) ;; DISABLING FOR NOW (got-it #f) ;; DISABLING FOR NOW (qry-pkt (vector qry-sig query params)) ;; DISABLING FOR NOW (start-time (current-milliseconds)) ;; DISABLING FOR NOW (timeout (+ 10 (current-seconds)))) ;; set the time out to 10 secs in future ;; DISABLING FOR NOW ;; DISABLING FOR NOW ;; Put the item in the queue *incoming-writes* ;; DISABLING FOR NOW (mutex-lock! *incoming-mutex*) ;; DISABLING FOR NOW (set! *incoming-writes* (cons qry-pkt *incoming-writes*)) ;; DISABLING FOR NOW (set! queue-len (length *incoming-writes*)) ;; DISABLING FOR NOW (mutex-unlock! *incoming-mutex*) ;; DISABLING FOR NOW ;; DISABLING FOR NOW (debug:print-info 7 "Current write queue length is " queue-len) ;; DISABLING FOR NOW ;; DISABLING FOR NOW ;; poll for the write to complete, timeout after 10 seconds ;; DISABLING FOR NOW ;; periodic flushing of the queue is taken care of by ;; DISABLING FOR NOW ;; db:flush-queue ;; DISABLING FOR NOW (let loop () ;; DISABLING FOR NOW (thread-sleep! 0.001) ;; DISABLING FOR NOW (mutex-lock! *completed-mutex*) ;; DISABLING FOR NOW (if (hash-table-ref/default *completed-writes* qry-sig #f) ;; DISABLING FOR NOW (begin ;; DISABLING FOR NOW (hash-table-delete! *completed-writes* qry-sig) ;; DISABLING FOR NOW (set! got-it #t))) ;; DISABLING FOR NOW (mutex-unlock! *completed-mutex*) ;; DISABLING FOR NOW (if (and (not got-it) ;; DISABLING FOR NOW (< (current-seconds) timeout)) ;; DISABLING FOR NOW (begin ;; DISABLING FOR NOW (thread-sleep! 0.01) ;; DISABLING FOR NOW (loop)))) ;; DISABLING FOR NOW (set! *number-of-writes* (+ *number-of-writes* 1)) ;; DISABLING FOR NOW (set! *writes-total-delay* (+ *writes-total-delay* (- (current-milliseconds) start-time))) ;; DISABLING FOR NOW got-it)) ;; DISABLING FOR NOW ;; DISABLING FOR NOW (define (db:process-queue-item db item) ;; DISABLING FOR NOW (let* ((stmt-key (cdb:packet-get-qtype item)) ;; DISABLING FOR NOW (qry-sig (cdb:packet-get-query-sig item)) ;; DISABLING FOR NOW (return-address (cdb:packet-get-client-sig item)) ;; DISABLING FOR NOW (params (cdb:packet-get-params item)) ;; DISABLING FOR NOW (query (let ((q (alist-ref stmt-key db:queries))) ;; DISABLING FOR NOW (if q (car q) #f)))) ;; DISABLING FOR NOW (debug:print-info 11 "Special queries/requests stmt-key=" stmt-key ", return-address=" return-address ", query=" query ", params=" params) ;; DISABLING FOR NOW (if query ;; DISABLING FOR NOW ;; hand queries off to the write queue ;; DISABLING FOR NOW (let ((response (case *transport-type* ;; DISABLING FOR NOW ((http) ;; DISABLING FOR NOW (debug:print-info 7 "Queuing item " item " for wrapped write") ;; DISABLING FOR NOW (db:queue-write-and-wait db qry-sig query params)) ;; DISABLING FOR NOW (else ;; DISABLING FOR NOW (apply sqlite3:execute db query params) ;; DISABLING FOR NOW #t)))) ;; DISABLING FOR NOW (debug:print-info 7 "Received " response " from wrapped write") ;; DISABLING FOR NOW (server:reply return-address qry-sig response response)) ;; DISABLING FOR NOW ;; otherwise if appropriate flush the queue (this is a read or complex query) ;; DISABLING FOR NOW (begin ;; DISABLING FOR NOW (cond ;; DISABLING FOR NOW ((member stmt-key db:special-queries) ;; DISABLING FOR NOW (let ((starttime (current-milliseconds))) ;; DISABLING FOR NOW (debug:print-info 9 "Handling special statement " stmt-key) ;; DISABLING FOR NOW (case stmt-key ;; DISABLING FOR NOW ((immediate) ;; DISABLING FOR NOW ;; This is a read or mixed read-write query, must clear the cache ;; DISABLING FOR NOW (case *transport-type* ;; DISABLING FOR NOW ((http) ;; DISABLING FOR NOW (mutex-lock! *db:process-queue-mutex*) ;; DISABLING FOR NOW (db:process-cached-writes db) ;; DISABLING FOR NOW (mutex-unlock! *db:process-queue-mutex*))) ;; DISABLING FOR NOW (let* ((proc (car params)) ;; DISABLING FOR NOW (remparams (cdr params)) ;; DISABLING FOR NOW ;; we are being handed a procedure so call it ;; DISABLING FOR NOW ;; (debug:print-info 11 "Running (apply " proc " " remparams ")") ;; DISABLING FOR NOW (result (server:reply return-address qry-sig #t (apply proc remparams)))) ;; DISABLING FOR NOW (set! *total-non-write-delay* (+ *total-non-write-delay* (- (current-milliseconds) starttime))) ;; DISABLING FOR NOW (set! *number-non-write-queries* (+ *number-non-write-queries* 1)) ;; DISABLING FOR NOW result)) ;; DISABLING FOR NOW ((login) ;; DISABLING FOR NOW (if (< (length params) 3) ;; should get toppath, version and signature ;; DISABLING FOR NOW (server:reply return-address qry-sig '(#f "login failed due to missing params")) ;; missing params ;; DISABLING FOR NOW (let ((calling-path (car params)) ;; DISABLING FOR NOW (calling-vers (cadr params)) ;; DISABLING FOR NOW (client-key (caddr params))) ;; DISABLING FOR NOW (if (and (equal? calling-path *toppath*) ;; DISABLING FOR NOW (equal? megatest-version calling-vers)) ;; DISABLING FOR NOW (begin ;; DISABLING FOR NOW (hash-table-set! *logged-in-clients* client-key (current-seconds)) ;; DISABLING FOR NOW (server:reply return-address qry-sig #t '(#t "successful login"))) ;; path matches - pass! Should vet the caller at this time ... ;; DISABLING FOR NOW (server:reply return-address qry-sig #f (list #f (conc "Login failed due to mismatch paths: " calling-path ", " *toppath*))))))) ;; DISABLING FOR NOW ((flush sync) ;; DISABLING FOR NOW (server:reply return-address qry-sig #t 1)) ;; (length data))) ;; DISABLING FOR NOW ((set-verbosity) ;; DISABLING FOR NOW (set! *verbosity* (car params)) ;; DISABLING FOR NOW (server:reply return-address qry-sig #t (list #t *verbosity*))) ;; DISABLING FOR NOW ((killserver) ;; DISABLING FOR NOW (let ((hostname (car *runremote*)) ;; DISABLING FOR NOW (port (cadr *runremote*)) ;; DISABLING FOR NOW (pid (car params))) ;; DISABLING FOR NOW (debug:print 0 "WARNING: Server on " hostname ":" port " going down by user request!") ;; DISABLING FOR NOW (debug:print-info 1 "current pid=" (current-process-id)) ;; DISABLING FOR NOW (open-run-close tasks:server-deregister tasks:open-db ;; DISABLING FOR NOW hostname ;; DISABLING FOR NOW port: port) ;; DISABLING FOR NOW (set! *server-run* #f) ;; DISABLING FOR NOW (thread-sleep! 3) ;; DISABLING FOR NOW (process-signal pid signal/kill) ;; DISABLING FOR NOW (server:reply return-address qry-sig #t '(#t "exit process started")))) ;; DISABLING FOR NOW (else ;; not a command, i.e. is a query ;; DISABLING FOR NOW (debug:print 0 "ERROR: Unrecognised query/command " stmt-key) ;; DISABLING FOR NOW (server:reply return-address qry-sig #f 'failed))))) ;; DISABLING FOR NOW (else ;; DISABLING FOR NOW (debug:print-info 11 "Executing " stmt-key " for " params) ;; DISABLING FOR NOW (apply sqlite3:execute (hash-table-ref queries stmt-key) params) ;; DISABLING FOR NOW (server:reply return-address qry-sig #t #t))))))) ;; DISABLING FOR NOW (define (db:test-get-records-for-index-file dbstruct run-id test-name) (let ((res '())) (sqlite3:for-each-row (lambda (id itempath state status run_duration logf-id comment-id) (let ((logf (db:get-string dbstruct logf-id)) (comment (db:get-string dbstruct comment-id))) (set! res (cons (vector id itempath state status run_duration logf comment) res))) (db:get-db dbstruct run-id) "SELECT id,item_path,state,status,run_duration,final_logf_id,comment_id FROM tests WHERE testname=? AND item_path != '';" test-name) res))) ;;====================================================================== ;; Tests meta data ;;====================================================================== ;; read the record given a testname (define (db:testmeta-get-record dbstruct testname) (let ((res #f)) (sqlite3:for-each-row (lambda (id testname author owner description reviewed iterated avg_runtime avg_disk tags) (set! res (vector id testname author owner description reviewed iterated avg_runtime avg_disk tags))) (db:get-db dbstruct #f) "SELECT id,testname,author,owner,description,reviewed,iterated,avg_runtime,avg_disk,tags FROM test_meta WHERE testname=?;" testname) res)) ;; create a new record for a given testname (define (db:testmeta-add-record dbstruct testname) (sqlite3:execute (db:get-db dbstruct #f) "INSERT OR IGNORE INTO test_meta (testname,author,owner,description,reviewed,iterated,avg_runtime,avg_disk,tags) VALUES (?,'','','','','','','','');" testname)) ;; update one of the testmeta fields (define (db:testmeta-update-field dbstruct testname field value) (sqlite3:execute (db:get-db dbstruct #f) (conc "UPDATE test_meta SET " field "=? WHERE testname=?;") value testname)) ;;====================================================================== ;; T E S T D A T A ;;====================================================================== (define (db:csv->test-data dbstruct run-id test-id csvdata) (let ((csvlist (csv->list (make-csv-reader (open-input-string csvdata) '((strip-leading-whitespace? #t) (strip-trailing-whitespace? #t)) )))) ;; (csv->list csvdata))) (for-each (lambda (csvrow) (let* ((padded-row (take (append csvrow (list #f #f #f #f #f #f #f #f #f)) 9)) (category (list-ref padded-row 0)) (variable (list-ref padded-row 1)) (value (any->number-if-possible (list-ref padded-row 2))) (expected (any->number-if-possible (list-ref padded-row 3))) (tol (any->number-if-possible (list-ref padded-row 4))) ;; >, <, >=, <=, or a number (units (list-ref padded-row 5)) (comment (list-ref padded-row 6)) (status (let ((s (list-ref padded-row 7))) (if (and (string? s)(or (string-match (regexp "^\\s*$") s) (string-match (regexp "^n/a$") s))) #f s))) ;; if specified on the input then use, else calculate (type (list-ref padded-row 8))) ;; look up expected,tol,units from previous best fit test if they are all either #f or '' (debug:print 4 "BEFORE: category: " category " variable: " variable " value: " value ", expected: " expected " tol: " tol " units: " units " status: " status " comment: " comment " type: " type) (if (and (or (not expected)(equal? expected "")) (or (not tol) (equal? expected "")) (or (not units) (equal? expected ""))) (let-values (((new-expected new-tol new-units)(db:get-prev-tol-for-test dbstruct run-id test-id category variable))) (set! expected new-expected) (set! tol new-tol) (set! units new-units))) (debug:print 4 "AFTER: category: " category " variable: " variable " value: " value ", expected: " expected " tol: " tol " units: " units " status: " status " comment: " comment) ;; calculate status if NOT specified (if (and (not status)(number? expected)(number? value)) ;; need expected and value to be numbers (if (number? tol) ;; if tol is a number then we do the standard comparison (let* ((max-val (+ expected tol)) (min-val (- expected tol)) (result (and (>= value min-val)(<= value max-val)))) (debug:print 4 "max-val: " max-val " min-val: " min-val " result: " result) (set! status (if result "pass" "fail"))) (set! status ;; NB// need to assess each one (i.e. not return operator since need to act if not valid op. (case (string->symbol tol) ;; tol should be >, <, >=, <= ((>) (if (> value expected) "pass" "fail")) ((<) (if (< value expected) "pass" "fail")) ((>=) (if (>= value expected) "pass" "fail")) ((<=) (if (<= value expected) "pass" "fail")) (else (conc "ERROR: bad tol comparator " tol)))))) (debug:print 4 "AFTER2: category: " category " variable: " variable " value: " value ", expected: " expected " tol: " tol " units: " units " status: " status " comment: " comment) (sqlite3:execute (db:get-db dbstruct run-id) "INSERT OR REPLACE INTO test_data (test_id,category,variable,value,expected,tol,units,comment,status,type) VALUES (?,?,?,?,?,?,?,?,?,?);" test-id category variable value expected tol units (if comment comment "") status type))) csvlist))) ;; get a list of test_data records matching categorypatt (define (db:read-test-data dbstruct run-id test-id categorypatt) (let ((res '())) (sqlite3:for-each-row (lambda (id test_id category variable value expected tol units comment status type) (set! res (cons (vector id test_id category variable value expected tol units comment status type) res))) (db:get-db dbstruct run-id) "SELECT id,test_id,category,variable,value,expected,tol,units,comment,status,type FROM test_data WHERE test_id=? AND category LIKE ? ORDER BY category,variable;" test-id categorypatt) (reverse res))) ;; NOTE: Run this local with #f for db !!! (define (db:load-test-data dbstruct run-id test-id) (let loop ((lin (read-line))) (if (not (eof-object? lin)) (begin (debug:print 4 lin) (db:csv->test-data dbstruct run-id test-id lin) (loop (read-line))))) ;; roll up the current results. ;; FIXME: Add the status to (db:test-data-rollup dbstruct run-id test-id #f)) ;; WARNING: Do NOT call this for the parent test on an iterated test ;; Roll up test_data pass/fail results ;; look at the test_data status field, ;; if all are pass (any case) and the test status is PASS or NULL or '' then set test status to PASS. ;; if one or more are fail (any case) then set test status to PASS, non "pass" or "fail" are ignored (define (db:test-data-rollup dbstruct run-id test-id status) (let ((fail-count 0) (pass-count 0)) (sqlite3:for-each-row (lambda (fcount pcount) (set! fail-count fcount) (set! pass-count pcount)) (db:get-db dbstruct run-id) "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 (cdb:pass-fail-counts *runremote* test-id fail-count pass-count) ;; if the test is not FAIL then set status based on the fail and pass counts. (cdb:test-rollup-test_data-pass-fail *runremote* test-id))) (define (db:get-prev-tol-for-test dbstruct run-id test-id category variable) ;; Finish me? (values #f #f #f)) ;;====================================================================== ;; S T E P S ;;====================================================================== (define (db:step-get-time-as-string vec) (seconds->time-string (db:step-get-event_time vec))) ;; db-get-test-steps-for-run (define (db:get-steps-for-test dbstruct run-id 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:get-db dbstruct run-id) "SELECT id,test_id,stepname,state,status,event_time,logfile_id FROM test_steps WHERE test_id=? ORDER BY id ASC;" ;; event_time DESC,id ASC; test-id) (reverse res))) ;; get a pretty table to summarize steps ;; (define (db:get-steps-table dbstruct run-id test-id) (let ((steps (db:get-steps-for-test dbstruct run-id test-id))) ;; organise the steps for better readability (let ((res (make-hash-table))) (for-each (lambda (step) (debug:print 6 "step=" step) (let ((record (hash-table-ref/default res |
︙ | ︙ | |||
1896 1897 1898 1899 1900 1901 1902 | (cond ((< (db:step-get-event_time a)(db:step-get-event_time b)) #t) ((eq? (db:step-get-event_time a)(db:step-get-event_time b)) (< (db:step-get-id a) (db:step-get-id b))) (else #f))))) res))) | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | < < | | | | | | | | | | | | | | | | | | | | | | | | < | | | 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 | (cond ((< (db:step-get-event_time a)(db:step-get-event_time b)) #t) ((eq? (db:step-get-event_time a)(db:step-get-event_time b)) (< (db:step-get-id a) (db:step-get-id b))) (else #f))))) res))) ;; ;; get a pretty table to summarize steps ;; ;; ;; (define (db:get-steps-table-list dbstruct run-id test-id #!key (work-area #f)) ;; (let ((steps (db:get-steps-for-test dbstruct run-id test-id))) ;; ;; organise the steps for better readability ;; (let ((res (make-hash-table))) ;; (for-each ;; (lambda (step) ;; (debug:print 6 "step=" step) ;; (let ((record (hash-table-ref/default ;; res ;; (db:step-get-stepname step) ;; ;; stepname start end status ;; (vector (db:step-get-stepname step) "" "" "" "" "")))) ;; (debug:print 6 "record(before) = " record ;; "\nid: " (db:step-get-id step) ;; "\nstepname: " (db:step-get-stepname step) ;; "\nstate: " (db:step-get-state step) ;; "\nstatus: " (db:step-get-status step) ;; "\ntime: " (db:step-get-event_time step)) ;; (case (string->symbol (db:step-get-state step)) ;; ((start)(vector-set! record 1 (db:step-get-event_time step)) ;; (vector-set! record 3 (if (equal? (vector-ref record 3) "") ;; (db:step-get-status step))) ;; (if (> (string-length (db:step-get-logfile step)) ;; 0) ;; (vector-set! record 5 (db:step-get-logfile step)))) ;; ((end) ;; (vector-set! record 2 (any->number (db:step-get-event_time step))) ;; (vector-set! record 3 (db:step-get-status step)) ;; (vector-set! record 4 (let ((startt (any->number (vector-ref record 1))) ;; (endt (any->number (vector-ref record 2)))) ;; (debug:print 4 "record[1]=" (vector-ref record 1) ;; ", startt=" startt ", endt=" endt ;; ", get-status: " (db:step-get-status step)) ;; (if (and (number? startt)(number? endt)) ;; (seconds->hr-min-sec (- endt startt)) "-1"))) ;; (if (> (string-length (db:step-get-logfile step)) ;; 0) ;; (vector-set! record 5 (db:step-get-logfile step)))) ;; (else ;; (vector-set! record 2 (db:step-get-state step)) ;; (vector-set! record 3 (db:step-get-status step)) ;; (vector-set! record 4 (db:step-get-event_time step)))) ;; (hash-table-set! res (db:step-get-stepname step) record) ;; (debug:print 6 "record(after) = " record ;; "\nid: " (db:step-get-id step) ;; "\nstepname: " (db:step-get-stepname step) ;; "\nstate: " (db:step-get-state step) ;; "\nstatus: " (db:step-get-status step) ;; "\ntime: " (db:step-get-event_time step)))) ;; ;; (else (vector-set! record 1 (db:step-get-event_time step))) ;; (sort steps (lambda (a b) ;; (cond ;; ((< (db:step-get-event_time a)(db:step-get-event_time b)) #t) ;; ((eq? (db:step-get-event_time a)(db:step-get-event_time b)) ;; (< (db:step-get-id a) (db:step-get-id b))) ;; (else #f))))) ;; res))) (define (db:get-compressed-steps dbstruct run-id test-id) (let ((comprsteps (open-run-close db:get-steps-table (db:get-db dbstruct run-id) test-id))) (map (lambda (x) ;; take advantage of the \n on time->string (vector (vector-ref x 0) (let ((s (vector-ref x 1))) (if (number? s)(seconds->time-string s) s)) (let ((s (vector-ref x 2))) (if (number? s)(seconds->time-string s) s)) (vector-ref x 3) ;; status (vector-ref x 4) (vector-ref x 5))) ;; time delta (sort (hash-table-values comprsteps) (lambda (a b) (let ((time-a (vector-ref a 1)) (time-b (vector-ref b 1))) (if (and (number? time-a)(number? time-b)) (if (< time-a time-b) #t (if (eq? time-a time-b) (string<? (conc (vector-ref a 2)) (conc (vector-ref b 2))) #f)) (string<? (conc time-a)(conc time-b))))))))) ;;====================================================================== ;; M I S C M A N A G E M E N T I T E M S ;;====================================================================== ;; the new prereqs calculation, looks also at itempath if specified ;; all prereqs must be met: ;; if prereq test with itempath='' is COMPLETED and PASS, WARN, CHECK, or WAIVED then prereq is met ;; if prereq test with itempath=ref-item-path and COMPLETED with PASS, WARN, CHECK, or WAIVED then prereq is met ;; ;; Note: mode 'normal means that tests must be COMPLETED and ok (i.e. PASS, WARN, CHECK, SKIP or WAIVED) ;; mode 'toplevel means that tests must be COMPLETED only ;; mode 'itemmatch or 'itemwait means that tests items must be COMPLETED and (PASS|WARN|WAIVED|CHECK) [[ NB// NOT IMPLEMENTED YET ]] ;; (define (db:get-prereqs-not-met dbstruct run-id waitons ref-item-path #!key (mode 'normal)) (if (or (not waitons) (null? waitons)) '() (let* ((unmet-pre-reqs '()) (result '())) (for-each (lambda (waitontest-name) ;; by getting the tests with matching name we are looking only at the matching test ;; and related sub items (let ((tests (mt:get-tests-for-run dbstruct run-id waitontest-name '() '())) (ever-seen #f) (parent-waiton-met #f) (item-waiton-met #f)) (for-each (lambda (test) ;; (if (equal? waitontest-name (db:test-get-testname test)) ;; by defintion this had better be true ... (let* ((state (db:test-get-state test)) |
︙ | ︙ | |||
2062 2063 2064 2065 2066 2067 2068 | ;; if the test is not found then clearly the waiton is not met... ;; (if (not ever-seen)(set! result (cons waitontest-name result))))) (if (not ever-seen) (set! result (append (if (null? tests)(list waitontest-name) tests) result))))) waitons) (delete-duplicates result)))) | | < < < | | < < | | | | < > > | < > > | | 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 | ;; if the test is not found then clearly the waiton is not met... ;; (if (not ever-seen)(set! result (cons waitontest-name result))))) (if (not ever-seen) (set! result (append (if (null? tests)(list waitontest-name) tests) result))))) waitons) (delete-duplicates result)))) (define (db:teststep-set-status! dbstruct run-id test-id teststep-name state-in status-in comment logfile #!key (work-area #f)) (let ((state (items:check-valid-items "state" state-in)) (status (items:check-valid-items "status" status-in))) (if (or (not state)(not status)) (debug:print 3 "WARNING: Invalid " (if status "status" "state") " value \"" (if status state-in status-in) "\", update your validvalues section in megatest.config")) (sqlite3:execute (db:get-db dbstruct run-id) "INSERT OR REPLACE into test_steps (test_id,stepname,state,status,event_time,comment_id,logfile_id) VALUES(?,?,?,?,?,?,?);" test-id teststep-name state-in status-in (current-seconds) (db:save-string (if comment comment "")) (db:save-string (if logfile logfile ""))) #t)) ;;====================================================================== ;; Extract ods file from the db ;;====================================================================== ;; NOT REWRITTEN YET!!!!! ;; runspatt is a comma delimited list of run patterns ;; keypatt-alist must contain *all* keys with an associated pattern: '( ("KEY1" "%") .. ) (define (db:extract-ods-file dbstruct outputfile keypatt-alist runspatt pathmod) (let* ((keysstr (string-intersperse (map car keypatt-alist) ",")) (keyqry (string-intersperse (map (lambda (p)(conc (car p) " LIKE ? ")) keypatt-alist) " AND ")) (numkeys (length keypatt-alist)) (test-ids '()) (windows (and pathmod (substring-index "\\" pathmod))) (tempdir (conc "/tmp/" (current-user-name) "/" runspatt "_" (random 10000) "_" (current-process-id))) (runsheader (append (list "Run Id" "Runname") ; 0 1 |
︙ | ︙ |
Modified mt.scm from [c1cc555b4f] to [8cfd273012].
︙ | ︙ | |||
62 63 64 65 66 67 68 | limit)) (vector header full-list))))) ;;====================================================================== ;; T E S T S ;;====================================================================== | | | | | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 | limit)) (vector header full-list))))) ;;====================================================================== ;; T E S T S ;;====================================================================== (define (mt:get-tests-for-run dbstruct run-id testpatt states status #!key (not-in #t) (sort-by 'event_time) (sort-order "ASC") (qryvals #f)) (let loop ((testsdat (db:get-tests-for-run dbstruct run-id testpatt states status 0 500 not-in sort-by sort-order qryvals: qryvals)) (res '()) (offset 0) (limit 500)) (let* ((full-list (append res testsdat)) (have-more (eq? (length testsdat) limit))) (if have-more (let ((new-offset (+ offset limit))) (debug:print-info 4 "More than " limit " tests, have " (length full-list) " tests so far.") (loop (db:get-tests-for-run dbstruct run-id testpatt states status new-offset limit not-in sort-by sort-order qryvals: qryvals) full-list new-offset limit)) full-list)))) (define (mt:get-prereqs-not-met run-id waitons ref-item-path #!key (mode 'normal)) (db:get-prereqs-not-met run-id waitons ref-item-path mode: mode)) |
︙ | ︙ |