Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add tests to check inter-process WAL locking. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | wal |
Files: | files | file ages | folders |
SHA1: |
9435f3135849e0d38fde1669201db508 |
User & Date: | dan 2010-04-14 18:06:51.000 |
Context
2010-04-14
| ||
18:50 | Add tests and fix bugs in WAL locking mechanism. (check-in: c18077f246 user: dan tags: wal) | |
18:06 | Add tests to check inter-process WAL locking. (check-in: 9435f31358 user: dan tags: wal) | |
15:49 | Improve the logLockRegion() function in log.c. (check-in: 5e9dd3bd8e user: dan tags: wal) | |
Changes
Changes to src/log.c.
︙ | ︙ | |||
1096 1097 1098 1099 1100 1101 1102 | /* 0000 */ {0, 0}, /* 0001 */ {4, 1}, /* 0010 */ {3, 1}, /* 0011 */ {3, 2}, /* 0100 */ {2, 1}, /* 0101 */ {0, 0}, /* 0110 */ {2, 2}, /* 0111 */ {2, 3}, /* 1000 */ {1, 1}, /* 1001 */ {0, 0}, /* 1010 */ {0, 0}, /* 1011 */ {0, 0}, /* 1100 */ {1, 2}, /* 1101 */ {0, 0}, | | | 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 | /* 0000 */ {0, 0}, /* 0001 */ {4, 1}, /* 0010 */ {3, 1}, /* 0011 */ {3, 2}, /* 0100 */ {2, 1}, /* 0101 */ {0, 0}, /* 0110 */ {2, 2}, /* 0111 */ {2, 3}, /* 1000 */ {1, 1}, /* 1001 */ {0, 0}, /* 1010 */ {0, 0}, /* 1011 */ {0, 0}, /* 1100 */ {1, 2}, /* 1101 */ {0, 0}, /* 1110 */ {0, 0}, /* 1111 */ {0, 0} }; int rc; /* Return code of fcntl() */ struct flock f; /* Locking operation */ assert( mRegion<ArraySize(aMap) && aMap[mRegion].iStart!=0 ); memset(&f, 0, sizeof(f)); |
︙ | ︙ |
Changes to test/lock2.test.
︙ | ︙ | |||
12 13 14 15 16 17 18 | # focus of this script is database locks between competing processes. # # $Id: lock2.test,v 1.11 2009/05/01 10:55:34 danielk1977 Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl | | < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | # focus of this script is database locks between competing processes. # # $Id: lock2.test,v 1.11 2009/05/01 10:55:34 danielk1977 Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl source $testdir/lock_common.tcl # Simple locking test case: # # lock2-1.1: Connect a second process to the database. # lock2-1.2: Establish a RESERVED lock with this process. # lock2-1.3: Get a SHARED lock with the second process. # lock2-1.4: Try for a RESERVED lock with process 2. This fails. |
︙ | ︙ |
Added test/lock_common.tcl.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | # 2010 April 14 # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: # # May you do good and not evil. # May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file contains code used by several different test scripts. The # code in this file allows testfixture to control another process (or # processes) to test locking. # # Launch another testfixture process to be controlled by this one. A # channel name is returned that may be passed as the first argument to proc # 'testfixture' to execute a command. The child testfixture process is shut # down by closing the channel. proc launch_testfixture {} { set prg [info nameofexec] if {$prg eq ""} { set prg [file join . testfixture] } set chan [open "|$prg tf_main.tcl" r+] fconfigure $chan -buffering line return $chan } # Execute a command in a child testfixture process, connected by two-way # channel $chan. Return the result of the command, or an error message. proc testfixture {chan cmd} { puts $chan $cmd puts $chan OVER set r "" while { 1 } { set line [gets $chan] if { $line == "OVER" } { return $r } if {[eof $chan]} { return "ERROR: Child process hung up" } append r $line } } # Write the main loop for the child testfixture processes into file # tf_main.tcl. The parent (this script) interacts with the child processes # via a two way pipe. The parent writes a script to the stdin of the child # process, followed by the word "OVER" on a line of its own. The child # process evaluates the script and writes the results to stdout, followed # by an "OVER" of its own. set f [open tf_main.tcl w] puts $f { set l [open log w] set script "" while {![eof stdin]} { flush stdout set line [gets stdin] puts $l "READ $line" if { $line == "OVER" } { catch {eval $script} result puts $result puts $l "WRITE $result" puts OVER puts $l "WRITE OVER" flush stdout set script "" } else { append script $line append script " ; " } } close $l } close $f |
Changes to test/wal.test.
︙ | ︙ | |||
11 12 13 14 15 16 17 | # This file implements regression tests for SQLite library. The # focus of this file is testing the operation of the library in # "PRAGMA journal_mode=WAL" mode. # set testdir [file dirname $argv0] source $testdir/tester.tcl | | < < < < < < < < < < < < < < < < | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | # This file implements regression tests for SQLite library. The # focus of this file is testing the operation of the library in # "PRAGMA journal_mode=WAL" mode. # set testdir [file dirname $argv0] source $testdir/tester.tcl source $testdir/lock_common.tcl proc reopen_db {} { catch { db close } file delete -force test.db test.db-wal sqlite3_wal db test.db } proc sqlite3_wal {args} { eval sqlite3 $args [lindex $args 0] eval { PRAGMA journal_mode = wal } } |
︙ | ︙ | |||
305 306 307 308 309 310 311 | } {ok} foreach handle {db db2 db3} { catch { $handle close } } unset handle #------------------------------------------------------------------------- # The following block of tests - wal-10.* - test that the WAL locking | | > > > > > > > > > > > > > > > | | > > > > > > > > | > > | > > > > > | | | | > > > | > > > > | > > > > > > > > > > | > > > > > | | | | | | | > > > > > > > > > > > > > > > > > > > > > > | > > > > > > | | > | > > > > > | | | | | | | | | | | | | | | < < | | | | | | | | | | | > | | | < < | < | | < | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > > > > > | | 289 290 291 292 293 294 295 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 | } {ok} foreach handle {db db2 db3} { catch { $handle close } } unset handle #------------------------------------------------------------------------- # The following block of tests - wal-10.* - test that the WAL locking # scheme works in simple cases. This block of tests is run twice. Once # using multiple connections in the address space of the current process, # and once with all connections except one running in external processes. # foreach code [list { set ::code2_chan [launch_testfixture] set ::code3_chan [launch_testfixture] proc code2 {tcl} { testfixture $::code2_chan $tcl } proc code3 {tcl} { testfixture $::code3_chan $tcl } set tn 1 } { proc code2 {tcl} { uplevel #0 $tcl } proc code3 {tcl} { uplevel #0 $tcl } set tn 2 }] { eval $code reopen_db # Open connections [db2] and [db3]. Depending on which iteration this # is, the connections may be created in this interpreter, or in # interpreters running in other OS processes. As such, the [db2] and [db3] # commands should only be accessed within [code2] and [code3] blocks, # respectively. # code2 { sqlite3 db2 test.db ; db2 eval { PRAGMA journal_mode = WAL } } code3 { sqlite3 db3 test.db ; db3 eval { PRAGMA journal_mode = WAL } } # Shorthand commands. Execute SQL using database connection [db2] or # [db3]. Return the results. # proc sql2 {sql} { code2 [list db2 eval $sql] } proc sql3 {sql} { code3 [list db3 eval $sql] } # Initialize the database schema and contents. # do_test wal-10.$tn.1 { execsql { CREATE TABLE t1(a, b); INSERT INTO t1 VALUES(1, 2); SELECT * FROM t1; } } {1 2} # Open a transaction and write to the database using [db]. Check that [db2] # is still able to read the snapshot before the transaction was opened. # do_test wal-10.$tn.2 { execsql { BEGIN; INSERT INTO t1 VALUES(3, 4); } sql2 {SELECT * FROM t1} } {1 2} # Have [db] commit the transaction. Check that [db2] is now seeing the # new, updated snapshot. # do_test wal-10.$tn.3 { execsql { COMMIT } sql2 {SELECT * FROM t1} } {1 2 3 4} # Have [db2] open a read transaction. Then write to the db via [db]. Check # that [db2] is still seeing the original snapshot. Then read with [db3]. # [db3] should see the newly committed data. # do_test wal-10.$tn.4 { sql2 { BEGIN ; SELECT * FROM t1} } {1 2 3 4} do_test wal-10.$tn.5 { execsql { INSERT INTO t1 VALUES(5, 6); } sql2 {SELECT * FROM t1} } {1 2 3 4} do_test wal-10.$tn.6 { sql3 {SELECT * FROM t1} } {1 2 3 4 5 6} do_test wal-10.$tn.7 { sql2 COMMIT } {} # Have [db2] open a write transaction. Then attempt to write to the # database via [db]. This should fail (writer lock cannot be obtained). # # Then open a read-transaction with [db]. Commit the [db2] transaction # to disk. Verify that [db] still cannot write to the database (because # it is reading an old snapshot). # # Close the current [db] transaction. Open a new one. [db] can now write # to the database (as it is not locked and [db] is reading the latest # snapshot). # do_test wal-10.$tn.7 { sql2 { BEGIN; INSERT INTO t1 VALUES(7, 8) ; } catchsql { INSERT INTO t1 VALUES(9, 10) } } {1 {database is locked}} do_test wal-10.$tn.8 { execsql { BEGIN ; SELECT * FROM t1 } } {1 2 3 4 5 6} do_test wal-10.$tn.9 { sql2 COMMIT catchsql { INSERT INTO t1 VALUES(9, 10) } } {1 {database is locked}} do_test wal-10.$tn.10 { execsql { COMMIT; BEGIN; INSERT INTO t1 VALUES(9, 10); COMMIT; } execsql { SELECT * FROM t1 } } {1 2 3 4 5 6 7 8 9 10} # Open a read transaction with [db2]. Check that this prevents [db] from # checkpointing the database. But not from writing to it. # do_test wal-10.$tn.11 { sql2 { BEGIN; SELECT * FROM t1 } } {1 2 3 4 5 6 7 8 9 10} do_test wal-10.$tn.12 { catchsql { PRAGMA checkpoint } } {1 {database is locked}} do_test wal-10.$tn.13 { execsql { INSERT INTO t1 VALUES(11, 12) } sql2 {SELECT * FROM t1} } {1 2 3 4 5 6 7 8 9 10} # Connection [db2] is holding a lock on a snapshot, preventing [db] from # checkpointing the database. Add a busy-handler to [db]. If [db2] completes # its transaction from within the busy-handler, [db] is able to complete # the checkpoint operation. # proc busyhandler x { if {$x==4} { sql2 COMMIT } if {$x<5} { return 0 } return 1 } db busy busyhandler do_test wal-10.$tn.14 { execsql { PRAGMA checkpoint } } {} # Similar to the test above. Except this time, a new read transaction is # started (db3) while the checkpointer is waiting for an old one (db2) to # finish. The checkpointer can finish, but any subsequent write operations # must wait until after db3 has closed the read transaction, as db3 is a # "region D" writer. # db busy {} do_test wal-10.$tn.15 { sql2 { BEGIN; SELECT * FROM t1; } } {1 2 3 4 5 6 7 8 9 10 11 12} do_test wal-10.$tn.16 { catchsql { PRAGMA checkpoint } } {1 {database is locked}} proc busyhandler x { if {$x==3} { sql3 { BEGIN; SELECT * FROM t1 } } if {$x==4} { sql2 COMMIT } if {$x<5} { return 0 } return 1 } db busy busyhandler do_test wal-10.$tn.9 { execsql { PRAGMA checkpoint } } {} do_test wal-10.$tn.10 { sql3 { SELECT * FROM t1 } } {1 2 3 4 5 6 7 8 9 10 11 12} do_test wal-10.$tn.11 { catchsql { INSERT INTO t1 VALUES(13, 14) } } {1 {database is locked}} do_test wal-10.$tn.12 { execsql { SELECT * FROM t1 } } {1 2 3 4 5 6 7 8 9 10 11 12} do_test wal-10.$tn.13 { sql3 COMMIT } {} do_test wal-10.$tn.14 { execsql { INSERT INTO t1 VALUES(13, 14) } execsql { SELECT * FROM t1 } } {1 2 3 4 5 6 7 8 9 10 11 12 13 14} catch { db close } catch { code2 { db2 close } } catch { code3 { db3 close } } catch { close $::code2_chan } catch { close $::code3_chan } } finish_test |