Fix a problem wherein changing the journal-mode immediately after leaving exclusive...

FossilOrigin-Name: 531abc808526d607768bf6f503268d4cc66ab169

diff --git a/manifest b/manifest
index ac5dfd9e0df2c6372e7ea196a33761bd6723dd3b..13283aff95f2e784f3d0f05f73d5403e6a90624a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stest\scase\s'cgt_pager_1',\sintended\sfor\suse\swith\scallgrind\sto\sdetect\sperformance\sregression\sin\sthe\spager\smodule,\sto\sthreadtest3.c.
-D 2010-08-07T05:15:23
+C Fix\sa\sproblem\swherein\schanging\sthe\sjournal-mode\simmediately\safter\sleaving\sexclusive-locking\smode\scould\slead\sto\sthe\sdatabase\sbeing\sunlocked\swithout\sclearing\sthe\schangeCountDone\sflag.
+D 2010-08-07T09:31:14
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -156,7 +156,7 @@ F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
 F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e
 F src/os_unix.c ae5ca8a6031380708f3fec7be325233d49944914
 F src/os_win.c 51cb62f76262d961ea4249489383d714501315a7
-F src/pager.c 2dffe4d468c7665cceaa43eb56e4b5c2f0d28396
+F src/pager.c 9621456e9fdbd134273a434efb2c873c4c4f2a9e
 F src/pager.h 80726162dc3942f59ab27b738fb667b9ba0a89d5
 F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
 F src/pcache.c 1e9aa2dbc0845b52e1b51cc39753b6d1e041cb07
@@ -471,7 +471,7 @@ F test/join6.test bf82cf3f979e9eade83ad0d056a66c5ed71d1901
 F test/journal1.test 36f2d1bb9bf03f790f43fbdb439e44c0657fab19
 F test/journal2.test 50a3604768494d4a337f194f0a9480e7c57dcb72
 F test/journal3.test ff175219be1b02d2f7e54297ad7e491b7533edb6
-F test/jrnlmode.test 2d5a8b6d68de8512f522532731d90ca96912f3b7
+F test/jrnlmode.test e3fe6c4a2c3213d285650dc8e33aab7eaaa5ce53
 F test/jrnlmode2.test a19e28de1a6ec898067e46a122f1b71c9323bf00
 F test/jrnlmode3.test cfcdb12b90e640a23b92785a002d96c0624c8710
 F test/keyword1.test a2400977a2e4fde43bf33754c2929fda34dbca05
@@ -843,7 +843,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 876162c7e036af1cb447409b685afc72c0061a32
-R 27f96e8eaa225660cd3eee27494507ba
+P b5d46f1ea08db2b88d2205bc283b9262ad970b55
+R 1c87633c0c4928fc4e767694680c3b36
 U dan
-Z 3bc5778d1d89a64090d5ae07cc0b0720
+Z d18018a31ac0c912f6e4858813e6f216

