Overview
| Comment: | Fixed run-id issue that caused wrong db to be addressed. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.80-tcp-inmem |
| Files: | files | file ages | folders |
| SHA1: |
c2f5ef0cafcdf1456713be69c2f3aea9 |
| User & Date: | matt on 2023-02-21 16:54:39 |
| Other Links: | branch diff | manifest | tags |
Context
|
2023-02-21
| ||
| 17:02 | merged fork check-in: d8fae05b29 user: matt tags: v1.80-tcp-inmem | |
| 16:54 | Fixed run-id issue that caused wrong db to be addressed. check-in: c2f5ef0caf user: matt tags: v1.80-tcp-inmem | |
| 15:40 | wip check-in: b51df9a459 user: matt tags: v1.80-tcp-inmem | |
Changes
Modified dbmod.scm from [dd9c226075] to [46c591ae38].
| ︙ | ︙ | |||
44 45 46 47 48 49 50 | ) ;; NOTE: This returns only the name "1.db", "main.db", not the path ;; (define (dbmod:run-id->dbfname run-id) (conc (dbfile:run-id->dbnum run-id)".db")) | | | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 |
)
;; NOTE: This returns only the name "1.db", "main.db", not the path
;;
(define (dbmod:run-id->dbfname run-id)
(conc (dbfile:run-id->dbnum run-id)".db"))
(define (dbmod:get-dbdir dbstruct)
(let* ((areapath (dbr:dbstruct-areapath dbstruct)))
(conc areapath"/.megatest")))
(define (dbmod:run-id->full-dbfname dbstruct run-id)
(conc (dbmod:get-dbdir dbstruct run-id)"/"(dbmod:run-id->dbfname run-id)))
;;======================================================================
|
| ︙ | ︙ | |||
113 114 115 116 117 118 119 | ;; * Probably can get rid of the dbstruct-in ;; (define (dbmod:open-dbmoddb areapath run-id dbfname-in init-proc keys #!key (dbstruct-in #f) (syncdir 'todisk)) (let* ((dbstruct (or dbstruct-in (make-dbr:dbstruct areapath: areapath))) (dbfname (or dbfname-in (dbmod:run-id->dbfname run-id))) | | | | 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 | ;; * Probably can get rid of the dbstruct-in ;; (define (dbmod:open-dbmoddb areapath run-id dbfname-in init-proc keys #!key (dbstruct-in #f) (syncdir 'todisk)) (let* ((dbstruct (or dbstruct-in (make-dbr:dbstruct areapath: areapath))) (dbfname (or dbfname-in (dbmod:run-id->dbfname run-id))) (dbpath (dbmod:get-dbdir dbstruct)) ;; directory where all the .db files are kept (dbfullname (conc dbpath"/"dbfname)) ;; (dbmod:run-id->full-dbfname dbstruct run-id)) (dbexists (file-exists? dbfullname)) (inmem (dbmod:open-inmem-db init-proc)) (write-access (file-write-access? dbpath)) (db (dbfile:with-simple-file-lock (conc dbfullname".lock") (lambda () (let* ((db (sqlite3:open-database dbfullname)) |
| ︙ | ︙ |