Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Some fixes to the test suite so that it works with ZERO_DAMAGE set to true. Still lots more problems remain. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | statvfs |
| Files: | files | file ages | folders |
| SHA1: |
41891b231e20a1d32b1d7449e7863470 |
| User & Date: | drh 2011-12-19 00:31:09 |
Context
|
2011-12-19
| ||
| 10:07 | Modify test cases to account for the ZERO_DAMAGE change. (check-in: 68684495 user: dan tags: statvfs) | |
| 00:31 | Some fixes to the test suite so that it works with ZERO_DAMAGE set to true. Still lots more problems remain. (check-in: 41891b23 user: drh tags: statvfs) | |
|
2011-12-17
| ||
| 20:02 | For improved clarity of presentation, refactor some of the code associated with ZERO_DAMAGE and sector-size. (check-in: 1dde96c9 user: drh tags: statvfs) | |
Changes
Changes to src/test_vfs.c.
1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 |
if( aFlag[idx].iValue<0 && nFlags>1 ){
Tcl_AppendResult(interp, "bad flags: ", Tcl_GetString(objv[2]), 0);
return TCL_ERROR;
}
iNew |= aFlag[idx].iValue;
}
p->iDevchar = iNew;
}
pRet = Tcl_NewObj();
for(iFlag=0; iFlag<sizeof(aFlag)/sizeof(aFlag[0]); iFlag++){
if( p->iDevchar & aFlag[iFlag].iValue ){
Tcl_ListObjAppendElement(
interp, pRet, Tcl_NewStringObj(aFlag[iFlag].zName, -1)
|
| |
1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 |
if( aFlag[idx].iValue<0 && nFlags>1 ){
Tcl_AppendResult(interp, "bad flags: ", Tcl_GetString(objv[2]), 0);
return TCL_ERROR;
}
iNew |= aFlag[idx].iValue;
}
p->iDevchar = iNew| 0x10000000;
}
pRet = Tcl_NewObj();
for(iFlag=0; iFlag<sizeof(aFlag)/sizeof(aFlag[0]); iFlag++){
if( p->iDevchar & aFlag[iFlag].iValue ){
Tcl_ListObjAppendElement(
interp, pRet, Tcl_NewStringObj(aFlag[iFlag].zName, -1)
|
Changes to test/incrvacuum2.test.
187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 |
do_test 4.2 {
execsql {
PRAGMA journal_mode = WAL;
PRAGMA incremental_vacuum(1);
PRAGMA wal_checkpoint;
}
file size test.db-wal
} {1640}
do_test 4.3 {
db close
sqlite3 db test.db
set maxsz 0
while {[file size test.db] > [expr 512*3]} {
execsql { PRAGMA journal_mode = WAL }
execsql { PRAGMA wal_checkpoint }
execsql { PRAGMA incremental_vacuum(1) }
set newsz [file size test.db-wal]
if {$newsz>$maxsz} {set maxsz $newsz}
}
set maxsz
} {2176}
}
finish_test
|
| | |
187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 |
do_test 4.2 {
execsql {
PRAGMA journal_mode = WAL;
PRAGMA incremental_vacuum(1);
PRAGMA wal_checkpoint;
}
file size test.db-wal
} [expr {32+2*(512+24)}]
do_test 4.3 {
db close
sqlite3 db test.db
set maxsz 0
while {[file size test.db] > [expr 512*3]} {
execsql { PRAGMA journal_mode = WAL }
execsql { PRAGMA wal_checkpoint }
execsql { PRAGMA incremental_vacuum(1) }
set newsz [file size test.db-wal]
if {$newsz>$maxsz} {set maxsz $newsz}
}
set maxsz
} [expr {32+3*(512+24)}]
}
finish_test
|
Changes to test/journal2.test.
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
...
227
228
229
230
231
232
233
234
|
string range [string repeat "${a_string_counter}." $n] 1 $n
}
# Create a [testvfs] and install it as the default VFS. Set the device
# characteristics flags to "SAFE_DELETE".
#
testvfs tvfs -default 1
tvfs devchar undeletable_when_open
# Set up a hook so that each time a journal file is opened, closed or
# deleted, the method name ("xOpen", "xClose" or "xDelete") and the final
# segment of the journal file-name (i.e. "test.db-journal") are appended to
# global list variable $::oplog.
#
tvfs filter {xOpen xClose xDelete}
................................................................................
set ::oplog
} {xClose test.db-journal xDelete test.db-journal}
db close
}
tvfs delete
finish_test
|
|
<
|
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
...
227
228
229
230
231
232
233
|
string range [string repeat "${a_string_counter}." $n] 1 $n
}
# Create a [testvfs] and install it as the default VFS. Set the device
# characteristics flags to "SAFE_DELETE".
#
testvfs tvfs -default 1
tvfs devchar {undeletable_when_open zero_damage}
# Set up a hook so that each time a journal file is opened, closed or
# deleted, the method name ("xOpen", "xClose" or "xDelete") and the final
# segment of the journal file-name (i.e. "test.db-journal") are appended to
# global list variable $::oplog.
#
tvfs filter {xOpen xClose xDelete}
................................................................................
set ::oplog
} {xClose test.db-journal xDelete test.db-journal}
db close
}
tvfs delete
finish_test
|
Changes to test/pager1.test.
1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 |
#
testvfs tv -default 1
foreach sectorsize {
32 64 128 256 512 1024 2048
4096 8192 16384 32768 65536 131072 262144
} {
tv sectorsize $sectorsize
set eff $sectorsize
if {$sectorsize < 512} { set eff 512 }
if {$sectorsize > 65536} { set eff 65536 }
do_test pager1-10.$sectorsize.1 {
faultsim_delete_and_reopen
db func a_string a_string
|
> |
1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 |
#
testvfs tv -default 1
foreach sectorsize {
32 64 128 256 512 1024 2048
4096 8192 16384 32768 65536 131072 262144
} {
tv sectorsize $sectorsize
tv devchar {}
set eff $sectorsize
if {$sectorsize < 512} { set eff 512 }
if {$sectorsize > 65536} { set eff 65536 }
do_test pager1-10.$sectorsize.1 {
faultsim_delete_and_reopen
db func a_string a_string
|
Changes to test/syscall.test.
55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 |
#-------------------------------------------------------------------------
# Tests for the xNextSystemCall method.
#
foreach s {
open close access getcwd stat fstat ftruncate
fcntl read pread write pwrite fchmod fallocate
pread64 pwrite64 unlink openDirectory mkdir rmdir
} {
if {[test_syscall exists $s]} {lappend syscall_list $s}
}
do_test 3.1 { lsort [test_syscall list] } [lsort $syscall_list]
#-------------------------------------------------------------------------
# This test verifies that if a call to open() fails and errno is set to
|
| > |
55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 |
#-------------------------------------------------------------------------
# Tests for the xNextSystemCall method.
#
foreach s {
open close access getcwd stat fstat ftruncate
fcntl read pread write pwrite fchmod fallocate
pread64 pwrite64 unlink openDirectory mkdir rmdir
statvfs
} {
if {[test_syscall exists $s]} {lappend syscall_list $s}
}
do_test 3.1 { lsort [test_syscall list] } [lsort $syscall_list]
#-------------------------------------------------------------------------
# This test verifies that if a call to open() fails and errno is set to
|
Changes to test/wal.test.
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 ... 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 ... 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 ... 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 |
# 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 wal_checkpoint }
} {0 {0 13 13}} ;# Reader no longer block checkpoints
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}
# Writers do not block checkpoints any more either.
#
do_test wal-10.$tn.14 {
catchsql { PRAGMA wal_checkpoint }
} {0 {0 15 13}}
# The following series of test cases used to verify another blocking
# case in WAL - a case which no longer blocks.
#
do_test wal-10.$tn.15 {
sql2 { COMMIT; BEGIN; SELECT * FROM t1; }
} {1 2 3 4 5 6 7 8 9 10 11 12}
do_test wal-10.$tn.16 {
catchsql { PRAGMA wal_checkpoint }
} {0 {0 15 15}}
do_test wal-10.$tn.17 {
execsql { PRAGMA wal_checkpoint }
} {0 15 15}
do_test wal-10.$tn.18 {
sql3 { BEGIN; SELECT * FROM t1 }
} {1 2 3 4 5 6 7 8 9 10 11 12}
do_test wal-10.$tn.19 {
catchsql { INSERT INTO t1 VALUES(13, 14) }
} {0 {}}
do_test wal-10.$tn.20 {
................................................................................
} {1 2 3 4 5 6 7 8 9 10 11 12 13 14}
# Another series of tests that used to demonstrate blocking behavior
# but which now work.
#
do_test wal-10.$tn.23 {
execsql { PRAGMA wal_checkpoint }
} {0 17 17}
do_test wal-10.$tn.24 {
sql2 { BEGIN; SELECT * FROM t1; }
} {1 2 3 4 5 6 7 8 9 10 11 12 13 14}
do_test wal-10.$tn.25 {
execsql { PRAGMA wal_checkpoint }
} {0 17 17}
do_test wal-10.$tn.26 {
catchsql { INSERT INTO t1 VALUES(15, 16) }
} {0 {}}
do_test wal-10.$tn.27 {
sql3 { INSERT INTO t1 VALUES(17, 18) }
} {}
do_test wal-10.$tn.28 {
................................................................................
sqlite3_step $::STMT
}
execsql { SELECT * FROM t1 }
} {1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18}
do_test wal-10.$tn.29 {
execsql { INSERT INTO t1 VALUES(19, 20) }
catchsql { PRAGMA wal_checkpoint }
} {0 {0 6 0}}
do_test wal-10.$tn.30 {
code3 { sqlite3_finalize $::STMT }
execsql { PRAGMA wal_checkpoint }
} {0 6 0}
# At one point, if a reader failed to upgrade to a writer because it
# was reading an old snapshot, the write-locks were not being released.
# Test that this bug has been fixed.
#
do_test wal-10.$tn.31 {
sql2 COMMIT
................................................................................
sql2 {
BEGIN;
SELECT * FROM t1;
}
} {a b c d}
do_test wal-10.$tn.36 {
catchsql { PRAGMA wal_checkpoint }
} {0 {0 16 16}}
do_test wal-10.$tn.36 {
sql3 { INSERT INTO t1 VALUES('e', 'f') }
sql2 { SELECT * FROM t1 }
} {a b c d}
do_test wal-10.$tn.37 {
sql2 COMMIT
execsql { PRAGMA wal_checkpoint }
} {0 18 18}
}
#-------------------------------------------------------------------------
# This block of tests, wal-11.*, test that nothing goes terribly wrong
# if frames must be written to the log file before a transaction is
# committed (in order to free up memory).
#
|
| | | | | | | | | | |
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 ... 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 ... 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 ... 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 |
# 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 wal_checkpoint }
} {0 {0 7 7}} ;# Reader no longer block checkpoints
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}
# Writers do not block checkpoints any more either.
#
do_test wal-10.$tn.14 {
catchsql { PRAGMA wal_checkpoint }
} {0 {0 8 7}}
# The following series of test cases used to verify another blocking
# case in WAL - a case which no longer blocks.
#
do_test wal-10.$tn.15 {
sql2 { COMMIT; BEGIN; SELECT * FROM t1; }
} {1 2 3 4 5 6 7 8 9 10 11 12}
do_test wal-10.$tn.16 {
catchsql { PRAGMA wal_checkpoint }
} {0 {0 8 8}}
do_test wal-10.$tn.17 {
execsql { PRAGMA wal_checkpoint }
} {0 8 8}
do_test wal-10.$tn.18 {
sql3 { BEGIN; SELECT * FROM t1 }
} {1 2 3 4 5 6 7 8 9 10 11 12}
do_test wal-10.$tn.19 {
catchsql { INSERT INTO t1 VALUES(13, 14) }
} {0 {}}
do_test wal-10.$tn.20 {
................................................................................
} {1 2 3 4 5 6 7 8 9 10 11 12 13 14}
# Another series of tests that used to demonstrate blocking behavior
# but which now work.
#
do_test wal-10.$tn.23 {
execsql { PRAGMA wal_checkpoint }
} {0 9 9}
do_test wal-10.$tn.24 {
sql2 { BEGIN; SELECT * FROM t1; }
} {1 2 3 4 5 6 7 8 9 10 11 12 13 14}
do_test wal-10.$tn.25 {
execsql { PRAGMA wal_checkpoint }
} {0 9 9}
do_test wal-10.$tn.26 {
catchsql { INSERT INTO t1 VALUES(15, 16) }
} {0 {}}
do_test wal-10.$tn.27 {
sql3 { INSERT INTO t1 VALUES(17, 18) }
} {}
do_test wal-10.$tn.28 {
................................................................................
sqlite3_step $::STMT
}
execsql { SELECT * FROM t1 }
} {1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18}
do_test wal-10.$tn.29 {
execsql { INSERT INTO t1 VALUES(19, 20) }
catchsql { PRAGMA wal_checkpoint }
} {0 {0 3 0}}
do_test wal-10.$tn.30 {
code3 { sqlite3_finalize $::STMT }
execsql { PRAGMA wal_checkpoint }
} {0 3 0}
# At one point, if a reader failed to upgrade to a writer because it
# was reading an old snapshot, the write-locks were not being released.
# Test that this bug has been fixed.
#
do_test wal-10.$tn.31 {
sql2 COMMIT
................................................................................
sql2 {
BEGIN;
SELECT * FROM t1;
}
} {a b c d}
do_test wal-10.$tn.36 {
catchsql { PRAGMA wal_checkpoint }
} {0 {0 8 8}}
do_test wal-10.$tn.36 {
sql3 { INSERT INTO t1 VALUES('e', 'f') }
sql2 { SELECT * FROM t1 }
} {a b c d}
do_test wal-10.$tn.37 {
sql2 COMMIT
execsql { PRAGMA wal_checkpoint }
} {0 9 9}
}
#-------------------------------------------------------------------------
# This block of tests, wal-11.*, test that nothing goes terribly wrong
# if frames must be written to the log file before a transaction is
# committed (in order to free up memory).
#
|