Overview
Comment: | wip |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.6569-multi-db-wip |
Files: | files | file ages | folders |
SHA1: |
9b13b2dd0ecfb5a2979e8c4035b4e191 |
User & Date: | matt on 2021-02-12 00:42:51 |
Other Links: | branch diff | manifest | tags |
Context
2021-02-12
| ||
08:35 | wip check-in: 69dd64de99 user: matt tags: v1.6569-multi-db-wip (unpublished) | |
00:42 | wip check-in: 9b13b2dd0e user: matt tags: v1.6569-multi-db-wip (unpublished) | |
00:18 | Compiles again after moving many functions around check-in: da6321c924 user: matt tags: v1.6569-multi-db-wip (unpublished) | |
Changes
Modified Makefile from [4345c92fe8] to [02e947d86c].
︙ | ︙ | |||
114 115 116 117 118 119 120 | http-transport.o \ items.o \ keys.o \ launch.o \ lock-queue.o \ margs.o \ mt.o \ | < > | 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | http-transport.o \ items.o \ keys.o \ launch.o \ lock-queue.o \ margs.o \ mt.o \ portlogger.o \ process.o \ rmt.o \ runconfig.o \ runs.o \ server.o \ tasks.o \ tdb.o \ tests.o \ subrun.o \ ezsteps.o # ods.o \ # mofiles/rmtmod.o \ # mofiles/commonmod.o \ tcmt : $(TCMTOBJS) tcmt.scm megatest-version.scm $(MOIMPFILES) $(MOFILES) csc $(CSCOPTS) $(TCMTOBJS) $(MOFILES) $(MOIMPFILES) tcmt.scm -o tcmt # install documentation to $(PREFIX)/docs |
︙ | ︙ | |||
462 463 464 465 466 467 468 | if csi -ne '(use mysql-client)';then \ echo "(use mysql-client)(hash-table-set! *available-db* 'mysql #t)" >> altdb.scm; \ fi if csi -ne '(use postgresql)';then \ echo "(use postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\ fi | | | | 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 | if csi -ne '(use mysql-client)';then \ echo "(use mysql-client)(hash-table-set! *available-db* 'mysql #t)" >> altdb.scm; \ fi if csi -ne '(use postgresql)';then \ echo "(use postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\ fi portlogger-example : portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o mt.o portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o mt.o portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o # create a pdf dot graphviz diagram from notations in rmt.scm rmt.pdf : rmt.scm grep ';;DOT' rmt.scm | sed -e 's/.*;;DOT //' > rmt.dot;dot -Tpdf rmt.dot -o rmt.pdf buildmanual: cd docs/manual && make |
︙ | ︙ |
Modified dashboard.scm from [14b71fda13] to [e02aa345cf].
︙ | ︙ | |||
55 56 57 58 59 60 61 62 63 64 65 66 67 68 | (declare (uses dcommonmod)) (import dcommonmod) (declare (uses dcommonmod.import)) (declare (uses apimod)) (import apimod) (include "common_records.scm") (include "db_records.scm") (include "run_records.scm") (include "task_records.scm") (include "megatest-version.scm") ;; (include "megatest-fossil-hash.scm") (include "vg_records.scm") | > > > > > > > | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 | (declare (uses dcommonmod)) (import dcommonmod) (declare (uses dcommonmod.import)) (declare (uses apimod)) (import apimod) ;; (declare (uses ods)) ;; (import ods) ;; (declare (uses dbmod)) (import dbmod) ;; (declare (uses dbmod.import)) ;; (include "common_records.scm") (include "db_records.scm") (include "run_records.scm") (include "task_records.scm") (include "megatest-version.scm") ;; (include "megatest-fossil-hash.scm") (include "vg_records.scm") |
︙ | ︙ | |||
251 252 253 254 255 256 257 | "8"))) (dboard:tabdat-access-mode-set! dat (db:get-access-mode)) ;; use cached db or not (dboard:setup-tabdat dat) (dboard:setup-num-rows dat) dat)) (define (dboard:setup-tabdat tabdat) | | | | 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 | "8"))) (dboard:tabdat-access-mode-set! dat (db:get-access-mode)) ;; use cached db or not (dboard:setup-tabdat dat) (dboard:setup-num-rows dat) dat)) (define (dboard:setup-tabdat tabdat) (dboard:tabdat-dbdir-set! tabdat (common:get-db-tmp-area)) ;; (conc (configf:lookup *configdat* "setup" "linktree") "/.db")) (dboard:tabdat-dbfpath-set! tabdat (common:get-db-tmp-area)) (dboard:tabdat-monitor-db-path-set! tabdat (conc (dboard:tabdat-dbdir tabdat) "/monitor.db")) ;; HACK ALERT: this is a hack, please fix. (dboard:tabdat-ro-set! tabdat (not (file-read-access? (dboard:tabdat-dbfpath tabdat)))) (dboard:tabdat-keys-set! tabdat (rmt:get-keys)) (dboard:tabdat-dbkeys-set! tabdat (append (dboard:tabdat-keys tabdat) (list "runname"))) |
︙ | ︙ |
Modified megatest.scm from [b9882ee58b] to [9d44ed6ee2].
︙ | ︙ | |||
45 46 47 48 49 50 51 52 53 54 55 56 57 58 | ;; (import ftail) ;; Needed for repl even if not used here in megatest.scm (declare (uses commonmod)) (import commonmod) (declare (uses commonmod.import)) (declare (uses dbmod)) (import dbmod) (declare (uses dbmod.import)) (declare (uses servermod)) (import servermod) (declare (uses servermod.import)) | > > > > | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | ;; (import ftail) ;; Needed for repl even if not used here in megatest.scm (declare (uses commonmod)) (import commonmod) (declare (uses commonmod.import)) (declare (uses ods)) (import ods) (declare (uses ods.import)) (declare (uses dbmod)) (import dbmod) (declare (uses dbmod.import)) (declare (uses servermod)) (import servermod) (declare (uses servermod.import)) |
︙ | ︙ |
Modified rmt.scm from [da263fd2ed] to [0ca9a30d7b].
︙ | ︙ | |||
28 29 30 31 32 33 34 35 36 37 38 39 40 41 | (import commonmod) (declare (uses apimod)) (import apimod) (declare (uses rmtmod)) (import rmtmod) (include "common_records.scm") ;; (declare (uses rmtmod)) ;; (import rmtmod) ;; | > > > > | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | (import commonmod) (declare (uses apimod)) (import apimod) (declare (uses rmtmod)) (import rmtmod) ;; should not be here (declare (uses dbmod)) (import dbmod) (include "common_records.scm") ;; (declare (uses rmtmod)) ;; (import rmtmod) ;; |
︙ | ︙ | |||
383 384 385 386 387 388 389 | (cons 'none 0)) (loop (car tal)(cdr tal) newmax-cmd currmax))))))) (mutex-unlock! *db-stats-mutex*) res)) (define (rmt:open-qry-close-locally cmd run-id params #!key (remretries 5)) (let* ((qry-is-write (not (member cmd api:read-only-queries))) | | | 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 | (cons 'none 0)) (loop (car tal)(cdr tal) newmax-cmd currmax))))))) (mutex-unlock! *db-stats-mutex*) res)) (define (rmt:open-qry-close-locally cmd run-id params #!key (remretries 5)) (let* ((qry-is-write (not (member cmd api:read-only-queries))) (db-file-path (common:get-db-tmp-area)) ;; db:dbfile-path)) ;; 0)) (dbstruct-local (db:setup #t)) ;; make-dbr:dbstruct path: dbdir local: #t))) (read-only (not (file-write-access? db-file-path))) (start (current-milliseconds)) (resdat (if (not (and read-only qry-is-write)) (let ((v (api:execute-requests dbstruct-local (vector (symbol->string cmd) params)))) (handle-exceptions ;; there has been a long history of receiving strange errors from values returned by the client when things go wrong.. exn ;; This is an attempt to detect that situation and recover gracefully |
︙ | ︙ |
Modified tdb.scm from [fb7dc71e31] to [2eddae61cd].
︙ | ︙ | |||
26 27 28 29 30 31 32 | (use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n md5 message-digest base64) (import (prefix sqlite3 sqlite3:)) (import (prefix base64 base64:)) (declare (unit tdb)) (declare (uses common)) (declare (uses keys)) | < > > > | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | (use sqlite3 srfi-1 posix regex regex-case srfi-69 csv-xml s11n md5 message-digest base64) (import (prefix sqlite3 sqlite3:)) (import (prefix base64 base64:)) (declare (unit tdb)) (declare (uses common)) (declare (uses keys)) (declare (uses client)) (declare (uses mt)) (declare (uses db)) (declare (uses commonmod)) (import commonmod) (declare (uses ods)) (import ods) (include "common_records.scm") (include "db_records.scm") (include "key_records.scm") (include "run_records.scm") ;;====================================================================== |
︙ | ︙ |