Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Modifications to btree integrity check so that it can be run inside a transaction after an incr vacuum. (CVS 3878) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
4d4180d6474d8d74460fb9333580b9b6 |
User & Date: | danielk1977 2007-04-27 07:05:44.000 |
Context
2007-04-27
| ||
07:55 | Extra tests for incremental vacuum. (CVS 3879) (check-in: 40ba6493e9 user: danielk1977 tags: trunk) | |
07:05 | Modifications to btree integrity check so that it can be run inside a transaction after an incr vacuum. (CVS 3878) (check-in: 4d4180d647 user: danielk1977 tags: trunk) | |
01:18 | The replace() function should return NULL if the second argument is an empty string. Ticket #2324. (CVS 3877) (check-in: e6a0c90dd9 user: drh tags: trunk) | |
Changes
Changes to src/btree.c.
1 2 3 4 5 6 7 8 9 10 11 | /* ** 2004 April 6 ** ** 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. ** ************************************************************************* | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | /* ** 2004 April 6 ** ** 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. ** ************************************************************************* ** $Id: btree.c,v 1.360 2007/04/27 07:05:44 danielk1977 Exp $ ** ** This file implements a external (disk-based) database using BTrees. ** For a detailed discussion of BTrees, refer to ** ** Donald E. Knuth, THE ART OF COMPUTER PROGRAMMING, Volume 3: ** "Sorting And Searching", pages 473-480. Addison-Wesley ** Publishing Company, Reading, Massachusetts. |
︙ | ︙ | |||
2423 2424 2425 2426 2427 2428 2429 | static int autoVacuumCommit(BtShared *pBt, Pgno *pnTrunc){ int rc = SQLITE_OK; Pager *pPager = pBt->pPager; #ifndef NDEBUG int nRef = sqlite3PagerRefcount(pPager); #endif | < < < < > > > > > > | 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 | static int autoVacuumCommit(BtShared *pBt, Pgno *pnTrunc){ int rc = SQLITE_OK; Pager *pPager = pBt->pPager; #ifndef NDEBUG int nRef = sqlite3PagerRefcount(pPager); #endif assert(pBt->autoVacuum); if( !pBt->incrVacuum ){ Pgno nFin = 0; if( pBt->nTrunc==0 ){ Pgno nFree; Pgno nPtrmap; const int pgsz = pBt->pageSize; Pgno nOrig = sqlite3PagerPagecount(pBt->pPager); if( PTRMAP_ISPAGE(pBt, nOrig) ){ 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) ){ |
︙ | ︙ | |||
6503 6504 6505 6506 6507 6508 6509 6510 6511 6512 6513 6514 6515 6516 | } sCheck.pBt = pBt; sCheck.pPager = pBt->pPager; sCheck.nPage = sqlite3PagerPagecount(sCheck.pPager); sCheck.mxErr = mxErr; sCheck.nErr = 0; *pnErr = 0; if( sCheck.nPage==0 ){ unlockBtreeIfUnused(pBt); return 0; } sCheck.anRef = sqliteMallocRaw( (sCheck.nPage+1)*sizeof(sCheck.anRef[0]) ); if( !sCheck.anRef ){ unlockBtreeIfUnused(pBt); | > > > > > | 6505 6506 6507 6508 6509 6510 6511 6512 6513 6514 6515 6516 6517 6518 6519 6520 6521 6522 6523 | } sCheck.pBt = pBt; sCheck.pPager = pBt->pPager; sCheck.nPage = sqlite3PagerPagecount(sCheck.pPager); sCheck.mxErr = mxErr; sCheck.nErr = 0; *pnErr = 0; #ifndef SQLITE_OMIT_AUTOVACUUM if( pBt->nTrunc!=0 ){ sCheck.nPage = pBt->nTrunc; } #endif if( sCheck.nPage==0 ){ unlockBtreeIfUnused(pBt); return 0; } sCheck.anRef = sqliteMallocRaw( (sCheck.nPage+1)*sizeof(sCheck.anRef[0]) ); if( !sCheck.anRef ){ unlockBtreeIfUnused(pBt); |
︙ | ︙ |
Changes to test/incrvacuum.test.
1 2 3 4 5 6 7 8 9 10 11 12 13 | # 2007 April 26 # # 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 implements regression tests for SQLite library. The # focus of this file is testing the incremental vacuum feature. # | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | # 2007 April 26 # # 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 implements regression tests for SQLite library. The # focus of this file is testing the incremental vacuum feature. # # $Id: incrvacuum.test,v 1.2 2007/04/27 07:05:44 danielk1977 Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl # If this build of the library does not support auto-vacuum, omit this # whole file. ifcapable {!autovacuum || !pragma} { |
︙ | ︙ | |||
140 141 142 143 144 145 146 | PRAGMA auto_vacuum = 1; INSERT INTO tbl2 VALUES('hello world'); } expr {[file size test.db] / 1024} } {3} #--------------------------------------------------------------------- | | > > | 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 | PRAGMA auto_vacuum = 1; INSERT INTO tbl2 VALUES('hello world'); } expr {[file size test.db] / 1024} } {3} #--------------------------------------------------------------------- # Try to run a very simple incremental vacuum. Also verify that # INCREMENTAL VACUUM is a harmless no-op against a database that # does not support auto-vacuum. # do_test incrvacuum-4.1 { set ::str [string repeat 1234567890 110] execsql { PRAGMA auto_vacuum = 2; INSERT INTO tbl2 VALUES($::str); CREATE TABLE tbl1(a, b, c); |
︙ | ︙ | |||
165 166 167 168 169 170 171 172 173 174 | do_test incrvacuum-4.3 { set ::nStep 0 db eval {INCREMENTAL VACUUM} { incr ::nStep } list [expr {[file size test.db] / 1024}] $::nStep } {3 2} finish_test | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 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 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 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 | do_test incrvacuum-4.3 { set ::nStep 0 db eval {INCREMENTAL VACUUM} { incr ::nStep } list [expr {[file size test.db] / 1024}] $::nStep } {3 2} #--------------------------------------------------------------------- # The following tests - incrvacuum-5.* - test incremental vacuum # from within a transaction. # do_test incrvacuum-5.1.1 { expr {[file size test.db] / 1024} } {3} do_test incrvacuum-5.1.2 { execsql { BEGIN; DROP TABLE tbl2; INCREMENTAL VACUUM; COMMIT; } expr {[file size test.db] / 1024} } {1} do_test incrvacuum-5.2.1 { set ::str [string repeat abcdefghij 110] execsql { BEGIN; CREATE TABLE tbl1(a); INSERT INTO tbl1 VALUES($::str); INCREMENTAL VACUUM; -- this is a no-op. COMMIT; } expr {[file size test.db] / 1024} } {4} do_test incrvacuum-5.2.2 { set ::str [string repeat abcdefghij 110] execsql { BEGIN; INSERT INTO tbl1 VALUES($::str); INSERT INTO tbl1 SELECT * FROM tbl1; DELETE FROM tbl1 WHERE oid%2; -- Put 2 overflow pages on free-list. COMMIT; } expr {[file size test.db] / 1024} } {7} do_test incrvacuum-5.2.3 { execsql { BEGIN; INCREMENTAL VACUUM; -- Vacuum up the two pages. CREATE TABLE tbl2(b); -- Use one free page as a table root. INSERT INTO tbl2 VALUES('a nice string'); COMMIT; } expr {[file size test.db] / 1024} } {6} do_test incrvacuum-5.2.4 { execsql { SELECT * FROM tbl2; } } {{a nice string}} set TestScriptList [list { BEGIN; CREATE TABLE t1(a, b); CREATE TABLE t2(a, b); CREATE INDEX t1_i ON t1(a); CREATE INDEX t2_i ON t2(a); } { INSERT INTO t1 VALUES($::str1, $::str2); INSERT INTO t1 VALUES($::str1||$::str2, $::str2||$::str1); INSERT INTO t2 SELECT b, a FROM t1; INSERT INTO t2 SELECT a, b FROM t1; INSERT INTO t1 SELECT b, a FROM t2; UPDATE t2 SET b = ''; INCREMENTAL VACUUM; } { UPDATE t2 SET b = (SELECT b FROM t1 WHERE t1.oid = t2.oid); INCREMENTAL VACUUM; } { CREATE TABLE t3(a, b); INSERT INTO t3 SELECT * FROM t2; DROP TABLE t2; INCREMENTAL VACUUM; } { CREATE INDEX t3_i ON t3(a); COMMIT; }] file delete -force test1.db test1.db-journal file delete -force test2.db test2.db-journal proc compare_dbs {A B tname} { set tbl_list [execsql { SELECT tbl_name FROM sqlite_master WHERE type = 'table' } $A] do_test ${tname}.1 [subst { execsql { SELECT tbl_name FROM sqlite_master WHERE type = 'table' } $B }] $tbl_list set tn 1 foreach tbl $tbl_list { set control [execsql "SELECT * FROM $tbl" $A] do_test ${tname}.[incr tn] [subst { execsql "SELECT * FROM $tbl" $B }] $control } } set ::str1 [string repeat abcdefghij 130] set ::str2 [string repeat 1234567890 105] sqlite3 db1 test1.db sqlite3 db2 test2.db execsql { PRAGMA auto_vacuum = 'none' } db1 execsql { PRAGMA auto_vacuum = 'incremental' } db2 set tn 1 foreach sql $::TestScriptList { execsql $sql db1 execsql $sql db2 compare_dbs db1 db2 incrvacuum-5.3.${tn} do_test incrvacuum-5.3.${tn}.integrity { execsql { PRAGMA integrity_check; } db2 } {ok} incr tn } db1 close db2 close #--------------------------------------------------------------------- # TODO: The following tests - incrvacuum-6.* - test that rolling back # a transaction that contains an incremental vacuum operation # works Ok. # finish_test |