Changes In Branch testdata Through [0bdbd9ba53] Excluding Merge-Ins
This is equivalent to a diff from 0e00d7e0c2 to 0bdbd9ba53
|
2012-03-01
| ||
| 23:18 | More stuff for the possible testdata split Closed-Leaf check-in: eadcceede0 user: matt tags: testdata | |
|
2012-02-29
| ||
| 17:56 | minor improvements to server mode check-in: 29dd546414 user: mrwellan tags: trunk | |
|
2012-02-28
| ||
| 21:28 | Incrementail changes towards the test-info data split check-in: 0bdbd9ba53 user: matt tags: testdata | |
| 07:02 | test_info initalization check-in: 7e2a9a176b user: matt tags: testdata | |
| 03:15 | Initial steps to separate test data into file testdata.db check-in: 0187531d3d user: matt tags: testdata | |
|
2012-02-27
| ||
| 09:52 | Partial fix for -rerun check-in: 0e00d7e0c2 user: matt tags: trunk | |
| 06:16 | Upping version to v1.38 check-in: 275de76b6d user: matt tags: trunk, v1.38 | |
Modified db.scm from [f1afc66bda] to [b7761500bc].
| ︙ | ︙ | |||
34 35 36 37 38 39 40 | (define *incoming-data* '()) (define *incoming-last-time* (current-seconds)) (define *incoming-mutex* (make-mutex)) (define *cache-on* #f) (define (open-db) ;; (conc *toppath* "/megatest.db") (car *configinfo*))) (let* ((dbpath (conc *toppath* "/megatest.db")) ;; fname) | > | > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 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 111 112 113 114 115 116 117 |
(define *incoming-data* '())
(define *incoming-last-time* (current-seconds))
(define *incoming-mutex* (make-mutex))
(define *cache-on* #f)
(define (open-db) ;; (conc *toppath* "/megatest.db") (car *configinfo*)))
(let* ((dbpath (conc *toppath* "/megatest.db")) ;; fname)
(tdatpath (conc *toppath* "/test_info.db")))
(dbexists (file-exists? dbpath)
(tdatexists (file-exists? tdatpath))
(db (sqlite3:open-database dbpath)) ;; (never-give-up-open-db dbpath))
(handler (make-busy-timeout 36000)))
(sqlite3:set-busy-handler! db handler)
(if (not dbexists)
(db:initialize db))
(cond
((and (not tdataexists)(not dbexists))
(let ((tdb (db:initialize-test-data-db)))
(sqlite3:finalize! tdb)))
((not tdataexists)
(db:migrate-to-testdata db)))
(db:attach-testdata db)
db))
;; Migrate data from tests table to testinfo
(define (db:migrate-to-test-info db)
;; first create the new db and open it
(let ((tdb (db:initialize-test-data-db))
(tbldef (lambda (tname)(conc "CREATE TABLE IF NOT EXISTS " tname "
(id INTEGER PRIMARY KEY,
run_id INTEGER,
testname TEXT,
host TEXT DEFAULT 'n/a',
uname TEXT DEFAULT 'n/a',
rundir TEXT DEFAULT 'n/a',
shortdir TEXT DEFAULT '',
item_path TEXT DEFAULT '',
state TEXT DEFAULT 'NOT_STARTED',
status TEXT DEFAULT 'FAIL',
attemptnum INTEGER DEFAULT 0,
final_logf TEXT DEFAULT 'logs/final.log',
run_duration INTEGER DEFAULT 0,
comment TEXT DEFAULT '',
event_time TIMESTAMP,
fail_count INTEGER DEFAULT 0,
pass_count INTEGER DEFAULT 0,
archived INTEGER DEFAULT 0, -- 0=no, 1=in progress, 2=yes
);"))))
(sqlite3:finalize! tdb)
;; attach the test_info
;; extract the test_info data
(sqlite3:execute db "INSERT INTO test_info (test_id,diskfree,cpuload) SELECT id,diskfree,cpuload) FROM tests;")
;; create the temporary table
(sqlite3:execute db (tbldef "tmp_tests")))
;; save the relevant test_data table data
(sqlite3:execute db "INSERT id,run_id,testname,host,uname,rundir,shortdir,item_path,state,status,attemptnum,final_logf,run_duration,comment,event_time,fail_count,pass_count INTO tests_dup SELECT
id,run_id,testname,host,uname,rundir,shortdir,item_path,state,status,attemptnum,final_logf,run_duration,comment,event_time,fail_count,pass_count FROM tests;")
;; drop the old and create the new
(sqlite3:execute db "DROP TABLE tests;")
(sqlite3:execute db (tblqry "tests"))
(sqlite3:execute db "INSERT INTO tests SELECT FROM tmp_tests;")
(sqlite3:execute db "DROP TABLE tmp_tests;")
)
;; Initialize the testdata db
(define (db:initialize-test-data-db)
(let ((tdb (sqlite3:open-database (conc *toppath* "/test_info.db"))))
(sqlite3:execute tdb "CREATE TABLE test_info (
id INTEGER PRIMARY KEY,
test_id INTEGER,
diskfree INTEGER,
cpuload INTEGER,
tmpdisk INTEGER,
memusage INTEGER);")
tdb))
;; Initialize the main db
(define (db:initialize db)
(let* ((configdat (car *configinfo*)) ;; tut tut, global warning...
(keys (config-get-fields configdat))
(havekeys (> (length keys) 0))
(keystr (keys->keystr keys))
(fieldstr (keys->key/field keys)))
(for-each (lambda (key)
|
| ︙ | ︙ |