Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add extra tests to e_walckpt.test. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
84f9581019961efa31297f8be48427b1 |
User & Date: | dan 2014-12-09 20:13:40.856 |
Context
2014-12-09
| ||
22:24 | Fix the sqlite3_table_column_metadata() routine so that it gives the correct answer for the "rowid" column in a WITHOUT ROWID table. Enhance it so that it can be used to check for the existence of a table by setting the column name parameter to NULL. The routine is now included in the build by default, even without the SQLITE_ENABLE_COLUMN_METADATA compile-time option. (check-in: cf9be419a1 user: drh tags: trunk) | |
20:13 | Add extra tests to e_walckpt.test. (check-in: 84f9581019 user: dan tags: trunk) | |
19:16 | Lower the default SQLITE_SORTER_PMASZ value back to 10, where it has been for the past couple of releases. Applications that need a larger value can set one. (check-in: 1ba8911c18 user: drh tags: trunk) | |
Changes
Changes to src/test1.c.
︙ | ︙ | |||
5708 5709 5710 5711 5712 5713 5714 5715 5716 5717 5718 5719 5720 5721 | )){ return TCL_ERROR; } rc = sqlite3_wal_checkpoint_v2(db, zDb, eMode, &nLog, &nCkpt); if( rc!=SQLITE_OK && rc!=SQLITE_BUSY ){ const char *zErrCode = sqlite3ErrName(rc); Tcl_AppendResult(interp, zErrCode, " - ", (char *)sqlite3_errmsg(db), 0); return TCL_ERROR; } pRet = Tcl_NewObj(); Tcl_ListObjAppendElement(interp, pRet, Tcl_NewIntObj(rc==SQLITE_BUSY?1:0)); Tcl_ListObjAppendElement(interp, pRet, Tcl_NewIntObj(nLog)); | > | 5708 5709 5710 5711 5712 5713 5714 5715 5716 5717 5718 5719 5720 5721 5722 | )){ return TCL_ERROR; } rc = sqlite3_wal_checkpoint_v2(db, zDb, eMode, &nLog, &nCkpt); if( rc!=SQLITE_OK && rc!=SQLITE_BUSY ){ const char *zErrCode = sqlite3ErrName(rc); Tcl_ResetResult(interp); Tcl_AppendResult(interp, zErrCode, " - ", (char *)sqlite3_errmsg(db), 0); return TCL_ERROR; } pRet = Tcl_NewObj(); Tcl_ListObjAppendElement(interp, pRet, Tcl_NewIntObj(rc==SQLITE_BUSY?1:0)); Tcl_ListObjAppendElement(interp, pRet, Tcl_NewIntObj(nLog)); |
︙ | ︙ |
Changes to test/e_walckpt.test.
︙ | ︙ | |||
38 39 40 41 42 43 44 45 46 47 48 49 50 51 | set expect 0 catch { set expect [md5file $f] } if {$H($f) != $expect} { lappend ret $f } } set ret } # The following tests are run 3 times, each using a different method of # invoking a checkpoint: # # 1) Using sqlite3_wal_checkpoint_v2() # 2) Using "PRAGMA wal_checkpoint" # 3) Using sqlite3_wal_checkpoint() in place of checkpoint_v2(PASSIVE) | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | set expect 0 catch { set expect [md5file $f] } if {$H($f) != $expect} { lappend ret $f } } set ret } #------------------------------------------------------------------------- # All calls to the [sqlite3_wal_checkpoint_v2] command made within this # file use this wrapper. It's sole purpose is to throw an error if the # following requirement is violated: # # EVIDENCE-OF: R-60567-47780 Unless it returns SQLITE_MISUSE, the # sqlite3_wal_checkpoint_v2() interface sets the error information that # is queried by sqlite3_errcode() and sqlite3_errmsg(). # proc wal_checkpoint_v2 {db args} { set rc [catch { uplevel sqlite3_wal_checkpoint_v2 $db $args } msg] set errcode "SQLITE_OK" if {$rc} { set errcode [lindex [split $msg " "] 0] } elseif { [lindex $msg 0] } { set errcode "SQLITE_BUSY" } if {$errcode != "SQLITE_MISUSE" && [sqlite3_errcode $db] != $errcode} { error "sqlite3_errcode mismatch! (1) $errcode!=[sqlite3_errcode $db]" } if {$rc==0} { return $msg } else { error $msg } } # The following tests are run 3 times, each using a different method of # invoking a checkpoint: # # 1) Using sqlite3_wal_checkpoint_v2() # 2) Using "PRAGMA wal_checkpoint" # 3) Using sqlite3_wal_checkpoint() in place of checkpoint_v2(PASSIVE) |
︙ | ︙ | |||
59 60 61 62 63 64 65 | # EVIDENCE-OF: R-41613-20553 The sqlite3_wal_checkpoint(D,X) is # equivalent to # sqlite3_wal_checkpoint_v2(D,X,SQLITE_CHECKPOINT_PASSIVE,0,0). # foreach {tn script} { 1 { proc checkpoint {db mode args} { | | | 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 | # EVIDENCE-OF: R-41613-20553 The sqlite3_wal_checkpoint(D,X) is # equivalent to # sqlite3_wal_checkpoint_v2(D,X,SQLITE_CHECKPOINT_PASSIVE,0,0). # foreach {tn script} { 1 { proc checkpoint {db mode args} { eval wal_checkpoint_v2 [list $db] [list $mode] $args } } 2 { proc checkpoint {db mode args} { set sql "PRAGMA wal_checkpoint = $mode" if {[llength $args] && [lindex $args 0]!=""} { |
︙ | ︙ | |||
86 87 88 89 90 91 92 | proc checkpoint {db mode args} { if {$mode == "passive"} { set rc [eval sqlite3_wal_checkpoint [list $db] $args] if {$rc != "SQLITE_OK"} { error "$rc - [sqlite3_errmsg $db]" } } else { | | | 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 | proc checkpoint {db mode args} { if {$mode == "passive"} { set rc [eval sqlite3_wal_checkpoint [list $db] $args] if {$rc != "SQLITE_OK"} { error "$rc - [sqlite3_errmsg $db]" } } else { eval wal_checkpoint_v2 [list $db] [list $mode] $args } } } } { eval $script |
︙ | ︙ | |||
266 267 268 269 270 271 272 | switch -- $busy_handler_mode { 1 { # Do nothing. Do not block. return 1 } 2 { | | > > | > > | | | | > > > > > > > < > > > > > > > > | | | > > > | > > | | | | > | > | | | > > > > > > > > > > > | > > > > > > > > > > > > > > | | | > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 | switch -- $busy_handler_mode { 1 { # Do nothing. Do not block. return 1 } 2 { # Close first the reader, then later the writer. Give up before # closing the [db6] reader. if {$n==5} { catch {db2 eval commit} } if {$n==10} { catch {db3 eval commit} } if {$n==15} { return 1 } return 0 } 3 { # Close first the writer, then later the reader. And finally the # [db6] reader. if {$n==5} { catch {db2 eval commit} } if {$n==10} { catch {db3 eval commit} } if {$n==15} { catch {db6 eval commit} } return 0 } } } foreach {mode busy_handler_mode} { passive 1 full 1 full 2 full 3 restart 1 restart 2 restart 3 truncate 1 truncate 2 truncate 3 } { set tp "$tn.$mode.$busy_handler_mode" set ::sync_counter 0 # Set up a callback function for xSync and xWrite calls made during # the checkpoint. # set ::checkpoint_ongoing 0 proc tvfs_callback {method args} { if {$::checkpoint_ongoing==0} return set tail [file tail [lindex $args 0]] if {$method == "xSync" && $tail == "test.db"} { incr ::sync_counter } if {$method == "xWrite" && $tail=="test.db"} { if {$::write_ok < 0} { set ::write_ok [expr ![catch {db5 eval { BEGIN IMMEDIATE }}]] catch { db5 eval ROLLBACK } } if {$::read_ok < 0} { set ::read_ok [expr ![catch {db5 eval { SELECT * FROM t1 }}]] } # If one has not already been opened, open a read-transaction using # connection [db6] catch { db6 eval { BEGIN ; SELECT * FROM sqlite_master } } msg } if {$method == "xShmLock" } { set details [lindex $args 2] if {$details == "0 1 lock exclusive"} { set ::seen_writer_lock 1 } } } catch { db close } forcedelete test.db testvfs tvfs sqlite3 db test.db -vfs tvfs #tvfs filter xSync tvfs script tvfs_callback do_execsql_test $tp.0 { CREATE TABLE t1(a, b); CREATE TABLE t2(a, b); PRAGMA journal_mode = wal; INSERT INTO t1 VALUES(1, 2); INSERT INTO t1 VALUES(3, 4); INSERT INTO t1 VALUES(5, 6); } {wal} # Open a reader on the current database snapshot. do_test $tp.1 { sqlite3 db2 test.db -vfs tvfs execsql { BEGIN; SELECT * FROM t1 UNION ALL SELECT * FROM t2; } db2 } {1 2 3 4 5 6} # Open a writer. Write a transaction. Then begin, but do not commit, # a second transaction. do_test $tp.2 { sqlite3 db3 test.db -vfs tvfs execsql { INSERT INTO t2 VALUES(7, 8); BEGIN; INSERT INTO t2 VALUES(9, 10); SELECT * FROM t1 UNION ALL SELECT * FROM t2; } db3 } {1 2 3 4 5 6 7 8 9 10} sqlite3 db5 test.db -vfs tvfs sqlite3 db6 test.db -vfs tvfs # Register a busy-handler with connection [db]. # db busy [list busy_handler $mode $busy_handler_mode] set ::sync_counter 0 set ::busy_handler_counter 0 set ::read_ok -1 set ::write_ok -1 set ::seen_writer_lock 0 set ::checkpoint_ongoing 1 do_test $tp.3 { checkpoint db $mode main set {} {} } {} set ::checkpoint_ongoing 0 set ::did_restart_blocking [expr {[catch {db6 eval commit}]}] if { $mode=="passive" } { # EVIDENCE-OF: R-16333-64433 Checkpoint as many frames as possible # without waiting for any database readers or writers to finish, then # sync the database file if all frames in the log were checkpointed. # # "As many frames as possible" means all but the last two transactions # (the two that write to table t2, of which the scond is unfinished). # So copying the db file only we see the t1 change, but not the t2 # modifications. # # The busy handler is not invoked (see below) and the db reader and # writer are still active - so the checkpointer did not wait for either # readers or writers. As a result the checkpoint was not finished and # so the db file is not synced. # # EVIDENCE-OF: R-62920-47450 The busy-handler callback is never invoked # in the SQLITE_CHECKPOINT_PASSIVE mode. # # It's not. Test case "$tp.6". # do_test $tp.4 { forcecopy test.db abc.db sqlite3 db4 abc.db db4 eval { SELECT * FROM t1 UNION ALL SELECT * FROM t2 } } {1 2 3 4 5 6} do_test $tp.5 { set ::sync_counter } 0 do_test $tp.6 { set ::busy_handler_counter } 0 db4 close db2 eval COMMIT db3 eval COMMIT # EVIDENCE-OF: R-65499-53765 On the other hand, passive mode might leave # the checkpoint unfinished if there are concurrent readers or writers. # # The reader and writer have now dropped their locks. And so a # checkpoint now is able to checkpoint more frames. Showing that the # attempt above was left "unfinished". # # Also, because the checkpoint finishes this time, the db is synced. # Which is part of R-16333-64433 above. # set ::checkpoint_ongoing 1 do_test $tp.7 { checkpoint db $mode main forcecopy test.db abc.db sqlite3 db4 abc.db db4 eval { SELECT * FROM t1 UNION ALL SELECT * FROM t2 } } {1 2 3 4 5 6 7 8 9 10} set ::checkpoint_ongoing 0 do_test $tp.7 { set ::sync_counter } 1 do_test $tp.8 { set ::busy_handler_counter } 0 db4 close } if { $mode=="full" || $mode=="restart" || $mode=="truncate" } { # EVIDENCE-OF: R-59782-36818 The SQLITE_CHECKPOINT_FULL, RESTART and # TRUNCATE modes also obtain the exclusive "writer" lock on the # database file. # # Or at least attempts to obtain. # do_test $tp.9 { set ::seen_writer_lock } {1} if {$busy_handler_mode==2 || $busy_handler_mode==3} { # EVIDENCE-OF: R-59171-47567 This mode blocks (it invokes the # busy-handler callback) until there is no database writer and all # readers are reading from the most recent database snapshot. # # The test below shows that both the reader and writer have # finished: # # Also restated by the following two. That both busy_handler_mode # values 2 and 3 work show that both of the following are true - as # they release the reader and writer transactions in different # orders. # # EVIDENCE-OF: R-60642-04082 If the writer lock cannot be obtained # immediately, and a busy-handler is configured, it is invoked and the # writer lock retried until either the busy-handler returns 0 or the # lock is successfully obtained. # # EVIDENCE-OF: R-48107-00250 The busy-handler is also invoked while # waiting for database readers as described above. # do_test $tp.7 { list [catchsql COMMIT db2] [catchsql COMMIT db3] } [list \ {1 {cannot commit - no transaction is active}} \ {1 {cannot commit - no transaction is active}} \ ] # EVIDENCE-OF: R-29177-48281 It then checkpoints all frames in the log # file and syncs the database file. # do_test $tp.8 { forcecopy test.db abc.db sqlite3 db4 abc.db db4 eval { SELECT * FROM t1 UNION ALL SELECT * FROM t2 } } {1 2 3 4 5 6 7 8 9 10} do_test $tp.9 { set ::sync_counter } 1 db4 close # EVIDENCE-OF: R-51867-44713 This mode blocks new database writers # while it is pending, but new database readers are allowed to continue # unimpeded. # # EVIDENCE-OF: R-47276-58266 Like SQLITE_CHECKPOINT_FULL, this mode # blocks new database writer attempts while it is pending, but does not # impede readers. # # The first of the above two refers to "full" mode. The second # to "restart". # do_test $tp.10.1 { list $::write_ok $::read_ok } {0 1} # EVIDENCE-OF: R-12410-31217 This mode works the same way as # SQLITE_CHECKPOINT_FULL with the addition that after checkpointing the # log file it blocks (calls the busy-handler callback) until all # readers are reading from the database file only. # # The stuff above passed, so the first part of this requirement # is met. The second part is tested below. If the checkpoint mode # was "restart" or "truncate", then the busy-handler will have # been called to block on wal-file readers. # do_test $tp.11 { set ::did_restart_blocking } [expr {($mode=="restart"||$mode=="truncate")&&$busy_handler_mode==3}] # EVIDENCE-OF: R-44699-57140 This mode works the same way as # SQLITE_CHECKPOINT_RESTART with the addition that it also truncates # the log file to zero bytes just prior to a successful return. if {$mode=="truncate" && $busy_handler_mode==3} { do_test $tp.12 { file size test.db-wal } 0 } } elseif {$busy_handler_mode==1} { # EVIDENCE-OF: R-34519-06271 SQLITE_BUSY is returned in this case. if {$tn!=2} { # ($tn==2) is the loop that uses "PRAGMA wal_checkpoint" do_test $tp.13 { sqlite3_errcode db } {SQLITE_BUSY} } # EVIDENCE-OF: R-49155-63541 If the busy-handler returns 0 before the # writer lock is obtained or while waiting for database readers, the # checkpoint operation proceeds from that point in the same way as # SQLITE_CHECKPOINT_PASSIVE - checkpointing as many frames as possible # without blocking any further. do_test $tp.14 { forcecopy test.db abc.db sqlite3 db4 abc.db db4 eval { SELECT * FROM t1 UNION ALL SELECT * FROM t2 } } {1 2 3 4 5 6} do_test $tp.15 { set ::sync_counter } 0 do_test $tp.16 { set ::busy_handler_counter } 1 db4 close } } db2 close db3 close db5 close db6 close } db close tvfs delete } #----------------------------------------------------------------------- |
︙ | ︙ | |||
476 477 478 479 480 481 482 | 4 2 {0 {0 -1 -1}} 5 3 {0 {0 -1 -1}} 6 4 {1 {SQLITE_MISUSE - not an error}} 7 114 {1 {SQLITE_MISUSE - not an error}} 8 1000000 {1 {SQLITE_MISUSE - not an error}} } { do_test 4.$tn { | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 | 4 2 {0 {0 -1 -1}} 5 3 {0 {0 -1 -1}} 6 4 {1 {SQLITE_MISUSE - not an error}} 7 114 {1 {SQLITE_MISUSE - not an error}} 8 1000000 {1 {SQLITE_MISUSE - not an error}} } { do_test 4.$tn { list [catch "wal_checkpoint_v2 db $mode" msg] $msg } $res } db close foreach tn {1 2 3} { forcedelete test.db test.db2 test.db3 testvfs tvfs sqlite3 db test.db -vfs tvfs execsql { ATTACH 'test.db2' AS aux2; ATTACH 'test.db3' AS aux3; PRAGMA main.journal_mode = WAL; PRAGMA aux2.journal_mode = WAL; PRAGMA aux3.journal_mode = WAL; CREATE TABLE main.t1(x,y); CREATE TABLE aux2.t2(x,y); CREATE TABLE aux3.t3(x,y); INSERT INTO t1 VALUES('a', 'b'); INSERT INTO t2 VALUES('a', 'b'); INSERT INTO t3 VALUES('a', 'b'); } sqlite3 db2 test.db2 -vfs tvfs switch -- $tn { 1 { # EVIDENCE-OF: R-41299-52117 If no error (SQLITE_BUSY or otherwise) is # encountered while processing the attached databases, SQLITE_OK is # returned. do_test 5.$tn.1 { lindex [wal_checkpoint_v2 db truncate] 0 } {0} ;# 0 -> SQLITE_OK do_test 5.$tn.2 { list [expr [file size test.db-wal]==0] \ [expr [file size test.db2-wal]==0] \ [expr [file size test.db3-wal]==0] } {1 1 1} } 2 { # EVIDENCE-OF: R-38578-34175 If an SQLITE_BUSY error is encountered when # processing one or more of the attached WAL databases, the operation is # still attempted on any remaining attached databases and SQLITE_BUSY is # returned at the end. db2 eval { BEGIN; INSERT INTO t2 VALUES('d', 'e'); } do_test 5.$tn.1 { lindex [wal_checkpoint_v2 db truncate] 0 } {1} ;# 1 -> SQLITE_BUSY do_test 5.$tn.2 { list [expr [file size test.db-wal]==0] \ [expr [file size test.db2-wal]==0] \ [expr [file size test.db3-wal]==0] } {1 0 1} db2 eval ROLLBACK } 3 { # EVIDENCE-OF: R-38049-07913 If any other error occurs while processing # an attached database, processing is abandoned and the error code is # returned to the caller immediately. tvfs filter xWrite tvfs script inject_ioerr proc inject_ioerr {method file args} { if {[file tail $file]=="test.db2"} { return "SQLITE_IOERR" } return 0 } do_test 5.$tn.1 { list [catch { wal_checkpoint_v2 db truncate } msg] $msg } {1 {SQLITE_IOERR - disk I/O error}} do_test 5.$tn.2 { list [expr [file size test.db-wal]==0] \ [expr [file size test.db2-wal]==0] \ [expr [file size test.db3-wal]==0] } {1 0 0} tvfs script "" } } db close db2 close } reset_db sqlite3 db2 test.db do_test 6.1 { execsql { PRAGMA journal_mode = WAL; CREATE TABLE t1(a, b); INSERT INTO t1 VALUES(1, 2); } file size test.db-wal } [wal_file_size 3 1024] do_test 6.2 { db2 eval { BEGIN; SELECT * FROM t1; } db eval { INSERT INTO t1 VALUES(3, 4) } file size test.db-wal } [wal_file_size 4 1024] # At this point the log file contains 4 frames. 3 of which it should # be possible to checkpoint. # # EVIDENCE-OF: R-16642-42503 If pnLog is not NULL, then *pnLog is set to # the total number of frames in the log file or to -1 if the checkpoint # could not run because of an error or because the database is not in # WAL mode. # # EVIDENCE-OF: R-10514-25250 If pnCkpt is not NULL,then *pnCkpt is set # to the total number of checkpointed frames in the log file (including # any that were already checkpointed before the function was called) or # to -1 if the checkpoint could not run due to an error or because the # database is not in WAL mode. # do_test 6.4 { lrange [wal_checkpoint_v2 db passive] 1 2 } {4 3} # EVIDENCE-OF: R-37257-17813 Note that upon successful completion of an # SQLITE_CHECKPOINT_TRUNCATE, the log file will have been truncated to # zero bytes and so both *pnLog and *pnCkpt will be set to zero. # do_test 6.5 { db2 eval COMMIT wal_checkpoint_v2 db truncate } {0 0 0} finish_test |