Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add tests to walthread.test. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | wal |
Files: | files | file ages | folders |
SHA1: |
9e891e7543ea4d7dee76deb2456af940 |
User & Date: | dan 2010-04-29 08:47:28.000 |
Context
2010-04-29
| ||
14:51 | Fix a bug in the WAL checkpoint code causing SQLite to use an inconsistent cache in a subsequent transaction. (check-in: d1cadeed4e user: dan tags: wal) | |
08:47 | Add tests to walthread.test. (check-in: 9e891e7543 user: dan tags: wal) | |
2010-04-28
| ||
18:17 | Add a test to walthread.test for changing between WAL and rollback modes. (check-in: da229e44bd user: dan tags: wal) | |
Changes
Changes to test/walthread.test.
︙ | ︙ | |||
17 18 19 20 21 22 23 | source $testdir/tester.tcl source $testdir/lock_common.tcl if {[run_thread_tests]==0} { finish_test ; return } set sqlite_walsummary_mmap_incr 64 | | | | | > > > > > > > > > < < > > > > > > > > > > > > > > > > > > | | > > > > > > | | | 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 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 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 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 | source $testdir/tester.tcl source $testdir/lock_common.tcl if {[run_thread_tests]==0} { finish_test ; return } set sqlite_walsummary_mmap_incr 64 # How long, in seconds, to run each test for. If a test is set to run for # 0 seconds, it is omitted entirely. # set seconds(walthread-1) 0 set seconds(walthread-2) 0 set seconds(walthread-3) 20 # The parameter is the name of a variable in the callers context. The # variable may or may not exist when this command is invoked. # # If the variable does exist, its value is returned. Otherwise, this # command uses [vwait] to wait until it is set, then returns the value. # In other words, this is a version of the [set VARNAME] command that # blocks until a variable exists. # proc wait_for_var {varname} { if {0==[uplevel [list info exists $varname]]} { uplevel [list vwait $varname] } uplevel [list set $varname] } # The argument is the name of a list variable in the callers context. The # first element of the list is removed and returned. For example: # # set L {a b c} # set x [lshift L] # assert { $x == "a" && $L == "b c" } # proc lshift {lvar} { upvar $lvar L set ret [lindex $L 0] set L [lrange $L 1 end] return $ret } #------------------------------------------------------------------------- # do_thread_test TESTNAME OPTIONS... # # where OPTIONS are: # # -seconds SECONDS How many seconds to run the test for # -init SCRIPT Script to run before test. # -thread NAME COUNT SCRIPT Scripts to run in threads (or processes). # -processes BOOLEAN True to use processes instead of threads. # -check SCRIPT Script to run after test. # proc do_thread_test {args} { set A $args set P(testname) [lshift A] set P(seconds) 5 set P(init) "" set P(threads) [list] set P(processes) 0 set P(check) { set ic [db eval "PRAGMA integrity_check"] if {$ic != "ok"} { error $ic } } unset -nocomplain ::done while {[llength $A]>0} { set a [lshift A] switch -glob -- $a { -seconds { set P(seconds) [lshift A] } -init { set P(init) [lshift A] } -processes { set P(processes) [lshift A] } -check { set P(check) [lshift A] } -thread { set name [lshift A] set count [lshift A] set prg [lshift A] lappend P(threads) [list $name $count $prg] } default { error "Unknown option: $a" } } } if {$P(seconds) == 0} { puts "Skipping $P(testname)" return } puts "Running $P(testname) for $P(seconds) seconds..." catch { db close } file delete -force test.db test.db-journal test.db-wal sqlite3 db test.db eval $P(init) db close foreach T $P(threads) { set name [lindex $T 0] set count [lindex $T 1] set prg [lindex $T 2] for {set i 1} {$i <= $count} {incr i} { set vars " set E(pid) $i set E(nthread) $count set E(seconds) $P(seconds) " set program [string map [list %TEST% $prg %VARS% $vars] { %VARS% proc usleep {ms} { set ::usleep 0 after $ms {set ::usleep 1} vwait ::usleep } proc integrity_check {{db db}} { set ic [$db eval {PRAGMA integrity_check}] if {$ic != "ok"} {error $ic} } proc busyhandler {n} { usleep 10 ; return 0 } sqlite3 db test.db db busy busyhandler db eval { SELECT randomblob($E(pid)*5) } set ::finished 0 after [expr $E(seconds) * 1000] {set ::finished 1} proc tt_continue {} { update ; expr ($::finished==0) } set rc [catch { %TEST% } msg] catch { db close } list $rc $msg }] |
︙ | ︙ | |||
162 163 164 165 166 167 168 | lappend reslist [lindex $res 1] do_test $P(testname).$name.$i [list lindex $res 0] 0 } append report " $name $reslist" } puts $report | | > > > > | > > > > > > > > > > > > > > | | 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 | lappend reslist [lindex $res 1] do_test $P(testname).$name.$i [list lindex $res 0] 0 } append report " $name $reslist" } puts $report sqlite3 db test.db set res "" if {[catch $P(check) msg]} { set res $msg } do_test $P(testname).check [list set {} $res] "" } # A wrapper around [do_thread_test] which runs the specified test twice. # Once using processes, once using threads. This command takes the same # arguments as [do_thread_test], except specifying the -processes switch # is illegal. # proc do_thread_test2 {args} { set name [lindex $args 0] if {[lsearch $args -processes]>=0} { error "bad option: -processes"} uplevel [lreplace $args 0 0 do_thread_test "$name-threads" -processes 0] uplevel [lreplace $args 0 0 do_thread_test "$name-processes" -processes 1] } #-------------------------------------------------------------------------- # Start 10 threads. Each thread performs both read and write # transactions. Each read transaction consists of: # # 1) Reading the md5sum of all but the last table row, # 2) Running integrity check. # 3) Reading the value stored in the last table row, # 4) Check that the values read in steps 1 and 3 are the same, and that # the md5sum of all but the last table row has not changed. |
︙ | ︙ | |||
188 189 190 191 192 193 194 | # transaction in a loop as fast as possible. # # There is also a single checkpointer thread. It runs the following loop: # # 1) Execute "PRAGMA checkpoint" # 2) Sleep for 500 ms. # | | < < < < < | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | < > > > > > > > > > > | > > > > > > | < < < | | | | | | | | | | | | | | | | > > > | | < | | | > | | | | | | | | | | | | | | | > > > | | < | | > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 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 | # transaction in a loop as fast as possible. # # There is also a single checkpointer thread. It runs the following loop: # # 1) Execute "PRAGMA checkpoint" # 2) Sleep for 500 ms. # do_thread_test2 walthread-1 -seconds $seconds(walthread-1) -init { execsql { PRAGMA journal_mode = WAL; CREATE TABLE t1(x PRIMARY KEY); PRAGMA lock_status; INSERT INTO t1 VALUES(randomblob(100)); INSERT INTO t1 VALUES(randomblob(100)); INSERT INTO t1 SELECT md5sum(x) FROM t1; } } -thread main 10 { proc read_transaction {} { set results [db eval { BEGIN; PRAGMA integrity_check; SELECT md5sum(x) FROM t1 WHERE rowid != (SELECT max(rowid) FROM t1); SELECT x FROM t1 WHERE rowid = (SELECT max(rowid) FROM t1); SELECT md5sum(x) FROM t1 WHERE rowid != (SELECT max(rowid) FROM t1); COMMIT; }] if {[llength $results]!=4 || [lindex $results 0] != "ok" || [lindex $results 1] != [lindex $results 2] || [lindex $results 2] != [lindex $results 3] } { error "Failed read transaction: $results" } } proc write_transaction {} { db eval { BEGIN; INSERT INTO t1 VALUES(randomblob(100)); INSERT INTO t1 VALUES(randomblob(100)); INSERT INTO t1 SELECT md5sum(x) FROM t1; COMMIT; } } set nRun 0 while {[tt_continue]} { read_transaction write_transaction incr nRun } set nRun } -thread ckpt 1 { set nRun 0 while {[tt_continue]} { db eval "PRAGMA checkpoint" usleep 500 incr nRun } set nRun } #-------------------------------------------------------------------------- # This test has clients run the following procedure as fast as possible # in a loop: # # 1. Open a database handle. # 2. Execute a read-only transaction on the db. # 3. Do "PRAGMA journal_mode = XXX", where XXX is one of WAL or DELETE. # Ignore any SQLITE_BUSY error. # 4. Execute a write transaction to insert a row into the db. # 5. Run "PRAGMA integrity_check" # # At present, there are 4 clients in total. 2 do "journal_mode = WAL", and # two do "journal_mode = DELETE". # # Each client returns a string of the form "W w, R r", where W is the # number of write-transactions performed using a WAL journal, and D is # the number of write-transactions performed using a rollback journal. # For example, "192 w, 185 r". # do_thread_test2 walthread-2 -seconds $seconds(walthread-2) -init { execsql { CREATE TABLE t1(x INTEGER PRIMARY KEY, y UNIQUE) } } -thread RB 2 { db close set nRun 0 set nDel 0 while {[tt_continue]} { sqlite3 db test.db db busy busyhandler db eval { SELECT * FROM sqlite_master } catch { db eval { PRAGMA journal_mode = DELETE } } db eval { BEGIN; INSERT INTO t1 VALUES(NULL, randomblob(100+$E(pid))); } incr nRun 1 incr nDel [file exists test.db-journal] if {[file exists test.db-journal] + [file exists test.db-wal] != 1} { error "File-system looks bad..." } db eval COMMIT integrity_check db close } list $nRun $nDel set {} "[expr $nRun-$nDel] w, $nDel r" } -thread WAL 2 { db close set nRun 0 set nDel 0 while {[tt_continue]} { sqlite3 db test.db db busy busyhandler db eval { SELECT * FROM sqlite_master } catch { db eval { PRAGMA journal_mode = WAL } } db eval { BEGIN; INSERT INTO t1 VALUES(NULL, randomblob(110+$E(pid))); } incr nRun 1 incr nDel [file exists test.db-journal] if {[file exists test.db-journal] + [file exists test.db-wal] != 1} { error "File-system looks bad..." } db eval COMMIT integrity_check db close } set {} "[expr $nRun-$nDel] w, $nDel r" } do_thread_test2 walthread-3 -seconds $seconds(walthread-3) -init { execsql { PRAGMA journal_mode = WAL; CREATE TABLE t1(cnt PRIMARY KEY, sum1, sum2); CREATE INDEX i1 ON t1(sum1); CREATE INDEX i2 ON t1(sum2); INSERT INTO t1 VALUES(0, 0, 0); } } -thread t 10 { set nextwrite $E(pid) proc wal_hook {zDb nEntry} { if {$nEntry>10} { return 1 } return 0 } db wal_hook wal_hook while {[tt_continue]} { set max 0 while { $max != ($nextwrite-1) && [tt_continue] } { set max [db eval { SELECT max(cnt) FROM t1 }] } if {[tt_continue]} { set sum1 [db eval { SELECT sum(cnt) FROM t1 }] set sum2 [db eval { SELECT sum(sum1) FROM t1 }] db eval { INSERT INTO t1 VALUES($nextwrite, $sum1, $sum2) } incr nextwrite $E(nthread) integrity_check } } set {} ok } -check { puts " Final db contains [db eval {SELECT count(*) FROM t1}] rows" puts " Final integrity-check says: [db eval {PRAGMA integrity_check}]" # Check that the contents of the database are Ok. set c 0 set s1 0 set s2 0 db eval { SELECT cnt, sum1, sum2 FROM t1 ORDER BY cnt } { if {$c != $cnt || $s1 != $sum1 || $s2 != $sum2} { error "database content is invalid" } incr s2 $s1 incr s1 $c incr c 1 } } finish_test |