aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordan <dan@noemail.net>2010-08-06 06:54:47 +0000
committerdan <dan@noemail.net>2010-08-06 06:54:47 +0000
commit11f47a9b4e425b3029888df5ebbcd600bc2d6dde (patch)
treea18c98916aa899aea4f12f7a61815b8f639b4e54 /src
parent54919f82386d6fe6e38bfcb71520ec950b2cab0e (diff)
downloadsqlite-11f47a9b4e425b3029888df5ebbcd600bc2d6dde.tar.gz
sqlite-11f47a9b4e425b3029888df5ebbcd600bc2d6dde.zip
Fix a bug to do with deleting the journal file when exiting exclusive-locking mode.
FossilOrigin-Name: 6217b607f0cd60383c6cb4ab0fe9da008f611244
Diffstat (limited to 'src')
-rw-r--r--src/pager.c48
1 files changed, 32 insertions, 16 deletions
diff --git a/src/pager.c b/src/pager.c
index f5a2c4c4b..c4833f152 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -147,6 +147,22 @@ int sqlite3PagerTrace=1; /* True to enable tracing */
** | V |
** +<------WRITER_FINISHED-------->+
**
+**
+** List of state transitions and the C [function] that performs each:
+**
+** NONE -> READER [sqlite3PagerSharedLock]
+** READER -> NONE [pager_unlock]
+**
+** READER -> WRITER_INITIAL [sqlite3PagerBegin]
+** WRITER_INITIAL -> WRITER_CACHEMOD [pager_open_journal]
+** WRITER_CACHEMOD -> WRITER_DBMOD [syncJournal]
+** WRITER_DBMOD -> WRITER_FINISHED [sqlite3PagerCommitPhaseOne]
+** WRITER_*** -> READER [pager_end_transaction]
+**
+** WRITER_*** -> ERROR [pager_error]
+** ERROR -> NONE [pager_unlock]
+**
+**
** NONE:
**
** The pager starts up in this state. Nothing is guaranteed in this
@@ -171,6 +187,10 @@ int sqlite3PagerTrace=1; /* True to enable tracing */
** this state even after the read-transaction is closed. The only way
** a locking_mode=exclusive connection can transition from READER to NONE
** is via the ERROR state (see below).
+**
+** TODO: Maybe WAL connections should behave like locking_mode=exclusive
+** connections and remain in READER state even when there is no
+** active read transaction.
**
** * A read transaction may be active (but a write-transaction cannot).
** * A SHARED or greater lock is held on the database file.
@@ -183,8 +203,15 @@ int sqlite3PagerTrace=1; /* True to enable tracing */
**
** WRITER_INITIAL:
**
+** The pager moves to this state from READER when a write-transaction
+** is first opened on the database.
+**
** * A write transaction is active.
-** * A RESERVED or greater lock is held on the database file.
+** * If the connection is open in rollback-mode, a RESERVED or greater
+** lock is held on the database file.
+** * If the connection is open in WAL-mode, a WAL write transaction
+** is open (i.e. sqlite3WalBeginWriteTransaction() has been successfully
+** called).
** * The dbSize, dbOrigSize and dbFileSize variables are all valid.
** * The contents of the pager cache have not been modified.
** * The journal file may or may not be open.
@@ -266,20 +293,6 @@ int sqlite3PagerTrace=1; /* True to enable tracing */
** state.
**
**
-** State transitions and the [function] that performs each:
-**
-** NONE -> READER [PagerSharedLock]
-** READER -> WRITER_INITIAL [PagerBegin]
-** WRITER_INITIAL -> WRITER_CACHEMOD [pager_open_journal]
-** WRITER_CACHEMOD -> WRITER_DBMOD [syncJournal]
-** WRITER_DBMOD -> WRITER_FINISHED [PagerCommitPhaseOne]
-**
-** WRITER_*** -> READER [pager_end_transaction]
-** WRITER_*** -> ERROR [pager_error]
-**
-** READER -> NONE [pager_unlock]
-** ERROR -> NONE [pager_unlock]
-**
** Notes:
**
** * A pager is never in WRITER_DBMOD or WRITER_FINISHED state if the
@@ -802,12 +815,14 @@ static char *print_pager_state(Pager *p){
static char zRet[1024];
sqlite3_snprintf(1024, zRet,
+ "Filename: %s\n"
"State: %s errCode=%d\n"
"Lock: %s\n"
"Locking mode: locking_mode=%s\n"
"Journal mode: journal_mode=%s\n"
"Backing store: tempFile=%d memDb=%d useJournal=%d\n"
"Journal: journalOff=%lld journalHdr=%lld\n"
+ , p->zFilename
, p->eState==PAGER_NONE ? "NONE" :
p->eState==PAGER_READER ? "READER" :
p->eState==PAGER_WRITER_INITIAL ? "WRITER_INITIAL" :
@@ -1819,13 +1834,14 @@ static int pager_end_transaction(Pager *pPager, int hasMaster){
** call to pager_unlock(), as described above.
*/
static void pagerUnlockAndRollback(Pager *pPager){
- if( pPager->eState!=PAGER_ERROR ){
+ if( pPager->eState!=PAGER_ERROR && pPager->eState!=PAGER_NONE ){
assert( assert_pager_state(pPager) );
if( pPager->eState>=PAGER_WRITER_INITIAL ){
sqlite3BeginBenignMalloc();
sqlite3PagerRollback(pPager);
sqlite3EndBenignMalloc();
}else if( pPager->eLock>=RESERVED_LOCK && !pPager->exclusiveMode ){
+ assert( pPager->eState==PAGER_READER );
pager_end_transaction(pPager, 0);
}
}