Overview
Comment: | implemented db:get-db with extra runid arg |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.7001-rebase-wip | v1.7001-multi-db-rb01 |
Files: | files | file ages | folders |
SHA1: |
c201b33851f1d1135cd294d6f2c6eac3 |
User & Date: | matt on 2022-04-21 19:10:49 |
Other Links: | branch diff | manifest | tags |
Context
2022-04-21
| ||
19:11 | Merged Martin's fix. Got commonmod, debugprint and mtargs modules working check-in: 7f4e37b96c user: matt tags: v1.7001-rebase-wip, v1.7001-multi-db-rb01 | |
19:10 | implemented db:get-db with extra runid arg check-in: c201b33851 user: matt tags: v1.7001-rebase-wip, v1.7001-multi-db-rb01 | |
2022-04-07
| ||
07:04 | wip check-in: 5209afd099 user: matt tags: v1.7001-multi-db-rb01 | |
Changes
Modified db.scm from [40daf428a9] to [d015e481fa].
︙ | ︙ | |||
159 160 161 162 163 164 165 | ;; if run-id is a string treat it as a filename ;; if db already open - return inmem ;; if db not open, open inmem, rundb and sync then return inmem ;; inuse gets set automatically for rundb's ;; ;; (define db:get-db db:get-subdb) | | | < < | < < < | | < | > > > | 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 | ;; if run-id is a string treat it as a filename ;; if db already open - return inmem ;; if db not open, open inmem, rundb and sync then return inmem ;; inuse gets set automatically for rundb's ;; ;; (define db:get-db db:get-subdb) (define (db:get-db dbstruct run-id) (let* ((subdb (dbfile:get-subdb dbstruct run-id)) (dbdat (dbfile:get-dbdat dbstruct run-id))) (if (dbr:dbdat? dbdat) dbdat (dbfile:open-db *dbstruct-dbs* #f db:initialize-main-db) ) ) ) (define-inline (db:generic-error-printout exn . message) (print-call-chain (current-error-port)) (apply debug:print-error 0 *default-log-port* message) (debug:print-error 0 *default-log-port* " params: " params ", error: " ((condition-property-accessor 'exn 'message) exn) ", arguments: " ((condition-property-accessor 'exn 'arguments) exn) |
︙ | ︙ |
Modified tasks.scm from [19e9ab848e] to [b89ba1474e].
︙ | ︙ | |||
516 517 518 519 520 521 522 | param-key state-patt action-patt test-patt))))) (define (tasks:find-task-queue-records dbstruct target run-name test-patt state-patt action-patt) ;; (handle-exceptions ;; exn ;; '() ;; (sqlite3:first-row | | | 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 | param-key state-patt action-patt test-patt))))) (define (tasks:find-task-queue-records dbstruct target run-name test-patt state-patt action-patt) ;; (handle-exceptions ;; exn ;; '() ;; (sqlite3:first-row (let ((db (db:delay-if-busy (db:get-db dbstruct #f))) (res '())) (sqlite3:for-each-row (lambda (a . b) (set! res (cons (cons a b) res))) db "SELECT id,action,owner,state,target,name,testpatt,keylock,params FROM tasks_queue WHERE target = ? AND name = ? AND state LIKE ? AND action LIKE ? AND testpatt LIKE ?;" |
︙ | ︙ |
Modified tests/simplerun/thebeginning.scm from [1a8187c724] to [f405496649].
︙ | ︙ | |||
50 51 52 53 54 55 56 | ;; *************** db.scm tests **************** (define thisdbdat (db:open-db dbstruct #f)) (test #f #t (dbr:dbdat? thisdbdat)) | > > > | 50 51 52 53 54 55 56 57 58 59 | ;; *************** db.scm tests **************** (define thisdbdat (db:open-db dbstruct #f)) (test #f #t (dbr:dbdat? thisdbdat)) (test #f #t (dbr:subdb? (db:get-db dbstruct #f))) (test #f #t (dbr:subdb? (db:get-db dbstruct 1))) |