Overview
Comment: | wip |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.80-servload |
Files: | files | file ages | folders |
SHA1: |
0ba83c29bbff794d18ccc8f9c08337a3 |
User & Date: | mrwellan on 2023-05-03 19:05:48 |
Other Links: | branch diff | manifest | tags |
Context
2023-05-03
| ||
21:49 | Sorta working but not really... check-in: 81dd2a2efe user: matt tags: v1.80-servload | |
19:05 | wip check-in: 0ba83c29bb user: mrwellan tags: v1.80-servload | |
2023-05-02
| ||
12:08 | Added warning on template changes. check-in: 1356471a2d user: mrwellan tags: v1.80-servload | |
Changes
Modified dbmod.scm from [a60adec379] to [4ac7149f64].
︙ | ︙ | |||
30 31 32 33 34 35 36 37 38 39 40 41 42 43 | (import scheme chicken data-structures extras files (prefix sqlite3 sqlite3:) posix typed-records srfi-1 srfi-18 srfi-69 commonmod | > | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | (import scheme chicken data-structures extras files (prefix sqlite3 sqlite3:) matchable posix typed-records srfi-1 srfi-18 srfi-69 commonmod |
︙ | ︙ | |||
243 244 245 246 247 248 249 250 251 252 253 | ;; (dbmod:sync-tables tables last-update db inmem)))) ;; direction: 'fromdest 'todest ;; (define (dbmod:sync-gasket tables last-update inmem dbh dbfname direction) (assert (sqlite3:database? inmem) "FATAL: sync-gasket: inmem is not a db") (assert (sqlite3:database? dbh) "FATAL: sync-gasket: dbh is not a db") (case (dbfile:sync-method) ((none) #f) ((attach) (dbmod:attach-sync tables inmem dbfname direction)) | > | | 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 | ;; (dbmod:sync-tables tables last-update db inmem)))) ;; direction: 'fromdest 'todest ;; (define (dbmod:sync-gasket tables last-update inmem dbh dbfname direction) (assert (sqlite3:database? inmem) "FATAL: sync-gasket: inmem is not a db") (assert (sqlite3:database? dbh) "FATAL: sync-gasket: dbh is not a db") (debug:print-info 0 *default-log-port* "Db sync using "(dbfile:sync-method)" method") (case (dbfile:sync-method) ((none) #f) ((attach) (dbmod:attach-sync tables inmem dbfname direction)) ((newsync) ;; DON'T USE THIS ONE. IT IS BORKED (dbmod:new-sync tables inmem dbh dbfname direction)) (else (case direction ((todisk) (dbmod:sync-tables tables last-update inmem dbh) ) (else |
︙ | ︙ | |||
294 295 296 297 298 299 300 | ;; IFF field-name exists ;; ;; Use (db:sync-all-tables-list keys) to get the tbls input ;; (define (dbmod:sync-tables tbls last-update fromdb todb) (assert (sqlite3:database? fromdb) "FATAL: dbmod:sync-tables called with fromdb not a database" fromdb) (assert (sqlite3:database? todb) "FATAL: dbmod:sync-tables called with fromdb not a database" todb) | > > | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < | | < < < < < < < < < < < < < | < < < | < < < | < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < | < < < < < < < < < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 | ;; IFF field-name exists ;; ;; Use (db:sync-all-tables-list keys) to get the tbls input ;; (define (dbmod:sync-tables tbls last-update fromdb todb) (assert (sqlite3:database? fromdb) "FATAL: dbmod:sync-tables called with fromdb not a database" fromdb) (assert (sqlite3:database? todb) "FATAL: dbmod:sync-tables called with fromdb not a database" todb) (let ((specials '(("keys" . "fieldname") ("meta" . "var"))) (stmts (make-hash-table)) ;; table-field => stmt (all-stmts '()) ;; ( ( stmt1 value1 ) ( stml2 value2 )) (numrecs (make-hash-table)) (start-time (current-milliseconds)) (tot-count 0)) (for-each ;; table (lambda (tabledat) (let* ((count (match tabledat ((tablename . fields) (debug:print-info 0 *default-log-port* "Syncing table "tablename) (dbmod:sync-table tablename fields fromdb todb (alist-ref tablename specials equal?))) (else (debug:print-warn 0 *default-log-port* "Bad tabledat entry: "tabledat) 0)))) (set! tot-count (+ tot-count count)))) tbls) (debug:print-info 0 *default-log-port* "dbmod:sync-tables completed in "(- (current-milliseconds) start-time)"ms") tot-count)) (define (dbmod:sync-table tablename fields from-db to-db keyfield) (let* ((field-names (map car fields)) (has-last-update (member "last_update" field-names)) (fields-sans-lu (filter (lambda (x) (not (member x '("id" "last_update")))) field-names)) (get-ids (lambda (db) (sqlite3:fold-row (lambda (res id) (cons id res)) '() db (conc "SELECT id FROM "tablename";")))) (get-val (lambda (db fieldname id) (let* ((res #f) (sql (conc "SELECT "fieldname" FROM "tablename" WHERE id=?;"))) (sqlite3:for-each-row (lambda (val) (set! res val)) db sql id) ;; (debug:print-info 0 *default-log-port* "get-val "db" "fieldname" "id", sql="sql", res="res) res))) (get-row (lambda (db id) (let* ((res #f)) (sqlite3:for-each-row (lambda tuple (set! res tuple)) db (conc "SELECT " (string-intersperse fields-sans-lu ",") " FROM "tablename" WHERE id=?;") id) res))) (ins-row (lambda (db id row) (let* ((qry (conc "INSERT INTO "tablename" (id," (string-intersperse fields-sans-lu ",") ") VALUES ("id"," (string-intersperse (make-list (length fields-sans-lu) "?") ",") ");"))) ;; (debug:print-info 0 *default-log-port* "qry="qry) (apply sqlite3:execute db qry row)))) (num-inserts 0) (num-updates 0) ) ;; (debug:print-info 0 *default-log-port* "field-names: "field-names", fields-sans-lu: "fields-sans-lu) ;; (sqlite3:with-transaction ;; from-db ;; (lambda () (let* ((from-ids (get-ids from-db))) ;; (debug:print-info 0 *default-log-port* "Table "tablename", has "(length from-ids)" records.") ;; (sqlite3:with-transaction ;; to-db ;; (lambda () (let* ((to-ids (get-ids to-db))) ;; (debug:print 0 *default-log-port* "to-ids="to-ids) (for-each ;; from-id (lambda (from-id) (if (member from-id to-ids) (for-each ;; case where record exists, do one by one the fields if different (lambda (fieldname) (let* ((from-val (get-val from-db fieldname from-id)) (dest-val (get-val to-db fieldname from-id))) #;(debug:print 0 *default-log-port* "fieldname="fieldname ", from-id="from-id ", from-val="from-val ", dest-val="dest-val ) (if (not (equal? from-val dest-val)) (begin (sqlite3:execute to-db (conc "UPDATE "tablename" SET "fieldname"=? WHERE id=?;") from-val from-id) (set! num-updates (+ num-updates 1)))))) fields-sans-lu) (let ((row (get-row from-db from-id))) ;; need to insert the row ;; (debug:print 0 *default-log-port* "row="row) (set! num-inserts (+ num-inserts 1)) (ins-row to-db from-id row)))) from-ids)));; )))) (+ num-inserts num-updates))) ;; (for-each ;; table ;; (lambda (tabledat) ;; (let* ((tablename (car tabledat)) ;; (fields (cdr tabledat)) ;; (has-last-update (member "last_update" fields)) ;; (use-last-update (dbmod:calc-use-last-update has-last-update fields last-update)) ;; (last-update-value (if use-last-update ;; no need to check for has-last-update - it is already accounted for ;; (if (number? last-update) ;; last-update ;; (cdr last-update)) ;; #f)) ;; (last-update-field (if use-last-update ;; (if (number? last-update) ;; "last_update" ;; (car last-update)) ;; #f)) ;; (num-fields (length fields)) ;; (field->num (make-hash-table)) ;; (num->field (apply vector (map car fields))) ;; BBHERE ;; (full-sel (conc "SELECT " (string-intersperse (map car fields) ",") ;; " FROM " tablename (if use-last-update ;; apply last-update criteria ;; (conc " WHERE " last-update-field " >= " last-update-value) ;; "") ;; ";")) ;; (full-ins (conc "INSERT OR REPLACE INTO " tablename " ( " (string-intersperse (map car fields) ",") " ) " ;; " VALUES ( " (string-intersperse (make-list num-fields "?") ",") " );")) ;; (fromdat '()) ;; (fromdats '()) ;; (totrecords 0) ;; (batch-len 10000000) ;; (string->number (or (configf:lookup *configdat* "sync" "batchsize") "100"))) ;; (todat (make-hash-table)) ;; (count 0) ;; (field-names (map car fields))) ;; ;; (debug:print-info 0 *default-log-port* "Syncing table "tablename) ;; ;; ;; set up the field->num table ;; (for-each ;; (lambda (field) ;; (hash-table-set! field->num field count) ;; (set! count (+ count 1))) ;; fields) ;; ;; ;; read the source table ;; ;; store a list of all rows in the table in fromdat, up to batch-len. ;; ;; Then add fromdat to the fromdats list, clear fromdat and repeat. ;; (sqlite3:for-each-row ;; (lambda (a . b) ;; (set! fromdat (cons (apply vector a b) fromdat)) ;; (if (> (length fromdat) batch-len) ;; (begin ;; (set! fromdats (cons fromdat fromdats)) ;; (set! fromdat '()) ;; (set! totrecords (+ totrecords 1))))) ;; fromdb ;; full-sel) ;; ;; (debug:print-info 0 *default-log-port* "Have "totrecords" records to update.") ;; ;; Count less than batch-len as a record ;; (if (> (length fromdat) 0) ;; (set! totrecords (+ totrecords 1))) ;; ;; ;; tack on remaining records in fromdat ;; (if (not (null? fromdat)) ;; (set! fromdats (cons fromdat fromdats))) ;; ;; (sqlite3:for-each-row ;; (lambda (a . b) ;; (hash-table-set! todat a (apply vector a b))) ;; todb ;; full-sel) ;; ;; ;; first pass implementation, just insert all changed rows ;; ;; (let* ((db todb) ;; (has-last-update (member "last_update" field-names)) ;; (drp-trigger (if has-last-update ;; (db:drop-trigger db tablename) ;; #f)) ;; (is-trigger-dropped (if has-last-update ;; (db:is-trigger-dropped db tablename) ;; #f)) ;; (stmth (sqlite3:prepare db full-ins)) ;; (changed-rows 0)) ;; (for-each ;; (lambda (fromdat-lst) ;; (mutex-lock! *db-transaction-mutex*) ;; (sqlite3:with-transaction ;; db ;; (lambda () ;; (for-each ;; ;; (lambda (fromrow) ;; (let* ((a (vector-ref fromrow 0)) ;; (curr (hash-table-ref/default todat a #f)) ;; (same #t)) ;; (let loop ((i 0)) ;; (if (or (not curr) ;; (not (equal? (vector-ref fromrow i)(vector-ref curr i)))) ;; (set! same #f)) ;; (if (and same ;; (< i (- num-fields 1))) ;; (loop (+ i 1)))) ;; (if (not same) ;; (begin ;; (apply sqlite3:execute stmth (vector->list fromrow)) ;; (hash-table-set! numrecs tablename (+ 1 (hash-table-ref/default numrecs tablename 0))) ;; (set! changed-rows (+ changed-rows 1)))))) ;; fromdat-lst))) ;; (mutex-unlock! *db-transaction-mutex*)) ;; fromdats) ;; ;; (sqlite3:finalize! stmth) ;; (if (member "last_update" field-names) ;; (db:create-trigger db tablename))) ;; )) ;; tbls) ;; (let* ((runtime (- (current-milliseconds) start-time)) ;; (should-print (or ;; (debug:debug-mode 12) ;; (common:low-noise-print 120 "db sync") ;; (> runtime 500)))) ;; low and high sync times treated as separate. ;; (for-each ;; (lambda (dat) ;; (let ((tblname (car dat)) ;; (count (cdr dat))) ;; (set! tot-count (+ tot-count count)))) ;; (sort (hash-table->alist numrecs)(lambda (a b)(> (cdr a)(cdr b)))))) (define (has-last-update dbh tablename) (let* ((has-last #f)) (sqlite3:for-each-row (lambda (name) (if (equal? name "last_update") (set! has-last #t))) dbh |
︙ | ︙ |
Modified megatest.scm from [28717a0520] to [4b22029f00].
︙ | ︙ | |||
2569 2570 2571 2572 2573 2574 2575 | (if (args:get-arg "-db2db") (let* ((duh (launch:setup)) (src-db (args:get-arg "-from")) (dest-db (args:get-arg "-to")) (sync-period (args:get-arg "-period")) ;; NOT IMPLEMENTED YET (sync-timeout (args:get-arg "-timeout")) ;; NOT IMPLEMENTED YET (lockfile (conc dest-db".lock")) | < < < < < > | | > > > | | | | | | 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 | (if (args:get-arg "-db2db") (let* ((duh (launch:setup)) (src-db (args:get-arg "-from")) (dest-db (args:get-arg "-to")) (sync-period (args:get-arg "-period")) ;; NOT IMPLEMENTED YET (sync-timeout (args:get-arg "-timeout")) ;; NOT IMPLEMENTED YET (lockfile (conc dest-db".lock")) (keys (db:get-keys #f)) ) (if (and src-db dest-db) (begin (debug:print-info 0 *default-log-port* "Attempting to sync data from "src-db" to "dest-db"...") ;; (if (common:simple-file-lock lockfile) ;; (begin (if (not (file-exists? dest-db)) ;; use copy to get going (file-copy src-db dest-db)) (let ((res (dbmod:db-to-db-sync src-db dest-db 0 (dbfile:db-init-proc) keys))) ;; (common:simple-file-release-lock lockfile) (debug:print 0 *default-log-port* "Synced " res " records from "src-db" to "dest-db))) (debug:print 0 *default-log-port* "Skipping sync, there is a sync in progress.")) (set! *didsomething* #t)) (debug:print 0 *default-log-port* "Usage for -db2db; -to and -from must be specified")) (if (args:get-arg "-list-test-time") (let* ((toppath (launch:setup))) (task:get-test-times) (set! *didsomething* #t))) (if (args:get-arg "-list-run-time") |
︙ | ︙ |