Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix for #2409. Return SQLITE_IOERR_BLOCKED instead of SQLITE_BUSY in cases where failure to obtain a database lock leaves the cache in an inconsistent state. See additional information at CorruptionFollowingBusyError. (CVS 4060) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
ce2c9925d06315d73fb5fd0c7265fb4c |
User & Date: | danielk1977 2007-06-13 15:22:28.000 |
Context
2007-06-13
| ||
16:49 | Have queries interrupted by the progress-handler return SQLITE_INTERRUPT. Rollback any active transaction if a DML statement returns SQLITE_INTERRUPT. (CVS 4061) (check-in: 33454b5691 user: danielk1977 tags: trunk) | |
15:22 | Fix for #2409. Return SQLITE_IOERR_BLOCKED instead of SQLITE_BUSY in cases where failure to obtain a database lock leaves the cache in an inconsistent state. See additional information at CorruptionFollowingBusyError. (CVS 4060) (check-in: ce2c9925d0 user: danielk1977 tags: trunk) | |
2007-06-12
| ||
18:50 | In the "transaction" command of the TCL interface, if a COMMIT fails finish it with a rollback. (CVS 4059) (check-in: 6da39fa442 user: drh tags: trunk) | |
Changes
Changes to src/pager.c.
︙ | ︙ | |||
14 15 16 17 18 19 20 | ** The pager is used to access a database disk file. It implements ** atomic commit and rollback through the use of a journal file that ** is separate from the database file. The pager also implements file ** locking to prevent two processes from writing the same database ** file simultaneously, or one process from reading the database while ** another is writing. ** | | | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | ** The pager is used to access a database disk file. It implements ** atomic commit and rollback through the use of a journal file that ** is separate from the database file. The pager also implements file ** locking to prevent two processes from writing the same database ** file simultaneously, or one process from reading the database while ** another is writing. ** ** @(#) $Id: pager.c,v 1.343 2007/06/13 15:22:28 danielk1977 Exp $ */ #ifndef SQLITE_OMIT_DISKIO #include "sqliteInt.h" #include "os.h" #include "pager.h" #include <assert.h> #include <string.h> |
︙ | ︙ | |||
2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 | pPg->pPager = pPager; pPg->pNextAll = pPager->pAll; pPager->pAll = pPg; pPager->nPage++; }else{ /* Recycle an existing page with a zero ref-count. */ rc = pager_recycle(pPager, 1, &pPg); if( rc!=SQLITE_OK ){ goto pager_allocate_out; } assert( pPager->state>=SHARED_LOCK ); assert(pPg); } *ppPg = pPg; | > > > | 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 | pPg->pPager = pPager; pPg->pNextAll = pPager->pAll; pPager->pAll = pPg; pPager->nPage++; }else{ /* Recycle an existing page with a zero ref-count. */ rc = pager_recycle(pPager, 1, &pPg); if( rc==SQLITE_BUSY ){ rc = SQLITE_IOERR_BLOCKED; } if( rc!=SQLITE_OK ){ goto pager_allocate_out; } assert( pPager->state>=SHARED_LOCK ); assert(pPg); } *ppPg = pPg; |
︙ | ︙ | |||
3882 3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 | pPager->state = PAGER_SYNCED; }else if( MEMDB && nTrunc!=0 ){ rc = sqlite3PagerTruncate(pPager, nTrunc); } sync_exit: return rc; } /* ** Commit all changes to the database and release the write lock. ** | > > > > > > > > | 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 | pPager->state = PAGER_SYNCED; }else if( MEMDB && nTrunc!=0 ){ rc = sqlite3PagerTruncate(pPager, nTrunc); } sync_exit: if( rc==SQLITE_IOERR_BLOCKED ){ /* pager_incr_changecounter() may attempt to obtain an exclusive * lock to spill the cache and return IOERR_BLOCKED. But since * there is no chance the cache is inconsistent, it's * better to return SQLITE_BUSY. */ rc = SQLITE_BUSY; } return rc; } /* ** Commit all changes to the database and release the write lock. ** |
︙ | ︙ |
Changes to src/sqlite.h.in.
︙ | ︙ | |||
8 9 10 11 12 13 14 | ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This header file defines the interface that the SQLite library ** presents to client programs. ** | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This header file defines the interface that the SQLite library ** presents to client programs. ** ** @(#) $Id: sqlite.h.in,v 1.211 2007/06/13 15:22:28 danielk1977 Exp $ */ #ifndef _SQLITE3_H_ #define _SQLITE3_H_ #include <stdarg.h> /* Needed for the definition of va_list */ /* ** Make sure we can call this stuff from C++. |
︙ | ︙ | |||
227 228 229 230 231 232 233 234 235 236 237 238 239 240 | #define SQLITE_IOERR_FSYNC (SQLITE_IOERR | (4<<8)) #define SQLITE_IOERR_DIR_FSYNC (SQLITE_IOERR | (5<<8)) #define SQLITE_IOERR_TRUNCATE (SQLITE_IOERR | (6<<8)) #define SQLITE_IOERR_FSTAT (SQLITE_IOERR | (7<<8)) #define SQLITE_IOERR_UNLOCK (SQLITE_IOERR | (8<<8)) #define SQLITE_IOERR_RDLOCK (SQLITE_IOERR | (9<<8)) #define SQLITE_IOERR_DELETE (SQLITE_IOERR | (10<<8)) /* ** Enable or disable the extended result codes. */ int sqlite3_extended_result_codes(sqlite3*, int onoff); /* | > | 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 | #define SQLITE_IOERR_FSYNC (SQLITE_IOERR | (4<<8)) #define SQLITE_IOERR_DIR_FSYNC (SQLITE_IOERR | (5<<8)) #define SQLITE_IOERR_TRUNCATE (SQLITE_IOERR | (6<<8)) #define SQLITE_IOERR_FSTAT (SQLITE_IOERR | (7<<8)) #define SQLITE_IOERR_UNLOCK (SQLITE_IOERR | (8<<8)) #define SQLITE_IOERR_RDLOCK (SQLITE_IOERR | (9<<8)) #define SQLITE_IOERR_DELETE (SQLITE_IOERR | (10<<8)) #define SQLITE_IOERR_BLOCKED (SQLITE_IOERR | (11<<8)) /* ** Enable or disable the extended result codes. */ int sqlite3_extended_result_codes(sqlite3*, int onoff); /* |
︙ | ︙ |
Changes to src/vdbeaux.c.
︙ | ︙ | |||
1387 1388 1389 1390 1391 1392 1393 | } } /* If the query was read-only, we need do no rollback at all. Otherwise, ** proceed with the special handling. */ if( !isReadOnly ){ | > > > | | 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 | } } /* If the query was read-only, we need do no rollback at all. Otherwise, ** proceed with the special handling. */ if( !isReadOnly ){ if( p->rc==SQLITE_IOERR_BLOCKED && isStatement ){ xFunc = sqlite3BtreeRollbackStmt; p->rc = SQLITE_BUSY; } else if( p->rc==SQLITE_NOMEM && isStatement ){ xFunc = sqlite3BtreeRollbackStmt; }else{ /* We are forced to roll back the active transaction. Before doing ** so, abort any other statements this handle currently has active. */ sqlite3AbortOtherActiveVdbes(db, p); sqlite3RollbackAll(db); |
︙ | ︙ |
Added test/tkt2409.test.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 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 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 | # 2007 June 13 # # 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. # # This file implements tests to verify that ticket #2409 has been # fixed. More specifically, they verify that if SQLite cannot # obtain an EXCLUSIVE lock while trying to spill the cache during # any statement other than a COMMIT, an I/O error is returned instead # of SQLITE_BUSY. # # $Id: tkt2409.test,v 1.1 2007/06/13 15:22:28 danielk1977 Exp $ # Test Outline: # # tkt-2409-1.*: Cause a cache-spill during an INSERT that is within # a db transaction but does not start a statement transaction. # Verify that the transaction is automatically rolled back # and SQLITE_IOERR_BLOCKED is returned # # tkt-2409-2.*: Cause a cache-spill while updating the change-counter # during a database COMMIT. Verify that the transaction is not # rolled back and SQLITE_BUSY is returned. # # tkt-2409-3.*: Similar to 2409-1.*, but using many INSERT statements # within a transaction instead of just one. # # tkt-2409-4.*: Similar to 2409-1.*, but rig it so that the # INSERT statement starts a statement transaction. Verify that # SQLOTE_BUSY is returned and the transaction is not rolled back. # set testdir [file dirname $argv0] source $testdir/tester.tcl sqlite3_extended_result_codes $::DB 1 # Aquire a read-lock on the database using handle [db2]. # proc read_lock_db {} { if {$::STMT eq ""} { set ::STMT [sqlite3_prepare db2 {SELECT rowid FROM sqlite_master} -1 TAIL] set rc [sqlite3_step $::STMT] if {$rc eq "SQLITE_ERROR"} { unread_lock_db read_lock_db } } } # Release any read-lock obtained using [read_lock_db] # proc unread_lock_db {} { if {$::STMT ne ""} { sqlite3_finalize $::STMT set ::STMT "" } } # Open the db handle used by [read_lock_db]. # sqlite3 db2 test.db set ::STMT "" do_test tkt2409-1.1 { execsql { PRAGMA cache_size=10; CREATE TABLE t1(x TEXT UNIQUE NOT NULL, y BLOB); } read_lock_db set ::zShort [string repeat 0123456789 1] set ::zLong [string repeat 0123456789 1500] catchsql { BEGIN; INSERT INTO t1 VALUES($::zShort, $::zLong); } } {1 {disk I/O error}} do_test tkt2409-1.2 { sqlite3_errcode $::DB } {SQLITE_IOERR+11} # Check the integrity of the cache. # integrity_check tkt2409-1.3 # Check that the transaction was rolled back. Because the INSERT # statement in which the "I/O error" occured did not open a statement # transaction, SQLite had no choice but to roll back the transaction. # do_test tkt2409-1.4 { unread_lock_db catchsql { ROLLBACK } } {1 {cannot rollback - no transaction is active}} set ::zShort [string repeat 0123456789 1] set ::zLong [string repeat 0123456789 1500] set ::rc 1 for {set iCache 10} {$::rc} {incr iCache} { execsql "PRAGMA cache_size = $iCache" do_test tkt2409-2.1.$iCache { read_lock_db set ::rc [catch { execsql { BEGIN; INSERT INTO t1 VALUES($::zShort, $::zLong); } } msg] expr {($::rc == 1 && $msg eq "disk I/O error") || $::rc == 0} } {1} } do_test tkt2409-2.2 { catchsql { ROLLBACK; BEGIN; INSERT INTO t1 VALUES($::zShort, $::zLong); COMMIT; } } {1 {database is locked}} do_test tkt2409-2.3 { unread_lock_db catchsql { COMMIT; } } {0 {}} do_test tkt2409-3.1 { db close set ::DB [sqlite3 db test.db; sqlite3_connection_pointer db] sqlite3_extended_result_codes $::DB 1 execsql { PRAGMA cache_size=10; DELETE FROM t1; } read_lock_db set ::zShort [string repeat 0123456789 1] set ::zLong [string repeat 0123456789 1500] catchsql { BEGIN; INSERT INTO t1 SELECT $::zShort, $::zLong; } } {1 {database is locked}} do_test tkt2409-3.2 { sqlite3_errcode $::DB } {SQLITE_BUSY} # Check the integrity of the cache. # integrity_check tkt2409-3.3 # Check that the transaction was rolled back. Because the INSERT # statement in which the "I/O error" occured did not open a statement # transaction, SQLite had no choice but to roll back the transaction. # do_test tkt2409-3.4 { unread_lock_db catchsql { ROLLBACK } } {0 {}} do_test tkt2409-4.1 { execsql { PRAGMA cache_size=20; DROP TABLE t1; CREATE TABLE t1 (x TEXT UNIQUE NOT NULL); } unset -nocomplain t1 array unset t1 set t1(0) 1 set sql "" for {set i 0} {$i<5000} {incr i} { set r 0 while {[info exists t1($r)]} { set r [expr {int(rand()*1000000000)}] } set t1($r) 1 append sql "INSERT INTO t1 VALUES('some-text-$r');" } read_lock_db execsql BEGIN catchsql $sql } {1 {disk I/O error}} do_test tkt2409-4.2 { sqlite3_errcode $::DB } {SQLITE_IOERR+11} # Check the integrity of the cache. # integrity_check tkt2409-4.3 do_test tkt2409-4.4 { catchsql { ROLLBACK } } {1 {cannot rollback - no transaction is active}} unread_lock_db db2 close finish_test |