From: danielk1977 Date: Mon, 6 Apr 2009 17:50:03 +0000 (+0000) Subject: Test cases and minor code changes to increase coverage of btree.c. (CVS 6456) X-Git-Tag: version-3.6.15~294 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef165cedeb1cbcb5bbb4eb5710e13be22c3a29ae;p=thirdparty%2Fsqlite.git Test cases and minor code changes to increase coverage of btree.c. (CVS 6456) FossilOrigin-Name: def3a016914f683818b5f013ec4efecbb8fd4c0d --- diff --git a/manifest b/manifest index 5f938aa836..de04399b14 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Updates\sand\sclarification\sto\sthe\sdocumentation\sof\sthe\ssqlite3_temp_directory\nglobal\svariable.\s\sNo\schanges\sto\scode.\s(CVS\s6455) -D 2009-04-06T15:55:04 +C Test\scases\sand\sminor\scode\schanges\sto\sincrease\scoverage\sof\sbtree.c.\s(CVS\s6456) +D 2009-04-06T17:50:03 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -103,7 +103,7 @@ F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627 F src/backup.c 0082d0e5a63f04e88faee0dff0a7d63d3e92a78d F src/bitvec.c ef370407e03440b0852d05024fb016b14a471d3d F src/btmutex.c 341502bc496dc0840dcb00cde65680fb0e85c3ab -F src/btree.c 457a71a1ebf490d5079ebe36d0213a8025d621a8 +F src/btree.c effd3b709121baae988cb3762894bfb047f3d4e5 F src/btree.h 8007018c1753944790c39610280894ab280210b8 F src/btreeInt.h df64030d632f8c8ac217ed52e8b6b3eacacb33a5 F src/build.c 72357fd75ef036d0afbf1756edab6d62c56fcf4b @@ -230,7 +230,7 @@ F test/auth.test 0e901aeb399f766fd58f5e19b8b9a09e2df9a341 F test/auth2.test ee3ba272e2b975e913afc9b041ee75706e190005 F test/auth3.test b3308950d3839a45193cdcd0473432e33fe38b61 F test/autoinc.test ab549b48b389cabd92967b86c379ec8b31fa6c16 -F test/autovacuum.test 61260e25744189ff766f61ca3df23c1eeec0060e +F test/autovacuum.test 25f891bc343a8bf5d9229e2e9ddab9f31a9ab5ec F test/autovacuum_ioerr2.test 598b0663074d3673a9c1bc9a16e80971313bafe6 F test/avtrans.test 1e901d8102706b63534dbd2bdd4d8f16c4082650 F test/backup.test 5e487ec8dad73e9d249e9bb9ca5346a03b601b07 @@ -276,7 +276,7 @@ F test/colmeta.test 087c42997754b8c648819832241daf724f813322 F test/colname.test 69fea30632d55862a012d3786c7d5fd1329f78db F test/conflict.test bb29b052c60a1f7eb6382be77902061d1f305318 F test/corrupt.test 5bcf7a986358123b8055dfa64b45fc2fb54dcaa9 -F test/corrupt2.test 465786cf3fb286b6b674c6342388dfff988f950b +F test/corrupt2.test a571e30ea4e82318f319a24b6cc55935ce862079 F test/corrupt3.test 263e8bb04e2728df832fddf6973cf54c91db0c32 F test/corrupt4.test acdb01afaedf529004b70e55de1a6f5a05ae7fff F test/corrupt5.test 7796d5bdfe155ed824cee9dff371f49da237cfe0 @@ -301,7 +301,7 @@ F test/createtab.test 199cf68f44e5d9e87a0b8afc7130fdeb4def3272 F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c F test/date.test 95a5611a677f639742db4d7c13af99c2ff56e299 F test/default.test 6faf23ccb300114924353007795aa9a8ec0aa9dc -F test/delete.test f171c1011395a8dd63169438fe1d8cc625eb7442 +F test/delete.test 6a872ca2ceed9f4e2a434b730e67ae68653e4aac F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa F test/delete3.test 555e84a00a99230b7d049d477a324a631126a6ab F test/descidx1.test a13d443571e045b61b1b2b759df8dcffa092c968 @@ -409,7 +409,7 @@ F test/insert5.test 1f93cbe9742110119133d7e8e3ccfe6d7c249766 F test/interrupt.test 42e7cf98646fd9cb4a3b131a93ed3c50b9e149f1 F test/intpkey.test 537669fd535f62632ca64828e435b9e54e8d677f F test/io.test ea9ac797949980c0f44cfa4591d7ca7377421c6a -F test/ioerr.test 12f9000bb9024b4b1386320e60badd5223e75b16 +F test/ioerr.test 390785ec65f10aa58a82b048ee12e9052d783fa8 F test/ioerr2.test 021bdc16a9803de34a5ab6ddf211815cad1a4c9f F test/ioerr3.test d3cec5e1a11ad6d27527d0d38573fbff14c71bdd F test/ioerr4.test fc6eddfec2efc2f1ed217b9eae4c1c1d3516ce86 @@ -558,7 +558,7 @@ F test/tclsqlite.test 8b1150d0486c4848c70d96422513a91c5342be0e F test/tempdb.test b88ac8a19823cf771d742bf61eef93ef337c06b1 F test/temptable.test 5d8ca46be28cc06c887c5a77df650843b7edbae1 F test/temptrigger.test 03093be9967942623232dfdf2a63b832d4e0e4fa -F test/tester.tcl ebaa00336761e1b97f56a8376178289097db43ab +F test/tester.tcl 9bdc35fac11b0a75cae3f91e527098ba879dbfc2 F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca @@ -715,7 +715,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P ed99d2d97f11784dda0f61f8e7d0eb5ca1bca371 -R abf940847e30d1ebd3eb1d24a60369a0 -U drh -Z ee47436cb2cfecd95ac973d740f1311c +P aea99c572a69a00b709f0de816ea16488d899375 +R 7bc7fd3a531ebb9367938d84424724ab +U danielk1977 +Z fda09d8876bea1757fca4f0d05a68a01 diff --git a/manifest.uuid b/manifest.uuid index d3ae6d6806..0dd28061b1 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -aea99c572a69a00b709f0de816ea16488d899375 \ No newline at end of file +def3a016914f683818b5f013ec4efecbb8fd4c0d \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index 34b30a773c..10fcd835f9 100644 --- a/src/btree.c +++ b/src/btree.c @@ -9,7 +9,7 @@ ** May you share freely, never taking more than you give. ** ************************************************************************* -** $Id: btree.c,v 1.590 2009/04/05 12:22:09 drh Exp $ +** $Id: btree.c,v 1.591 2009/04/06 17:50:03 danielk1977 Exp $ ** ** This file implements a external (disk-based) database using BTrees. ** See the header comment on "btreeInt.h" for additional information. @@ -2582,16 +2582,18 @@ static int autoVacuumCommit(BtShared *pBt){ const int pgsz = pBt->pageSize; Pgno nOrig = pagerPagecount(pBt); - if( PTRMAP_ISPAGE(pBt, nOrig) ){ + if( PTRMAP_ISPAGE(pBt, nOrig) || nOrig==PENDING_BYTE_PAGE(pBt) ){ + /* It is not possible to create a database for which the final page + ** is either a pointer-map page or the pending-byte page. If one + ** is encountered, this indicates corruption. + */ return SQLITE_CORRUPT_BKPT; } - if( nOrig==PENDING_BYTE_PAGE(pBt) ){ - nOrig--; - } + nFree = get4byte(&pBt->pPage1->aData[36]); nPtrmap = (nFree-nOrig+PTRMAP_PAGENO(pBt, nOrig)+pgsz/5)/(pgsz/5); nFin = nOrig - nFree - nPtrmap; - if( nOrig>PENDING_BYTE_PAGE(pBt) && nFin<=PENDING_BYTE_PAGE(pBt) ){ + if( nOrig>PENDING_BYTE_PAGE(pBt) && nFin (SELECT max(a)/2 FROM t1) } + file size test.db +} $::sqlite_pending_byte + finish_test diff --git a/test/corrupt2.test b/test/corrupt2.test index 3f50196230..acda25436d 100644 --- a/test/corrupt2.test +++ b/test/corrupt2.test @@ -13,7 +13,7 @@ # This file implements tests to make sure SQLite does not crash or # segfault if it sees a corrupt database file. # -# $Id: corrupt2.test,v 1.19 2009/04/02 18:28:08 danielk1977 Exp $ +# $Id: corrupt2.test,v 1.20 2009/04/06 17:50:03 danielk1977 Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -233,6 +233,8 @@ db2 close proc corruption_test {args} { set A(-corrupt) {} + set A(-sqlprep) {} + set A(-tclprep) {} array set A $args catch {db close} @@ -240,6 +242,7 @@ proc corruption_test {args} { file delete -force corrupt.db-journal sqlite3 db corrupt.db + eval $A(-tclprep) db eval $A(-sqlprep) db close @@ -476,7 +479,6 @@ corruption_test -sqlprep { catchsql { PRAGMA incremental_vacuum } } {1 {database disk image is malformed}} } - corruption_test -sqlprep { PRAGMA auto_vacuum = incremental; CREATE TABLE t1(a INTEGER PRIMARY KEY, b); @@ -499,4 +501,35 @@ corruption_test -sqlprep { } {1 {database disk image is malformed}} } +ifcapable autovacuum { + # It is not possible for the last page in a database file to be the + # pending-byte page (AKA the locking page). This test verifies that if + # an attempt is made to commit a transaction to such an auto-vacuum + # database SQLITE_CORRUPT is returned. + # + corruption_test -tclprep { + db eval { + PRAGMA auto_vacuum = full; + PRAGMA page_size = 1024; + CREATE TABLE t1(a INTEGER PRIMARY KEY, b); + INSERT INTO t1 VALUES(NULL, randstr(50,50)); + } + for {set ii 0} {$ii < 10} {incr ii} { + db eval { INSERT INTO t1 SELECT NULL, randstr(50,50) FROM t1 } + } + } -corrupt { + do_test corrupt2-13.1 { + file size corrupt.db + } $::sqlite_pending_byte + hexio_write corrupt.db [expr $::sqlite_pending_byte+1023] 00 + } -test { + do_test corrupt2-13.2 { + file size corrupt.db + } [expr $::sqlite_pending_byte + 1024] + do_test corrupt2-13.3 { + catchsql { DELETE FROM t1 WHERE rowid < 30; } + } {1 {database disk image is malformed}} + } +} + finish_test diff --git a/test/delete.test b/test/delete.test index fc7e81df95..23140d0882 100644 --- a/test/delete.test +++ b/test/delete.test @@ -11,7 +11,7 @@ # This file implements regression tests for SQLite library. The # focus of this file is testing the DELETE FROM statement. # -# $Id: delete.test,v 1.23 2008/04/19 20:53:26 drh Exp $ +# $Id: delete.test,v 1.24 2009/04/06 17:50:03 danielk1977 Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -316,5 +316,26 @@ integrity_check delete-8.7 # (required before the next test file can be executed) will fail. # catch {file attributes test.db -readonly 0} +db close +file delete -force test.db test.db-journal + +do_test delete-9.1 { + sqlite3 db test.db + execsql { + CREATE TABLE t5(a, b); + CREATE TABLE t6(c, d); + INSERT INTO t5 VALUES(1, 2); + INSERT INTO t5 VALUES(3, 4); + INSERT INTO t5 VALUES(5, 6); + INSERT INTO t6 VALUES('a', 'b'); + INSERT INTO t6 VALUES('c', 'd'); + INSERT INTO t6 VALUES('e', 'f'); + CREATE INDEX i5 ON t5(a); + } +} {} +do_test delete-9.2 { + explain { SELECT a, c, d FROM t5, t6 ORDER BY a } +} {} + finish_test diff --git a/test/ioerr.test b/test/ioerr.test index 5c5561b258..21052e4120 100644 --- a/test/ioerr.test +++ b/test/ioerr.test @@ -15,7 +15,7 @@ # The tests in this file use special facilities that are only # available in the SQLite test fixture. # -# $Id: ioerr.test,v 1.42 2008/11/26 07:40:30 danielk1977 Exp $ +# $Id: ioerr.test,v 1.43 2009/04/06 17:50:03 danielk1977 Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -427,4 +427,34 @@ do_ioerr_test ioerr-15 -tclprep { COMMIT; } +# This test verifies that IO errors that occur within the obscure branch +# of code executed by tkt3762.test are correctly reported. +# +ifcapable vacuum&&autovacuum&&pragma { + do_ioerr_test ioerr-16 -erc 1 -ckrefcount 1 -sqlprep { + PRAGMA auto_vacuum=INCREMENTAL; + PRAGMA page_size=1024; + BEGIN; + CREATE TABLE t1(x); + INSERT INTO t1 VALUES(zeroblob(900)); + INSERT INTO t1 VALUES(zeroblob(900)); + INSERT INTO t1 SELECT x FROM t1; + INSERT INTO t1 SELECT x FROM t1; + INSERT INTO t1 SELECT x FROM t1; + INSERT INTO t1 SELECT x FROM t1; + INSERT INTO t1 SELECT x FROM t1; + INSERT INTO t1 SELECT x FROM t1; + INSERT INTO t1 SELECT x FROM t1; + DELETE FROM t1 WHERE rowid>202; + COMMIT; + VACUUM; + PRAGMA cache_size = 10; + BEGIN; + DELETE FROM t1 WHERE rowid IN (10,11,12) ; + } -sqlbody { + PRAGMA incremental_vacuum(10); + COMMIT; + } +} + finish_test diff --git a/test/tester.tcl b/test/tester.tcl index d3624cda7e..27d613481a 100644 --- a/test/tester.tcl +++ b/test/tester.tcl @@ -11,7 +11,7 @@ # This file implements some common TCL routines used for regression # testing the SQLite library # -# $Id: tester.tcl,v 1.141 2009/03/26 17:13:06 danielk1977 Exp $ +# $Id: tester.tcl,v 1.142 2009/04/06 17:50:03 danielk1977 Exp $ # # What for user input before continuing. This gives an opportunity @@ -644,7 +644,7 @@ proc do_ioerr_test {testname args} { set ::go 1 #reset_prng_state save_prng_state - for {set n $::ioerropts(-start)} {$::go && $n<200} {incr n} { + for {set n $::ioerropts(-start)} {$::go} {incr n} { set ::TN $n incr ::ioerropts(-count) -1 if {$::ioerropts(-count)<0} break