Overview
Comment: | Part of the transaction support for writes patched in |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
fb8ea93dd700870a007784b0f583e29e |
User & Date: | mrwellan on 2013-02-26 14:31:59 |
Other Links: | manifest | tags |
Context
2013-02-26
| ||
22:18 | Added server start to Makefile check-in: c4982d7367 user: matt tags: trunk | |
14:31 | Part of the transaction support for writes patched in check-in: fb8ea93dd7 user: mrwellan tags: trunk | |
09:13 | Cherrypicked 0c30d1cfe5 d67a67f9a4 into trunk check-in: 351bb3585b user: mrwellan tags: trunk | |
Changes
Modified db.scm from [cd2e3d6605] to [624516fedb].
︙ | ︙ | |||
32 33 34 35 36 37 38 | (include "common_records.scm") (include "db_records.scm") (include "key_records.scm") (include "run_records.scm") ;; timestamp type (val1 val2 ...) ;; type: meta-info, step | | > > | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | (include "common_records.scm") (include "db_records.scm") (include "key_records.scm") (include "run_records.scm") ;; timestamp type (val1 val2 ...) ;; type: meta-info, step (define *incoming-writes* '()) (define *completed-writes* '()) (define *incoming-last-time* (current-seconds)) (define *incoming-mutex* (make-mutex)) (define *completed-mutex* (make-mutex)) (define *cache-on* #f) (define (db:set-sync db) (let* ((syncval (config-lookup *configdat* "setup" "synchronous")) (val (cond ;; 0 | OFF | 1 | NORMAL | 2 | FULL; ((not syncval) #f) ((string->number syncval) |
︙ | ︙ | |||
1318 1319 1320 1321 1322 1323 1324 | (define (db:write-cached-data) (open-run-close (lambda (db . junkparams) (let ((queries (make-hash-table)) (data #f)) (mutex-lock! *incoming-mutex*) | | | | < < < < < < | < < < | | | | < > | < | | < < | | | < > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > | > | | 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 | (define (db:write-cached-data) (open-run-close (lambda (db . junkparams) (let ((queries (make-hash-table)) (data #f)) (mutex-lock! *incoming-mutex*) (set! data (reverse *incoming-writes*)) ;; (sort ... (lambda (a b)(< (vector-ref a 1)(vector-ref b 1))))) (set! *incoming-writes* '()) (mutex-unlock! *incoming-mutex*) (if (> (length data) 0) (debug:print-info 4 "Writing cached data " data)) ;; prepare the needed statements (for-each (lambda (request-item) (let ((stmt-key (vector-ref request-item 0))) (if (not (hash-table-ref/default queries stmt-key #f)) (let ((stmt (alist-ref stmt-key db:queries))) (if stmt (hash-table-set! queries stmt-key (sqlite3:prepare db (car stmt))) (debug:print 0 "ERROR: Missing query spec for " stmt-key "!")))))) data) ;; No outer loop needed. Single loop for write items only. Reads trigger flush of queue ;; and then are executed. (sqlite3:with-transaction db (lambda () (debug:print-info 11 "flushing " data " to db") (for-each (lambda (hed) (let ((params (vector-ref hed 2)) (stmt-key (vector-ref hed 0))) (debug:print-info 11 "Executing " stmt-key " for " params) (apply sqlite3:execute (hash-table-ref queries stmt-key) params))) data))) ;; let all the waiting calls know all is done (mutex-lock! *completed-mutex*) (set! *completed-writes* (append *completed-writes* data)) (mutex-unlock! *completed-mutex*) ;; finalize the statements (for-each (lambda (stmt-key) (sqlite3:finalize! (hash-table-ref queries stmt-key))) (hash-table-keys queries)) ;; keep a little chest thumping data around (let ((cache-size (length data))) (if (> cache-size *max-cache-size*) (set! *max-cache-size* cache-size))) )) #f)) ;; The queue is a list of vectors where the zeroth slot indicates the type of query to ;; apply and the second slot is the time of the query and the third entry is a list of ;; values to be applied ;; ;; (define (db:process-queue db pubsock indata) ;; (let* ((data (sort indata (lambda (a b) ;; (< (cdb:packet-get-qtime a)(cdb:packet-get-qtime b)))))) ;; (for-each ;; (lambda (item) ;; (db:process-queue-item db pubsock item)) ;; data))) (define (db:queue-write-and-wait db item) (let ((res #f) (got-it #f) (qry-sig (cdb:packet-get-query-sig item))) (mutex-lock! *incoming-mutex*) (set! *incoming-writes (cons item *incoming-writes*)) (mutex-unlock! *incoming-mutex*) ;; let the queue build three times, look for processed ;; item. (let loop ((count 0)) (debug:print-info 11 "db:queue-write-and-wait count=" count ", item=" item) (thread-sleep! 0.1) (mutex-lock! *completed-mutex*) (for-each (lambda (result) (if (equal? (cdb:packet-get-query-sig result) qry-sig) (set! got-it #t))) *completed-writes*) (mutex-unlock! *completed-mutex*) (if (not got-it) (if (< count 4) ;; give it 3/10 of a second of queue up time (loop (+ count 1)) (db:write-cached-data)))) ;; at the point db:write-cached-data was called either by this call ;; or by another. Now every 1/100 sec check to see if this query is ;; at the "head" of the completed queue and pop it off (let loop () (thread-sleep! 0.001) ;; there must always be at least one item in the completed-writes at this point, right? (mutex-lock! *completed-mutex*) (set! res (car *completed-writes*)) (mutex-unlock! *completed-mutex*) (if (equal? (cdb:packet-get-query-sig res) qry-sig) ;; yay! we are done! (begin (mutex-lock! *completed-mutex*) (set! *completed-writes* (cdr *completed-writes*)) (mutex-unlock! *completed-mutex*) res) (loop))))) (define (db:process-queue-item db item) (let* ((stmt-key (cdb:packet-get-qtype item)) (qry-sig (cdb:packet-get-query-sig item)) (return-address (cdb:packet-get-client-sig item)) (params (cdb:packet-get-params item)) (query (let ((q (alist-ref stmt-key db:queries))) (if q (car q) #f)))) (debug:print-info 11 "Special queries/requests stmt-key=" stmt-key ", return-address=" return-address ", query=" query ", params=" params) (cond (query ;; transactionize needed here. ;; (case *transport-type* ;; ((http)(db:queue-write-and-wait db item)) ;; (else (apply sqlite3:execute db query params) ;; )) (server:reply return-address qry-sig #t #t)) ((member stmt-key db:special-queries) (debug:print-info 11 "Handling special statement " stmt-key) (case stmt-key ((immediate) (let ((proc (car params)) (remparams (cdr params))) ;; we are being handed a procedure so call it |
︙ | ︙ |