diff --git a/manifest.uuid b/manifest.uuid
index 6c2974f53e1b120487d7fa5ca08c170775496a9a..33f193000c1ded26e594bea7bf0e4f7535501bbb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b5d46f1ea08db2b88d2205bc283b9262ad970b55
\ No newline at end of file
+531abc808526d607768bf6f503268d4cc66ab169
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 767426fefa760991ffe5b88b39804948fe3f3d14..765a64c34e5abc94d39e0584f242a93318ea3fe4 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -6364,10 +6364,11 @@ int sqlite3PagerSetJournalMode(Pager *pPager, int eMode){
   if( eMode!=eOld ){
 
     /* Change the journal mode. */
+    assert( pPager->eState!=PAGER_ERROR );
     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 
+    ** mode except WAL, unless the pager is in locking_mode=exclusive mode,
     ** delete the journal file.
     */
     assert( (PAGER_JOURNALMODE_TRUNCATE & 5)==1 );
@@ -6380,8 +6381,6 @@ int sqlite3PagerSetJournalMode(Pager *pPager, int eMode){
     assert( isOpen(pPager->fd) || pPager->exclusiveMode );
     if( !pPager->exclusiveMode && (eOld & 5)==1 && (eMode & 1)==0 ){
 
-      sqlite3OsClose(pPager->jfd);
-
       /* 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.
@@ -6390,24 +6389,29 @@ int sqlite3PagerSetJournalMode(Pager *pPager, int eMode){
       ** 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->eState;
-      if( state==PAGER_OPEN ){
-        rc = sqlite3PagerSharedLock(pPager);
-      }
-      if( pPager->eState==PAGER_READER ){
-        assert( rc==SQLITE_OK );
-        rc = pagerLockDb(pPager, RESERVED_LOCK);
-      }
-      if( rc==SQLITE_OK ){
+      sqlite3OsClose(pPager->jfd);
+      if( pPager->eLock>=RESERVED_LOCK ){
         sqlite3OsDelete(pPager->pVfs, pPager->zJournal, 0);
+      }else{
+        int rc = SQLITE_OK;
+        int state = pPager->eState;
+        if( state==PAGER_OPEN ){
+          rc = sqlite3PagerSharedLock(pPager);
+        }
+        if( pPager->eState==PAGER_READER ){
+          assert( rc==SQLITE_OK );
+          rc = pagerLockDb(pPager, RESERVED_LOCK);
+        }
+        if( rc==SQLITE_OK ){
+          sqlite3OsDelete(pPager->pVfs, pPager->zJournal, 0);
+        }
+        if( rc==SQLITE_OK && state==PAGER_READER ){
+          pagerUnlockDb(pPager, SHARED_LOCK);
+        }else if( state==PAGER_OPEN ){
+          pager_unlock(pPager);
+        }
+        assert( state==pPager->eState );
       }
-      if( rc==SQLITE_OK && state==PAGER_READER ){
-        pagerUnlockDb(pPager, SHARED_LOCK);
-      }else if( state==PAGER_OPEN ){
-        pager_unlock(pPager);
-      }
-      assert( state==pPager->eState );
     }
   }
 

diff --git a/test/jrnlmode.test b/test/jrnlmode.test
index f1e9c786bbeb5a6309e2ccb62ed0369477128d59..eab74d65ac3addd7c593df3e1d8f90d3d5b328fa 100644 (file)
--- a/test/jrnlmode.test
+++ b/test/jrnlmode.test
@@ -524,4 +524,35 @@ ifcapable pragma {
   do_test jrnlmode-7.2 { file size test.db } {1024}
 }
 
+do_execsql_test jrnlmode-8.1  { PRAGMA locking_mode=EXCLUSIVE } {exclusive}
+do_execsql_test jrnlmode-8.2  { CREATE TABLE t1(x) }            {}
+do_execsql_test jrnlmode-8.3  { INSERT INTO t1 VALUES(123) }    {}
+do_execsql_test jrnlmode-8.4  { SELECT * FROM t1 }              {123}
+do_execsql_test jrnlmode-8.5  { PRAGMA journal_mode=PERSIST }   {persist}
+do_execsql_test jrnlmode-8.6  { PRAGMA journal_mode=DELETE }    {delete}
+do_execsql_test jrnlmode-8.7  { PRAGMA journal_mode=TRUNCATE }  {truncate}
+do_execsql_test jrnlmode-8.8  { PRAGMA journal_mode=DELETE }    {delete}
+do_execsql_test jrnlmode-8.9  { CREATE TABLE t2(y) }            {}
+do_execsql_test jrnlmode-8.10 { INSERT INTO t2 VALUES(456) }    {}
+do_execsql_test jrnlmode-8.11 { SELECT * FROM t1, t2 }          {123 456}
+do_execsql_test jrnlmode-8.12 { PRAGMA locking_mode=NORMAL }    {normal}
+do_execsql_test jrnlmode-8.13 { PRAGMA journal_mode=PERSIST }   {persist}
+do_execsql_test jrnlmode-8.14 { PRAGMA journal_mode=TRUNCATE }  {truncate}
+do_execsql_test jrnlmode-8.15 { PRAGMA journal_mode=PERSIST }   {persist}
+do_execsql_test jrnlmode-8.16 { PRAGMA journal_mode=DELETE }    {delete}
+do_execsql_test jrnlmode-8.17 { PRAGMA journal_mode=TRUNCATE }  {truncate}
+do_execsql_test jrnlmode-8.18 { PRAGMA locking_mode=EXCLUSIVE } {exclusive}
+do_execsql_test jrnlmode-8.19 { CREATE TABLE t3(z) }            {}
+do_execsql_test jrnlmode-8.20 { BEGIN IMMEDIATE }               {}
+do_execsql_test jrnlmode-8.21 { PRAGMA journal_mode=DELETE }    {delete}
+do_execsql_test jrnlmode-8.22 { COMMIT }                        {}
+do_execsql_test jrnlmode-8.23 { PRAGMA journal_mode=DELETE }    {delete}
+do_execsql_test jrnlmode-8.24 { PRAGMA journal_mode=TRUNCATE }  {truncate}
+do_execsql_test jrnlmode-8.25 { PRAGMA locking_mode=NORMAL }    {normal}
+do_execsql_test jrnlmode-8.26 { CREATE TABLE t4(w) }            {}
+do_execsql_test jrnlmode-8.27 { BEGIN IMMEDIATE }               {}
+do_execsql_test jrnlmode-8.28 { PRAGMA journal_mode=DELETE }    {delete}
+do_execsql_test jrnlmode-8.29 { COMMIT }                        {}
+do_execsql_test jrnlmode-8.30 { PRAGMA journal_mode=DELETE }    {delete}
+
 finish_test