-C Fix\sbug\sin\sjournal2.test.
-D 2010-06-17T11:36:28
+C A\sdifferent\sfix\sto\s[fc62af4523].\sWhen\schanging\sfrom\sjournal_mode=PERSIST\sor\sTRINCATE\sto\ssome\sother\srollback\smode,\sdelete\sthe\sjournal\sfile\sonly\sif\sa\sRESERVED\slock\scan\sbe\sobtained\son\sthe\sdatabase\sfile\sfirst.
+D 2010-06-17T16:44:22
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
F src/os_os2.c 665876d5eec7585226b0a1cf5e18098de2b2da19
F src/os_unix.c ae173c9f6afaa58b2833a1c95c6cd32021755c42
F src/os_win.c dfde7d33c446e89dd9a277c036f2c4cc564b3138
-F src/pager.c 658e5063d2d1661336a1e269e1cc324dfa8a683a
+F src/pager.c 5968e0d73febd2e1c9e4e785660bdf49ff2e2cab
F src/pager.h ca1f23c0cf137ac26f8908df2427c8b308361efd
F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e
F src/pcache.c 1e9aa2dbc0845b52e1b51cc39753b6d1e041cb07
F src/utf.c 1baeeac91707a4df97ccc6141ec0f808278af685
F src/util.c 32aebf04c10e51ad3977a928b7416bed671b620b
F src/vacuum.c 241a8386727c1497eba4955933356dfba6ff8c9f
-F src/vdbe.c 8a910a19981b8f670f4d67b5b0673459de50ccba
+F src/vdbe.c e115585b14d2cc4128cb53a7e42f207750e80f55
F src/vdbe.h 471f6a3dcec4817ca33596fe7f6654d56c0e75f3
F src/vdbeInt.h 19ebc8c2a2e938340051ee65af3f377fb99102d1
F src/vdbeapi.c dc3138f10afbc95ed3c21dd25abb154504b1db9d
F test/join5.test 86675fc2919269aa923c84dd00ee4249b97990fe
F test/join6.test bf82cf3f979e9eade83ad0d056a66c5ed71d1901
F test/journal1.test 36f2d1bb9bf03f790f43fbdb439e44c0657fab19
-F test/journal2.test 61c60f287d2d5f4d3d62af0a0d97100c90e055a6
-F test/jrnlmode.test cd0c9c5b2555f3d5bb72ed8aa8d0ad16ecf77e7c
+F test/journal2.test 3e98dc6b7486aa7e1ed67ff542e891a978654093
+F test/jrnlmode.test 76f94d61528c5ff32102a12f8cf34f4cc36f7849
F test/jrnlmode2.test fe79ea1f0375c926b8de0362ddf94f34a64135fd
F test/jrnlmode3.test cfcdb12b90e640a23b92785a002d96c0624c8710
F test/keyword1.test a2400977a2e4fde43bf33754c2929fda34dbca05
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 9f6ea1de5abab0ca28688e257ddf03c66413cf6e
-R 07d7ad85696711a45c0b4b5690681a45
+P c1e04f1d4e8575ebc41b5b4403dbfe3f60d578dc
+R c1f8308c51de4402b52d191c23c2aef4
U dan
-Z b6a1325b7da2976f7858122f03070f50
+Z 10be27f6ff328697757cba4d76703f36
-c1e04f1d4e8575ebc41b5b4403dbfe3f60d578dc
\ No newline at end of file
+b9b11855e8a9522309dd30e5256bb67d67e1353a
\ No newline at end of file
/* Change the journal mode. */
pPager->journalMode = (u8)eMode;
+
+ /* When transistioning from TRUNCATE or PERSIST to any other journal
+ ** mode except WAL (and we are not in locking_mode=EXCLUSIVE) then
+ ** delete the journal file.
+ */
+ assert( (PAGER_JOURNALMODE_TRUNCATE & 5)==1 );
+ assert( (PAGER_JOURNALMODE_PERSIST & 5)==1 );
+ assert( (PAGER_JOURNALMODE_DELETE & 5)==0 );
+ assert( (PAGER_JOURNALMODE_MEMORY & 5)==4 );
+ assert( (PAGER_JOURNALMODE_OFF & 5)==0 );
+ assert( (PAGER_JOURNALMODE_WAL & 5)==5 );
+
+ assert( isOpen(pPager->fd) || pPager->exclusiveMode );
+ if( !pPager->exclusiveMode && (eOld & 5)==1 && (eMode & 1)==0 ){
+
+ /* In this case we would like to delete the journal file. If it is
+ ** not possible, then that is not a problem. Deleting the journal file
+ ** here is an optimization only.
+ **
+ ** Before deleting the journal file, obtain a RESERVED lock on the
+ ** database file. This ensures that the journal file is not deleted
+ ** while it is in use by some other client.
+ */
+ int rc = SQLITE_OK;
+ int state = pPager->state;
+ if( state<PAGER_SHARED ){
+ rc = sqlite3PagerSharedLock(pPager);
+ }
+ if( pPager->state==PAGER_SHARED ){
+ assert( rc==SQLITE_OK );
+ rc = sqlite3OsLock(pPager->fd, RESERVED_LOCK);
+ }
+ if( rc==SQLITE_OK ){
+ sqlite3OsDelete(pPager->pVfs, pPager->zJournal, 0);
+ }
+ if( rc==SQLITE_OK && state==PAGER_SHARED ){
+ sqlite3OsUnlock(pPager->fd, SHARED_LOCK);
+ }else if( state==PAGER_UNLOCK ){
+ pager_unlock(pPager);
+ }
+ assert( state==pPager->state );
+ }
}
/* Return the new journal mode */
}else if( rc==SQLITE_BUSY && pOp->p5==0 ){
goto abort_due_to_error;
}
- }else{
- sqlite3PagerSetJournalMode(pPager, PAGER_JOURNALMODE_DELETE);
- rc = SQLITE_OK;
}
/* Open a transaction on the database file. Regardless of the journal
*/
assert( sqlite3BtreeIsInTrans(pBt)==0 );
if( rc==SQLITE_OK ){
- rc = sqlite3BtreeSetVersion(pBt,
- (eNew==PAGER_JOURNALMODE_WAL ? 2 : 1));
+ rc = sqlite3BtreeSetVersion(pBt, (eNew==PAGER_JOURNALMODE_WAL ? 2 : 1));
if( rc==SQLITE_BUSY && pOp->p5==0 ) goto abort_due_to_error;
}
if( rc==SQLITE_BUSY ){
#endif /* ifndef SQLITE_OMIT_WAL */
eNew = sqlite3PagerSetJournalMode(pPager, eNew);
+
pOut = &aMem[pOp->p2];
pOut->flags = MEM_Str|MEM_Static|MEM_Term;
pOut->z = (char *)sqlite3JournalModename(eNew);
do_test journal2-2.3 {
expr {[file size test.db-journal] > 512}
} {1}
- do_test journal2-2.3 {
+ do_test journal2-2.4 {
set ::oplog [list]
execsql { PRAGMA journal_mode = WAL }
set ::oplog
- } [list \
- xClose test.db-journal \
- xOpen test.db-journal xClose test.db-journal \
- xOpen test.db-journal xClose test.db-journal \
- xDelete test.db-journal \
- ]
+ } {xClose test.db-journal xDelete test.db-journal}
db close
}
INSERT INTO t4 VALUES(3, 4);
}
file exists test.db-journal
- } {1}
+ } {0}
do_test jrnlmode-6.7 {
execsql {
COMMIT;
} {1 2 3 4}
do_test jrnlmode-6.8 {
file exists test.db-journal
- } {1}
+ } {0}
do_test jrnlmode-6.9 {
execsql {
PRAGMA journal_mode = DELETE;